Mailinglist Archive: opensuse-commit (1187 mails)

[root@xxxxxxx (h_root)]

Hello community,

here is the log from the commit of package qt3
checked in at Thu Apr 13 15:41:49 CEST 2006.

--------
--- KDE/qt3/qt3-devel-doc.changes	2006-04-05 17:39:38.000000000 +0200
+++ STABLE/qt3/qt3-devel-doc.changes	2006-04-13 15:41:11.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Apr 10 10:40:11 CEST 2006 - dmueller@xxxxxxx
+
+- strip installed static libraries 
+- fix file conflict with Qt4 packages
+
+-------------------------------------------------------------------
qt3-extensions.changes: same change
qt3-static.changes: same change
qt3.changes: same change

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.ZNzA0W/_old	2006-04-13 15:41:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ZNzA0W/_new	2006-04-13 15:41:20.000000000 +0200
@@ -18,7 +18,7 @@
 Summary:        Qt 3 Development Kit
 Group:          Documentation/HTML
 Version:        3.3.5
-Release:        48
+Release:        51
 PreReq:         /bin/grep
 BuildArch:      noarch 
 Provides:       qt3-devel-tutorial
@@ -263,6 +263,9 @@
 /usr/share/pixmaps/assistant3.png
 
 %changelog -n qt3-devel-doc
+* Mon Apr 10 2006 - dmueller@xxxxxxx
+- strip installed static libraries
+- fix file conflict with Qt4 packages
 * Mon Apr 03 2006 - dmueller@xxxxxxx
 - restore libraryPaths which broke instsys (#162930)
 * Thu Mar 30 2006 - coolo@xxxxxxx

++++++ qt3-extensions.spec ++++++
--- /var/tmp/diff_new_pack.ZNzA0W/_old	2006-04-13 15:41:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ZNzA0W/_new	2006-04-13 15:41:20.000000000 +0200
@@ -14,7 +14,7 @@
 BuildRequires:  cups-devel krb5-devel libdrm-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files
 License:        GPL, QPL
 Version:        3.3.5
-Release:        48
+Release:        51
 Autoreqprov:    on
 Requires:       qt3 = %version
 Group:          Development/Tools/Other
@@ -388,6 +388,8 @@
 install -m 0644 %SOURCE7 $RPM_BUILD_ROOT/usr/share/pixmaps/
 perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
 mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop
+install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png
+rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/{designer,linguist}.png
 ##### these files are not getting installed by "make install" ... bug ?
 #
 #
@@ -418,6 +420,9 @@
 rm -f $RPM_BUILD_ROOT/usr/lib/qt3/bin/assistant
 rm -f $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/libqassistantclient.*
 rm -f $RPM_BUILD_ROOT/usr/lib/qt3/translations/assistant_de.qm
+for l in $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.a; do
+  strip --strip-unneeded $l
+done
 
 %pre
 if test -L usr/lib/qt3; then
@@ -485,7 +490,8 @@
 /usr/lib/qt3/%_lib/libdesignercore.*
 /usr/lib/qt3/%_lib/libeditor.*
 /usr/share/applications/*
-/usr/share/pixmaps/*
+/usr/share/pixmaps/designer3.png
+/usr/share/pixmaps/linguist3.png
 
 %files -n qt3-examples
 %defattr(-,root,root)
@@ -498,6 +504,9 @@
 %{_mandir}/man*/*
 
 %changelog -n qt3-extensions
+* Mon Apr 10 2006 - dmueller@xxxxxxx
+- strip installed static libraries
+- fix file conflict with Qt4 packages
 * Mon Apr 03 2006 - dmueller@xxxxxxx
 - restore libraryPaths which broke instsys (#162930)
 * Thu Mar 30 2006 - coolo@xxxxxxx

++++++ qt3-static.spec ++++++
--- /var/tmp/diff_new_pack.ZNzA0W/_old	2006-04-13 15:41:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ZNzA0W/_new	2006-04-13 15:41:20.000000000 +0200
@@ -17,7 +17,7 @@
 Autoreqprov:    on
 Summary:        static program library for developing applications with graphical user interfaces
 Version:        3.3.5
-Release:        48
+Release:        51
 %define x11_free -x11-free-
 %define rversion %version
 # COMMON-BEGIN
@@ -272,6 +272,9 @@
 #/usr/lib/qt3/%{_lib}/libqt-mini.a
 
 %changelog -n qt3-static
+* Mon Apr 10 2006 - dmueller@xxxxxxx
+- strip installed static libraries
+- fix file conflict with Qt4 packages
 * Mon Apr 03 2006 - dmueller@xxxxxxx
 - restore libraryPaths which broke instsys (#162930)
 * Thu Mar 30 2006 - coolo@xxxxxxx

++++++ qt3.spec ++++++
--- /var/tmp/diff_new_pack.ZNzA0W/_old	2006-04-13 15:41:20.000000000 +0200
+++ /var/tmp/diff_new_pack.ZNzA0W/_new	2006-04-13 15:41:20.000000000 +0200
@@ -18,7 +18,7 @@
 Autoreqprov:    on
 Summary:        A library for developing applications with graphical user interfaces
 Version:        3.3.5
-Release:        48
+Release:        51
 Provides:       qt_library_%version
 PreReq:         /bin/grep
 %define x11_free -x11-free-
@@ -261,7 +261,6 @@
 done
 post_install $RPM_BUILD_ROOT/usr/lib/qt3/
 mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
-install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png
 #
 # copy additional files
 #
@@ -381,7 +380,6 @@
 %ifarch s390x sparc64 x86_64 ppc64 mips64
 %dir %{_libdir}/qt3
 %endif
-/usr/share/pixmaps/designer3.png
 
 %files devel
 %defattr(-,root,root,755)
@@ -400,6 +398,9 @@
 /etc/profile.d/qt3.*
 
 %changelog -n qt3
+* Mon Apr 10 2006 - dmueller@xxxxxxx
+- strip installed static libraries
+- fix file conflict with Qt4 packages
 * Mon Apr 03 2006 - dmueller@xxxxxxx
 - restore libraryPaths which broke instsys (#162930)
 * Thu Mar 30 2006 - coolo@xxxxxxx








++++++ qt3-extensions.spec.in ++++++
--- KDE/qt3/qt3-extensions.spec.in	2006-02-22 14:00:46.000000000 +0100
+++ STABLE/qt3/qt3-extensions.spec.in	2006-04-11 17:57:32.000000000 +0200
@@ -160,6 +160,8 @@
 install -m 0644 %SOURCE7 $RPM_BUILD_ROOT/usr/share/pixmaps/
 perl -pi -e 's/Icon=designer/Icon=designer3/' ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop
 mv ${RPM_BUILD_ROOT}/usr/share/applications/designer.desktop ${RPM_BUILD_ROOT}/usr/share/applications/designer3.desktop
+install -m 0644 tools/assistant/images/designer.png $RPM_BUILD_ROOT/usr/share/pixmaps/designer3.png
+rm -f ${RPM_BUILD_ROOT}/usr/share/pixmaps/{designer,linguist}.png
 
 ##### these files are not getting installed by "make install" ... bug ?
 #
@@ -192,6 +194,10 @@
 rm -f $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/libqassistantclient.*
 rm -f $RPM_BUILD_ROOT/usr/lib/qt3/translations/assistant_de.qm
 
+for l in $RPM_BUILD_ROOT/usr/lib/qt3/%_lib/*.a; do
+  strip --strip-unneeded $l
+done
+
 %pre
 if test -L usr/lib/qt3; then
   rm usr/lib/qt3
@@ -258,7 +264,8 @@
 /usr/lib/qt3/%_lib/libdesignercore.*
 /usr/lib/qt3/%_lib/libeditor.*
 /usr/share/applications/*
-/usr/share/pixmaps/*
+/usr/share/pixmaps/designer3.png
+/usr/share/pixmaps/linguist3.png
 
 %files -n qt3-examples
 %defattr(-,root,root)









++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...