Mercurial Mercurial > projects > sfe > oi-sfe-tools / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate-subpackages.patch
author Alex Viskovatoff <herzen@imap.cc>
Mon, 25 Jul 2011 18:11:39 +0100
changeset 16 d94444f881f4
child 18 01c2928d9810
permissions -rw-r--r--
Add eliminate-subpackages MQ patch

diff -r bfbf8169a069 SFEboost-gpp.spec
--- a/SFEboost-gpp.spec	Sun Jul 17 21:52:10 2011 +0000
+++ b/SFEboost-gpp.spec	Mon Jul 18 02:09:00 2011 +0100
@@ -24,19 +24,12 @@
 BuildRequires:	SFEicu-gpp-devel
 Requires:	SFEicu-gpp
 
-%package -n %name-devel
+%package devel
 Summary:        %{summary} - development files
 SUNW_BaseDir:   %{_basedir}
 %include default-depend.inc
 Requires: %name
 
-%package -n %name-doc
-Summary:        %{summary} - development files
-SUNW_BaseDir:   %{_basedir}
-%include default-depend.inc
-Requires: %name
-
-
 %prep
 rm -rf %name-%version
 mkdir %name-%version
@@ -90,18 +83,17 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/lib*.so*
 
-%files -n %name-devel
+%files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_includedir}
 %{_includedir}/boost
-
-%files -n %name-doc
-%defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_docdir}
 %{_docdir}/boost-%{version}
 
 %changelog
+* Sun Jun 26 2011 - Alex Viskovatoff
+- Eliminate separate devel and doc packages: facets provide that functionality
 * Thu Jun 23 2011 - Alex Viskovatoff
 - set correct runpath for libboost_regex, so it finds ICU libraries
 * Sun Apr  3 2011 - Alex Viskovatoff
diff -r bfbf8169a069 SFEboost-stdcxx.spec
--- a/SFEboost-stdcxx.spec	Sun Jul 17 21:52:10 2011 +0000
+++ b/SFEboost-stdcxx.spec	Mon Jul 18 02:09:00 2011 +0100
@@ -37,7 +37,7 @@
 Requires: SFEicu
 Requires: SUNWlibstdcxx4
 
-%package -n %name-devel
+%package devel
 Summary:        %summary - development files
 SUNW_BaseDir:   %_basedir
 %include default-depend.inc
@@ -135,7 +135,7 @@
 %dir %attr (0755, root, bin) %_libdir
 %{_libdir}/lib*.so*
 
-%files -n %name-devel
+%files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %_includedir
 %_includedir/boost
@@ -145,6 +145,8 @@
 %_docdir/boost-%version/*
 
 %changelog
+* Sun Jun 26 2011 - Alex Viskovatoff
+- Eliminate separate devel package: facets provide that functionality
 * Sun Apr  3 2011 - Alex Viskovatoff <[email protected]>
 - Update to 1.46.1
 * Thu Jan 27 2011 - Alex Viskovatoff
diff -r bfbf8169a069 SFEgcc.spec
--- a/SFEgcc.spec	Sun Jul 17 21:52:10 2011 +0000
+++ b/SFEgcc.spec	Mon Jul 18 02:09:00 2011 +0100
@@ -154,7 +154,7 @@
 
 Requires: SUNWpostrun
 
-%package -n SFEgcc
+%package devel
 Summary:                 GNU gcc
 Version:                 %{version}
 SUNW_BaseDir:            %{_basedir}
@@ -189,7 +189,7 @@
 
 
 %if %build_l10n
-%package -n SFEgcc-l10n
+%package l10n
 Summary:                 %{summary} - l10n files
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
@@ -411,7 +411,7 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -n SFEgcc
+%post devel
 ( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
   echo 'infos="';
   echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ;
@@ -422,7 +422,7 @@
   echo 'done';
   echo 'exit $retval' ) | $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
 
-%preun -n SFEgcc
+%preun devel
 ( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
   echo 'infos="';
   echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ;
@@ -446,7 +446,7 @@
 %{_gnu_libdir}
 
 
-%files -n SFEgcc
+%files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_prefix}
 %{_prefix}/man
@@ -474,7 +474,7 @@
 %{_datadir}/gcc-%{version}/python/libstdcxx/__init__.py
 
 %if %build_l10n
-%files -n SFEgcc-l10n
+%files l10n
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_prefix}
 %dir %attr (0755, root, sys) %{_datadir}
diff -r bfbf8169a069 SFEqt47-gpp.spec
--- a/SFEqt47-gpp.spec	Sun Jul 17 21:52:10 2011 +0000
+++ b/SFEqt47-gpp.spec	Mon Jul 18 02:09:00 2011 +0100
@@ -63,17 +63,12 @@
 #detected by ldding the binaries
 Requires: database/mysql-51/library,image/library/libjpeg,image/library/libpng,image/library/libtiff,library/glib2,library/libxml2,library/zlib,service/opengl/ogl-select,system/library,system/library/c++/sunpro,system/library/math,x11/library/libice,x11/library/libsm,x11/library/libx11,x11/library/libxdamage,x11/library/libxext,x11/library/libxrender,x11/library/mesa 
 
-%package -n %name-devel
+%package devel
 Summary:        %{summary} - development files
 SUNW_BaseDir:   %{_basedir}
 %include default-depend.inc
 Requires: %name
 
-%package -n %name-doc
-Summary:        %{summary} - documentation files
-SUNW_BaseDir:   %{_basedir}
-%include default-depend.inc
-Requires: %name
 
 %prep
 %setup -q -n %srcname-%version
@@ -186,7 +181,7 @@
 %_datadir/qt/phrasebooks
 %_datadir/qt/translations
 
-%files -n %name-devel
+%files devel
 %defattr (-, root, bin)
 %_bindir
 %dir %attr (0755, root, bin) %_includedir
@@ -198,9 +193,6 @@
 %dir %attr (0755, root, sys) %_datadir
 %_datadir/qt/mkspecs
 
-%files -n %name-doc
-%defattr (-, root, bin)
-%dir %attr (0755, root, sys) %_datadir
 %_datadir/qt/q3porting.xml
 %dir %attr (0755, root, other) %_datadir/doc
 %_datadir/doc/*
@@ -209,6 +201,10 @@
 %changelog
 * Sat Jul  2 2011 - Alex Viskovatoff <[email protected]>
 - Add missing dependency on SFEgcc
+* Sun Jun 26 2011 - Alex Viskovatoff
+- Eliminate separate devel and doc IPS packages: facets provide that functionality
+- Place doc files in the devel SVr4 package, so users do not have to disable
+  the doc facet to avoid getting the Qt documenation files
 * Sat Jun 25 2011 - Alex Viskovatoff <[email protected]>
 - Use patches from kde-solaris instead of those inherited from SFEqt47.spec
 - Bump to 4.7.3
diff -r bfbf8169a069 SFEqt47.spec
--- a/SFEqt47.spec	Sun Jul 17 21:52:10 2011 +0000
+++ b/SFEqt47.spec	Mon Jul 18 02:09:00 2011 +0100
@@ -121,18 +121,12 @@
 Requires: SUNWxwxft
 # The above also pulls in SUNWfreetype2
 
-%package -n %name-devel
+%package devel
 Summary:        %summary - development files
 SUNW_BaseDir:   %_basedir
 %include default-depend.inc
 Requires: %name
 
-%package -n %name-doc
-Summary:        %summary - documentation files
-SUNW_BaseDir:   %_basedir
-%include default-depend.inc
-Requires: %name
-
 
 %prep
 %setup -q -n %{srcname}-%version
@@ -259,7 +253,7 @@
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/qt
 
-%files -n %name-devel
+%files devel
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_includedir}
 %dir %attr (0755, root, other) %{_includedir}/qt
@@ -268,14 +262,14 @@
 %dir %attr (0755, root, other) %{_libdir}/pkgconfig 
 %{_libdir}/pkgconfig/*
 
-%files -n %name-doc
-%defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/*
 
 
 %changelog
+* Sun Jun 26 2011 - Alex Viskovatoff
+- Eliminate separate devel and doc packages: facets provide that functionality
 * Wed Mar 30 2011 - Alex Viskovatoff
 - create separate doc package
 * Tue Mar 29 2011 - Thomas Wagner
projects/sfe/oi-sfe-tools