rpms/qt4/devel qt4.spec,1.9,1.10

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25902

Modified Files:
	qt4.spec 
Log Message:
* Mon Jun 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-3
- -debug: drop, adds nothing over -debuginfo, make lib..._debug 
  symlinks instead (bug #196513)
- assistant.desktop: fix tooltip (bug #197039)



Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/devel/qt4.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt4.spec	27 Jun 2006 19:05:08 -0000	1.9
+++ qt4.spec	28 Jun 2006 13:46:01 -0000	1.10
@@ -5,7 +5,7 @@
 Summary: Qt GUI toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -92,22 +92,16 @@
 maintaining GUI (Graphical User Interface) applications
 for the X Window System.
 
-%package debug
-Summary: Library files built for debugging
-Group:   System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-%description debug
-%{summary}.
-
 %package devel
 Summary: Development files for the Qt GUI toolkit
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: %{name}-debug = %{version}-%{release}
 Requires: %{x_deps}
 Requires: libpng-devel
 Requires: libjpeg-devel
 Requires: pkgconfig
+# Short-lived pkg, temporary 
+Obsoletes: %{name}-debug < %{version}-%{release}
 Obsoletes: %{name}-designer < %{version}-%{release}
 Provides:  %{name}-designer = %{version}-%{release}
 %description devel
@@ -200,7 +194,7 @@
   -headerdir %{qt_headerdir} \
   -libdir %{qt_libdir} \
   -platform %{platform} \
-  -debug-and-release \
+  -release \
   -shared \
   -no-exceptions \
   -largefile \
@@ -232,6 +226,14 @@
 
 make install INSTALL_ROOT=%{buildroot}
 
+# Add desktop file(s)
+desktop-file-install \
+  --dir %{buildroot}%{_datadir}/applications \
+  --vendor="%{name}" \
+  --add-category="X-Fedora" \
+  --remove-key=MapNotify \
+  %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
+
 ## pkg-config
 # strip extraneous dirs/libraries -- Rex
 # safe ones
@@ -284,13 +286,15 @@
 done
 popd
 
-# Add desktop file(s)
-desktop-file-install \
-  --dir %{buildroot}%{_datadir}/applications \
-  --vendor="%{name}" \
-  --add-category="X-Fedora" \
-  --remove-key=MapNotify \
-  %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24}
+# _debug lib symlinks (see bug #196513)
+pushd %{buildroot}%{qt_libdir}
+for lib in libQt*.so ; do
+  ln -s $lib $(basename $lib .so)_debug.so
+done
+for lib in libQt*.a ; do
+  ln -s $lib $(basename $lib .a)_debug.a
+done
+popd
 
 # .la files, die, die, die.
 rm -f %{buildroot}%{qt_libdir}/lib*.la
@@ -332,20 +336,12 @@
 %{qtdir}/plugins/inputmethods/
 %dir %{qtdir}/plugins/sqldrivers/
 %{qtdir}/translations/
-## exclude -debug bits
-#exclude %{qt_libdir}/libQt*_debug.so.*
-%exclude %{qtdir}/plugins/*/lib*_debug.so
 #files config
 #defattr(-,root,root,-)
 %{qtdir}/bin/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
 
-%files debug
-%defattr(-,root,root,-)
-%{qt_libdir}/libQt*_debug.so.*
-%{qtdir}/plugins/*/lib*_debug.so
-
 %files devel
 %defattr(-,root,root,-)
 %{qtdir}/bin/lrelease*
@@ -429,6 +425,11 @@
 
 
 %changelog
+* Mon Jun 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-3
+- -debug: drop, adds nothing over -debuginfo, make lib..._debug 
+  symlinks instead (bug #196513)
+- assistant.desktop: fix tooltip (bug #197039)
+
 * Mon Jun 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-2
 - -devel: include -debug libs (bug #196513)
 - -devel: move libQtDesigner here