SPECS (qt-copy): qt4.spec - One -devel subpkg (but QtSql-devel) - ...

adgor adgor at pld-linux.org
Tue Jul 5 21:24:47 CEST 2005 

Author: adgor                        Date: Tue Jul  5 19:24:47 2005 GMT
Module: SPECS                         Tag: qt-copy
---- Log message:
- One -devel subpkg (but QtSql-devel)
- -demos subpkg merged into -examples
- Precompiled headers installation
- Fixed & simplified %files section (magic functs are removed)
- Some things commented out (need checkout)

---- Files affected:
SPECS:
   qt4.spec (1.30.2.1 -> 1.30.2.2) 

---- Diffs:

================================================================
Index: SPECS/qt4.spec
diff -u SPECS/qt4.spec:1.30.2.1 SPECS/qt4.spec:1.30.2.2
--- SPECS/qt4.spec:1.30.2.1	Mon Jul  4 21:20:43 2005
+++ SPECS/qt4.spec	Tue Jul  5 21:24:42 2005
@@ -19,7 +19,6 @@
 %bcond_without	ibase		# build ibase (InterBase/Firebird) plugin
 %bcond_without	pch		# enable pch in qmake
 %bcond_with	dont_enable	# blocks translations, they are not yet available
-%bcond_without	demos		# do not build & install demos
 %bcond_without	examples	# do not build & install examples
 
 %undefine	with_dont_enable
@@ -129,6 +128,24 @@
 na Qt aplikacji korzystających z Motif oraz pisanie wtyczek z
 wykorzystaniem Netscape LiveConnect.
 
+%package devel
+Summary:	development files
+Summary(pl):	pliki programistyczne
+Group:		X11/Development/Libraries
+Requires:	QtCore = %{epoch}:%{version}-%{release}
+Requires:	QtGui = %{epoch}:%{version}-%{release}
+Requires:	QtNetwork = %{epoch}:%{version}-%{release}
+Requires:	QtOpenGL = %{epoch}:%{version}-%{release}
+Requires:	Qt3Support = %{epoch}:%{version}-%{release}
+Requires:	QtXml = %{epoch}:%{version}-%{release}
+Requires:	%{name}-designer-libs = %{epoch}:%{version}-%{release}
+
+%description devel
+development files.
+
+%description devel -l pl
+pliki programistyczne.
+
 %package -n QtCore
 Summary:	Core classes used by other modules
 Summary(pl):	Podstawowe klasy używane przez inne moduły
@@ -749,7 +766,7 @@
 
 %{__make} \
 	sub-tools-all-ordered \
-	%{?with_demos:sub-demos-all-ordered} \
+	%{?with_examples:sub-demos-all-ordered} \
 	%{?with_examples:sub-examples-all-ordered}
 
 #
@@ -759,12 +776,12 @@
 #	Find out why and fix the reason of building only mysql sqldriver
 #	(it is not installed either)
 #
-for dir in src/plugins/sqldrivers/{ibase,odbc,psql,sqlite,sqlite2}
-do
-	cd $dir
-	%{__make}
-	cd -
-done
+#for dir in src/plugins/sqldrivers/{ibase,odbc,psql,sqlite,sqlite2}
+#do
+#	cd $dir
+#	%{__make}
+#	cd -
+#done
 
 %if %{with dont_enable}
 %if %{with designer}
@@ -843,83 +860,29 @@
 install tools/linguist/linguist/linguist_fr.qm $RPM_BUILD_ROOT%{_datadir}/locale/fr/LC_MESSAGES/linguist.qm
 %endif
 
-cd $RPM_BUILD_ROOT%{_includedir}/qt4/Qt
-for f in ../Qt{3Support,Core,Gui,Network,OpenGL,Sql,Xml,Designer}/*
-do
-	if [ ! -d $f ]; then
-		ln -sf $f `basename $f`
-	fi
-done
-ln -sf ../../QtCore/arch/qatomic.h arch/qatomic.h
+#cd $RPM_BUILD_ROOT%{_includedir}/qt4/Qt
+#for f in ../Qt{3Support,Core,Gui,Network,OpenGL,Sql,Xml,Designer}/*
+#do
+#	if [ ! -d $f ]; then
+#		ln -sf $f `basename $f`
+#	fi
+#done
+#ln -sf ../../QtCore/arch/qatomic.h arch/qatomic.h
+#cd -
+
+# Install precompiled headers
+PCHDIR="$RPM_BUILD_ROOT%{_includedir}/qt4/Qt/private"
+install -d $PCHDIR
+cd include/Qt/private
+for h in *.h; do
+	install `cat $h|sed -e 's/#include //' -e 's/"//g'` $PCHDIR
+done	
 cd -
 
 for f in $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc; do
 	sed -i -e s:-L`pwd`/lib::g $f
 done
 
-# Prepare some files list
-ifecho () {
-	RESULT=`echo $RPM_BUILD_ROOT$2 2>/dev/null`
-	[ "$RESULT" == "" ] && return
-	r=`echo $RESULT | awk '{ print $1 }'`
-
-	if [ -d "$r" ]; then
-		echo "%%dir $2" >> $1.files
-	elif [ -x "$r" ] ; then
-		echo "%%attr(755,root,root) $2" >> $1.files
-	elif [ -f "$r" ]; then
-		echo "$2" >> $1.files
-	else
-		echo "Error generation devel files list!"
-		echo "$r: no such file or direcotry!"
-		return 1
-	fi
-}
-
-mkdevfl () {
-	MODULE=$1; shift
-	echo "%%defattr(644,root,root,755)" > $MODULE-devel.files
-	ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.so"
-	ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.la" 
-	ifecho $MODULE-devel "%{_libdir}/lib$MODULE*.prl"
-	ifecho $MODULE-devel "%{_pkgconfigdir}/$MODULE*.pc"
-	for f in `find $RPM_BUILD_ROOT%{_includedir}/qt4/$MODULE -printf "%%P "`
-	do
-		ifecho $MODULE-devel %{_includedir}/qt4/$MODULE/$f
-		ifecho $MODULE-devel %{_includedir}/qt4/Qt/$f
-	done
-	for f in $@; do ifecho $MODULE-devel $f; done
-}
-
-mkdevfl QtCore 	%{_includedir}/qt4 %{_includedir}/qt4/Qt \
-	%{_libdir}/libQtAssistantClient{.prl,_debug.prl}
-mkdevfl QtGui
-mkdevfl QtNetwork
-mkdevfl QtOpenGL
-mkdevfl QtSql
-mkdevfl QtXml
-mkdevfl Qt3Support
-mkdevfl QtDesigner || /bin/true # there is no libQtDesigner.la file :/
-
-%if %{with examples}
-echo "%defattr(644,root,root,755)" > examples.files
-ifecho examples %{_examplesdir}/qt4
-for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4 -printf "%%P "`
-do
-	ifecho examples %{_examplesdir}/qt4/$f
-done
-%endif
-
-%if %{with demos}
-echo "%defattr(644,root,root,755)" > demos.files
-ifecho demos "%{_examplesdir}/qt4-demos"
-ifecho demos "%{_bindir}/qtdemo" >> demos.files
-for f in `find $RPM_BUILD_ROOT%{_examplesdir}/qt4-demos -printf "%%P "`
-do
-	ifecho demos %{_examplesdir}/qt4-demos/$f
-done
-%endif
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -961,6 +924,15 @@
 %post	designer-libs	-p /sbin/ldconfig
 %postun	designer-libs	-p /sbin/ldconfig
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/qt4/Qt
+%{_includedir}/qt4/Qt[!S]*
+%{_libdir}/libQt[!S]*.la
+%{_libdir}/libQt[!S]*.prl
+%{_libdir}/libQt[!S]*.so
+%{_pkgconfigdir}/Qt[!S]*.pc
+
 %files -n QtCore
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) 
@@ -991,6 +963,14 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtSql*.so.*
 
+%files -n QtSql-devel
+%defattr(644,root,root,755)
+%{_includedir}/qt4/QtSql
+%{_libdir}/libQtSql*.la
+%{_libdir}/libQtSql*.prl
+%{_libdir}/libQtSql*.so
+%{_pkgconfigdir}/QtSql*.pc
+
 %if %{with mysql}
 %files -n QtSql-mysql
 %defattr(644,root,root,755)
@@ -1031,7 +1011,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libQtXml*.so.*
 
-
 %files -n Qt3Support
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/uic3
@@ -1057,7 +1036,8 @@
 %if %{with designer}
 %files designer-libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libQtDesigner*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libQtDesigner*.so.*
+%dir %{_libdir}/qt4/plugins/designer
 %attr(755,root,root) %{_libdir}/qt4/plugins/designer/*.so
 
 %files designer
@@ -1105,17 +1085,10 @@
 %defattr(644,root,root,755)
 %{_docdir}/%{name}-doc
 
-%files -n QtCore-devel -f QtCore-devel.files
-%files -n QtDesigner-devel -f QtDesigner-devel.files
-%files -n QtGui-devel -f QtGui-devel.files
-%files -n QtNetwork-devel -f QtNetwork-devel.files
-%files -n QtOpenGL-devel -f QtOpenGL-devel.files
-%files -n QtSql-devel -f QtSql-devel.files
-%files -n QtXml-devel -f QtXml-devel.files
-%files -n Qt3Support-devel -f Qt3Support-devel.files
-
-%{?with_demos:%files demos -f demos.files}
-%{?with_examples:%files examples -f examples.files}
+%files examples
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/qtdemo
+%{_examplesdir}/*
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -1123,115 +1096,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.30.2.2  2005/07/05 19:24:42  adgor
+- One -devel subpkg (but QtSql-devel)
+- -demos subpkg merged into -examples
+- Precompiled headers installation
+- Fixed & simplified %files section (magic functs are removed)
+- Some things commented out (need checkout)
+
 Revision 1.30.2.1  2005/07/04 19:20:43  adgor
 - 050704 qt-copy snap
-
-Revision 1.30  2005/07/03 22:24:34  pascalek
-- Release 0.2; QtDesigner-devel package
-
-Revision 1.29  2005/07/01 15:54:33  pascalek
-- updated to 4.0.0 (builds, not tested)
-
-Revision 1.28  2005/06/26 10:46:54  qboosh
-- remaining pl, some typos and missing deps
-
-Revision 1.27  2005/06/25 22:59:43  glen
-- use sed >= 4.0 inline edit
-
-Revision 1.26  2005/06/25 22:55:35  pascalek
-- remove RPM_BUILD_DIR from pkgconfig files
-
-Revision 1.25  2005/06/23 10:28:51  pascalek
-- Release 0.rc1.0.3
-- %%files fixes
-
-Revision 1.24  2005/06/23 02:26:11  pascalek
-- Release 0.rc1.0.2
-- build patch
-- cleanups and new TODOs
-- now it builds and should work
-
-Revision 1.23  2005/06/16 19:21:03  pluto
-- updated to 4.0.0rc1, release 0.1.
-
-Revision 1.22  2005/05/19 12:50:52  djurban
-- fix build for pluto, reorganize library building into one function
-
-Revision 1.21  2005/05/17 08:32:47  pluto
-- rpmcxxflags, cosmetics.
-
-Revision 1.20  2005/05/16 21:12:57  pluto
-- typos.
-
-Revision 1.19  2005/05/16 20:01:17  pluto
-- cosmetics, tabs, %%attr.
-
-Revision 1.18  2005/05/16 14:54:39  djurban
-- typo
-
-Revision 1.17  2005/05/16 14:50:42  djurban
-- bconds:: nvidia (removed), static_libs(disabled by default)
-- removed patch9, cleaned up the spec, added ldconfigs in post/postun
-- enabled nis experimentally
-
-Revision 1.16  2005/05/15 23:40:43  djurban
-- md5...
-
-Revision 1.15  2005/05/15 23:35:48  djurban
-- the source0 i s tar.bz2 not tar
-
-Revision 1.14  2005/05/15 23:21:42  djurban
-- update to 050513 snap, release 0.1
-- new subbpackaging scheme (it is not final)
-- by default pch enabled (requires gcc >=3.4sth)
-- builds both debug and nondebug libs in shared (static aint built)
-  please use debug libs now so that we can catch bugs faster
-- still some todo left:
-  * missing ldconfigs in post, checking interdependencies, removing unneeded stuff
-  * saner descriptions
-  * sth else i forgot (sleepy)
-
-Revision 1.13  2005/05/14 09:04:59  djurban
-- NFY (sig11 in rcc)
-
-Revision 1.12  2005/05/11 15:27:01  qboosh
-- use x8664 macro
-
-Revision 1.11  2005/03/16 00:44:55  pluto
-- use mirror for source.
-
-Revision 1.10  2005/03/16 00:37:21  pluto
-- fetch source, log trimmed, pch fixed.
-
-Revision 1.9  2004/10/31 20:54:10  paladine
-- spaces->tabs
-- formatting
-
-Revision 1.8  2004/10/28 12:42:31  paladine
-- "PostgreSQL" unification
-
-Revision 1.7  2004/10/25 10:58:20  qboosh
-- there is Firebird-devel on alpha now
-
-Revision 1.6  2004/10/24 22:49:23  paladine
-- QT->Qt
-- spelling fixes
-
-Revision 1.5  2004/08/29 17:14:04  adgor
-- Cosmetics
-
-Revision 1.4  2004/07/18 23:54:46  pluto
-- qt4-hotfixes.patch added.
-
-Revision 1.3  2004/07/18 08:45:37  djurban
-- commit wha ti have for now
-
-Revision 1.2  2004/07/13 19:42:05  djurban
-- fix todo, remove %files, there will be a total overhaul in subpackaging here
-  (and yes there is an qt3 libcompat included, although it is not binary compatible
-  so you need to rebuild everything linked to the old qt3)
-
-Revision 1.1  2004/07/12 21:50:02  djurban
-- disabled designer/linguist/assistant (not in this preview)
-- removed depreciated since 3.2.0 single threaded package (qt-st*)
-- added TODO, VERY NFY, Dont Touch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/qt4.spec?r1=1.30.2.1&r2=1.30.2.2&f=u

More information about the pld-cvs-commit mailing list