[meego-commits] 9186: Changes to devel:qt-mtf:qt-experimental:desktop-es2/qt

Brian Harring no_reply at build.meego.com
Wed Nov 3 16:21:23 UTC 2010 

Hi,
I have made the following changes to qt in project devel:qt-mtf:qt-experimental:desktop-es2. Please review and accept ASAP.

Thank You,
Brian Harring

[This message was auto-generated]

---

Request #9186:

  submit:   home:ferringb:branches:devel:qt-mtf:qt-experimental:desktop-es2/qt(r11)(cleanup) -> devel:qt-mtf:qt-experimental:desktop-es2/qt


Message:
    fix alternatives usage; 1) ldconfig follows screwing with symlinks, 2) don't remove the grouping for upgrades, remove it strictly on actual removal, 3) use link groups via slaves...

State:   new          2010-11-03T09:21:22 ferringb
Comment: None



changes files:
--------------
--- qt.changes
+++ qt.changes
@@ -0,0 +1,3 @@
+* Wed Nov 03 2010 Brian Harring <brian.harring at intel.com> - 4.7.1
+- fixup alternatives usage, ldconfig invocation, and removal/upgrade pathways
+

spec files:
-----------
--- qt.spec
+++ qt.spec
@@ -806,7 +806,6 @@
 %postun -n libqtcore4 -p /sbin/ldconfig
 
 %post -n libqtgui4
-/sbin/ldconfig
 [ -h %{_sysconfdir}/xdg/Trolltech.conf ] || rm -f %{_sysconfdir}/xdg/Trolltech.conf
 update-alternatives --install %{_sysconfdir}/xdg/Trolltech.conf \
   Trolltech.conf %{_sysconfdir}/xdg/Trolltech-default.conf 10
@@ -814,40 +813,41 @@
   libQtGui.so %{_libdir}/libQtGui-opengl-desktop.so.4.7.1 10
 update-alternatives --install %{_libdir}/libQtGui.so.4.7.1 \
   libQtGui.so %{_libdir}/libQtGui-opengl-es2.so.4.7.1 20
-
-%postun -n libqtgui4
 /sbin/ldconfig
-update-alternatives --remove Trolltech.conf \
+
+%preun -n libqtgui4
+if [ "$1" == "0" ]; then
+  update-alternatives --remove Trolltech.conf \
   %{_sysconfdir}/xdg/Trolltech-default.conf
-update-alternatives --remove libQtGui.so \
+  update-alternatives --remove libQtGui.so \
   %{_libdir}/libQtGui-opengl-es2.so.4.7.1
-update-alternatives --remove libQtGui.so \
+  update-alternatives --remove libQtGui.so \
   %{_libdir}/libQtGui-opengl-desktop.so.4.7.1
+fi
+%postun -n libqtgui4 -p /sbin/ldconfig
 
 %post -n libqtnetwork4 -p /sbin/ldconfig
 %postun -n libqtnetwork4 -p /sbin/ldconfig
 
 %post -n libqtopengl4
-/sbin/ldconfig
 update-alternatives --install %{_libdir}/libQtOpenGL.so.4.7.1 \
-  libQtOpenGL.so %{_libdir}/libQtOpenGL-opengl-desktop.so.4.7.1 10
+  libQtOpenGL.so %{_libdir}/libQtOpenGL-opengl-desktop.so.4.7.1 10 \
+  --slave %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem.so \
+    libqglgraphicssystem.so %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem-opengl-desktop.so
 update-alternatives --install %{_libdir}/libQtOpenGL.so.4.7.1 \
   libQtOpenGL.so %{_libdir}/libQtOpenGL-opengl-es2.so.4.7.1 20
-update-alternatives --install %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem.so \
-  libqglgraphicssystem.so %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem-opengl-desktop.so 10
-update-alternatives --install %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem.so \
-  libqglgraphicssystem.so %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem-opengl-es2.so 20
-
-%postun -n libqtopengl4
+  --slave %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem.so \
+    libqglgraphicssystem.so %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem-opengl-es2.so
 /sbin/ldconfig
-update-alternatives --remove libQtOpenGL.so \
+
+%preun -n libqtopengl4
+if [ "$1" == "0" ]; then
+  update-alternatives --remove libQtOpenGL.so \
   %{_libdir}/libQtOpenGL-opengl-es2.so.4.7.1
-update-alternatives --remove libQtOpenGL.so \
+  update-alternatives --remove libQtOpenGL.so \
   %{_libdir}/libQtOpenGL-opengl-desktop.so.4.7.1
-update-alternatives --remove libqglgraphicssystem.so \
-  %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem-opengl-es2.so
-update-alternatives --remove libqglgraphicssystem.so \
-  %{_libdir}/qt4/plugins/graphicssystems/libqglgraphicssystem-opengl-desktop.so
+fi
+%postun -n libqtopengl4 -p /sbin/ldconfig
 
 %post -n libqtscript4 -p /sbin/ldconfig
 %postun -n libqtscript4 -p /sbin/ldconfig
@@ -909,76 +909,66 @@
 update-alternatives --install %{_datadir}/qt4/mkspecs/qconfig.pri \
   qconfig.pri %{_datadir}/qt4/mkspecs/qconfig-opengl-es2.pri 20
 
-%postun qmake
-update-alternatives --remove qconfig.pri \
+%preun qmake
+if [ "$1" == "0" ]; then
+  update-alternatives --remove qconfig.pri \
   %{_datadir}/qt4/mkspecs/qconfig-opengl-es2.pri
-update-alternatives --remove qconfig.pri \
+  update-alternatives --remove qconfig.pri \
   %{_datadir}/qt4/mkspecs/qconfig-opengl-desktop.pri
+fi
 
 %post -n libqt-devel
 update-alternatives --install %{_includedir}/qt4/Qt/qconfig.h \
   qt-qconfig.h %{_includedir}/qt4/Qt/qconfig-opengl-desktop.h 10
+  --slave %{_includedir}/qt4/QtCore/qconfig.h \
+    qtcore-qconfig.h %{_includedir}/qt4/QtCore/qconfig-opengl-desktop.h \
+  --slave %{_libdir}/libQtGui.prl libQtGui.prl %{_libdir}/libQtGui-opengl-desktop.prl \
+  --slave %{_libdir}/pkgconfig/QtGui.pc QtGui.pc %{_libdir}/pkgconfig/QtGui-opengl-desktop.pc
+
 update-alternatives --install %{_includedir}/qt4/Qt/qconfig.h \
   qt-qconfig.h %{_includedir}/qt4/Qt/qconfig-opengl-es2.h 20
-update-alternatives --install %{_includedir}/qt4/QtCore/qconfig.h \
-  qtcore-qconfig.h %{_includedir}/qt4/QtCore/qconfig-opengl-desktop.h 10
-update-alternatives --install %{_includedir}/qt4/QtCore/qconfig.h \
-  qtcore-qconfig.h %{_includedir}/qt4/QtCore/qconfig-opengl-es2.h 20
-update-alternatives --install %{_libdir}/libQtGui.prl \
-  libQtGui.prl %{_libdir}/libQtGui-opengl-desktop.prl 10
-update-alternatives --install %{_libdir}/libQtGui.prl \
-  libQtGui.prl %{_libdir}/libQtGui-opengl-es2.prl 20
-update-alternatives --install %{_libdir}/pkgconfig/QtGui.pc \
-  QtGui.pc %{_libdir}/pkgconfig/QtGui-opengl-desktop.pc 10
-update-alternatives --install %{_libdir}/pkgconfig/QtGui.pc \
-  QtGui.pc %{_libdir}/pkgconfig/QtGui-opengl-es2.pc 20
-
-%postun -n libqt-devel
-update-alternatives --remove qt-qconfig.h \
+  --slave %{_includedir}/qt4/QtCore/qconfig.h \
+    qtcore-qconfig.h %{_includedir}/qt4/QtCore/qconfig-opengl-es2.h \
+  --slave %{_libdir}/libQtGui.prl \
+    libQtGui.prl %{_libdir}/libQtGui-opengl-es2.prl \
+  --slave %{_libdir}/pkgconfig/QtGui.pc QtGui.pc %{_libdir}/pkgconfig/QtGui-opengl-es2.pc
+
+%preun -n libqt-devel
+if [ "$1" == "0" ]; then
+  update-alternatives --remove qt-qconfig.h \
   %{_includedir}/qt4/Qt/qconfig-opengl-es2.h
-update-alternatives --remove qt-qconfig.h \
+  update-alternatives --remove qt-qconfig.h \
   %{_includedir}/qt4/Qt/qconfig-opengl-desktop.h
-update-alternatives --remove qtcore-qconfig.h \
-  %{_includedir}/qt4/QtCore/qconfig-opengl-es2.h
-update-alternatives --remove qtcore-qconfig.h \
-  %{_includedir}/qt4/QtCore/qconfig-opengl-desktop.h
-update-alternatives --remove libQtGui.prl \
-   %{_libdir}/libQtGui-opengl-es2.prl
-update-alternatives --remove libQtGui.prl \
-   %{_libdir}/libQtGui-opengl-desktop.prl
-update-alternatives --remove QtGui.pc \
-  %{_libdir}/pkgconfig/QtGui-opengl-es2.pc
-update-alternatives --remove QtGui.pc \
-  %{_libdir}/pkgconfig/QtGui-opengl-desktop.pc
+fi
 
 %post -n libqtopengl-devel
 update-alternatives --install %{_libdir}/libQtOpenGL.prl \
   libQtOpenGL.prl %{_libdir}/libQtOpenGL-opengl-desktop.prl 10
+  --slave %{_libdir}/pkgconfig/QtOpenGL.pc \
+    QtOpenGL.pc %{_libdir}/pkgconfig/QtOpenGL-opengl-desktop.pc
 update-alternatives --install %{_libdir}/libQtOpenGL.prl \
   libQtOpenGL.prl %{_libdir}/libQtOpenGL-opengl-es2.prl 20
-update-alternatives --install %{_libdir}/pkgconfig/QtOpenGL.pc \
-  QtOpenGL.pc %{_libdir}/pkgconfig/QtOpenGL-opengl-desktop.pc 10
-update-alternatives --install %{_libdir}/pkgconfig/QtOpenGL.pc \
-  QtOpenGL.pc %{_libdir}/pkgconfig/QtOpenGL-opengl-es2.pc 20
+  --slave %{_libdir}/pkgconfig/QtOpenGL.pc \
+    QtOpenGL.pc %{_libdir}/pkgconfig/QtOpenGL-opengl-es2.pc
 
-%postun -n libqtopengl-devel
-update-alternatives --remove libQtOpenGL.prl \
+%preun -n libqtopengl-devel
+if [ "$1" == "0" ]; then
+  update-alternatives --remove libQtOpenGL.prl \
   %{_libdir}/libQtOpenGL-opengl-es2.prl
-update-alternatives --remove libQtOpenGL.prl \
+  update-alternatives --remove libQtOpenGL.prl \
   %{_libdir}/libQtOpenGL-opengl-desktop.prl
-update-alternatives --remove QtOpenGL.pc \
-  %{_libdir}/pkgconfig/QtOpenGL-opengl-es2.pc
-update-alternatives --remove QtOpenGL.pc \
-  %{_libdir}/pkgconfig/QtOpenGL-opengl-desktop.pc
+fi
 
 %post netbook-settings
 [ -h %{_sysconfdir}/xdg/Trolltech.conf ] || rm -f %{_sysconfdir}/xdg/Trolltech.conf
 update-alternatives --install %{_sysconfdir}/xdg/Trolltech.conf \
   Trolltech.conf %{_sysconfdir}/xdg/Trolltech-netbook.conf 20
 
-%postun netbook-settings
-update-alternatives --remove Trolltech.conf \
+%preun netbook-settings
+if [ "$1" == "0" ]; then
+  update-alternatives --remove Trolltech.conf \
   %{_sysconfdir}/xdg/Trolltech-netbook.conf
+fi
 
 %files -n libqtcore4
 %defattr(-,root,root,-)

other changes:
--------------

More information about the MeeGo-commits mailing list