rpms/qt4/devel qt4.spec,1.8,1.9
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Tue Jun 27 19:05:08 UTC 2006
Author: rdieter
Update of /cvs/extras/rpms/qt4/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv918
Modified Files:
qt4.spec
Log Message:
* 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/devel/qt4.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qt4.spec 23 Jun 2006 15:11:02 -0000 1.8
+++ qt4.spec 27 Jun 2006 19:05:08 -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: 2%{?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,22 +83,27 @@
#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
+%package debug
+Summary: Library files built for debugging
+Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
-%description config
+%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
@@ -111,8 +121,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,9 +197,10 @@
-no-rpath \
-prefix %{qtdir} \
-docdir %{qt_docdir} \
+ -headerdir %{qt_headerdir} \
-libdir %{qt_libdir} \
-platform %{platform} \
- -release \
+ -debug-and-release \
-shared \
-no-exceptions \
-largefile \
@@ -305,20 +316,36 @@
%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,-)
+## 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*
@@ -337,14 +364,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 +429,11 @@
%changelog
+* 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
More information about the fedora-extras-commits
mailing list