rpms/qt4/FC-5 qt4.spec,1.8,1.9

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/qt4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25992

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)

* 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
- -config: mash into main pkg, should be multilib friendly now




Index: qt4.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4/FC-5/qt4.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt4.spec	23 Jun 2006 18:35:57 -0000	1.8
+++ qt4.spec	28 Jun 2006 13:55:51 -0000	1.9
@@ -1,8 +1,11 @@
 
+# Fedora Review
+# http://bugzilla.redhat.com/bugzilla/188180
+
 Summary: Qt GUI toolkit
 Name:	 qt4
 Version: 4.1.4
-Release: 1%{?dist}
+Release: 3%{?dist}
 
 License: GPL/QPL
 Group: 	 System Environment/Libraries
@@ -32,7 +35,9 @@
 %define qt_dirname qt4
 %define qtdir %{_libdir}/%{qt_dirname}
 %define qt_docdir %{_docdir}/%{name}-doc-%{version}
-# Be careful about ever changing this, some 3rd-party libs install here -- Rex
+# see bug #196901
+%define qt_headerdir %{qtdir}/include
+# see bug #196901, Be careful about ever changing this, some 3rd-party libs install here (like qt4-qsa)
 %define qt_libdir %{qtdir}/%{_lib}
 
 Requires(post): /sbin/ldconfig fileutils /etc/ld.so.conf.d
@@ -78,18 +83,15 @@
 #BuildRequires: sqlite-devel
 %endif
 
+Obsoletes: %{name}-config < %{version}-%{release}
+Provides:  %{name}-config = %{version}-%{release}
+
+
 %description 
 Qt is a GUI software toolkit which simplifies the task of writing and
 maintaining GUI (Graphical User Interface) applications
 for the X Window System.
 
-%package config
-Summary: Grapical configuration tool for programs using Qt
-Group:   User Interface/Desktops
-Requires: %{name} = %{version}-%{release}
-%description config
-%{summary}.
-
 %package devel
 Summary: Development files for the Qt GUI toolkit
 Group: Development/Libraries
@@ -98,6 +100,8 @@
 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
@@ -111,8 +115,8 @@
 Requires: %{name} = %{version}-%{release}
 Provides: %{name}-assistant = %{version}_%{release}
 # For docs -> doc rename, temporary, since it was a short-lived subpkg
-Obsoletes: %{name}-docs < %{version}-%{release}
-Provides:  %{name}-docs = %{version}-%{release}
+#Obsoletes: %{name}-docs < %{version}-%{release}
+#Provides:  %{name}-docs = %{version}-%{release}
 %description doc
 %{summary}.  Includes:
 Qt Assistant, Qt Demo
@@ -187,6 +191,7 @@
   -no-rpath \
   -prefix %{qtdir} \
   -docdir %{qt_docdir} \
+  -headerdir %{qt_headerdir} \
   -libdir %{qt_libdir} \
   -platform %{platform} \
   -release \
@@ -221,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
@@ -273,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
@@ -305,16 +320,24 @@
 %dir %{qtdir}
 %dir %{qtdir}/bin/
 %dir %{qt_libdir}
-%{qt_libdir}/lib*.so.*
+%{qt_libdir}/libQtCore.so.*
+%{qt_libdir}/libQtNetwork.so.*
+%{qt_libdir}/libQtSql.so.*
+%{qt_libdir}/libQtTest.so.*
+%{qt_libdir}/libQtXml.so.*
+# gui libs, see bug #196899
+%{qt_libdir}/libQt3Support.so.*
+%{qt_libdir}/libQtGui.so.*
+%{qt_libdir}/libQtOpenGL.so.*
+%{qt_libdir}/libQtSvg.so.*
 %dir %{qtdir}/plugins/
 %{qtdir}/plugins/accessible/
 %{qtdir}/plugins/imageformats/
 %{qtdir}/plugins/inputmethods/
 %dir %{qtdir}/plugins/sqldrivers/
 %{qtdir}/translations/
-
-%files config
-%defattr(-,root,root,-)
+#files config
+#defattr(-,root,root,-)
 %{qtdir}/bin/qt*config*
 %{_bindir}/qt*config*
 %{_datadir}/applications/*qtconfig*.desktop
@@ -337,14 +360,16 @@
 %{_bindir}/qt3to4
 %{_bindir}/rcc*
 %{_bindir}/uic*
-%{qtdir}/include/
+%dir %{qt_headerdir}/
+%{qt_headerdir}/*
 %{qtdir}/mkspecs/
-%{qt_libdir}/lib*.so
+%{qt_libdir}/libQtDesigner.so.*
+%{qt_libdir}/libQtDesignerComponents.so.*
+%{qt_libdir}/libQt*.so
 # 2 remaining static libs: libQtAssistantClient.a libQtUiTools.a 
-%{qt_libdir}/lib*.a
-%{qt_libdir}/lib*.prl
+%{qt_libdir}/libQt*.a
+%{qt_libdir}/libQt*.prl
 %{qtdir}/phrasebooks/
-#{qt_libdir}/*.pc
 %{_libdir}/pkgconfig/*.pc
 %{qtdir}/q3porting.xml
 # Qt designer
@@ -400,6 +425,16 @@
 
 
 %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
+- -config: mash into main pkg, should be multilib friendly now
+
 * Fri Jun 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 4.1.4-1
 - 4.1.4