projects/sfe/oi-sfe-tools: eliminate-subpackages.patch@01c2928d9810 (annotated)

18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	1	diff -r 8ab0b5b4e3fa SFEboost-gpp.spec
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	2	--- a/SFEboost-gpp.spec Sat Aug 06 19:29:20 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	3	+++ b/SFEboost-gpp.spec Sat Aug 06 19:32:48 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	4	@@ -26,19 +26,12 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	5	BuildRequires: SFEicu-gpp-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	6	Requires: SFEicu-gpp
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	7
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	8	-%package -n %name-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	9	+%package devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	10	Summary: %{summary} - development files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	11	SUNW_BaseDir: %{_basedir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	12	%include default-depend.inc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	13	Requires: %name
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	14
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	15	-%package -n %name-doc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	16	-Summary: %{summary} - development files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	17	-SUNW_BaseDir: %{_basedir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	18	-%include default-depend.inc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	19	-Requires: %name
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	20	-
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	21	-
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	22	%prep
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	23	rm -rf %name-%version
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	24	mkdir %name-%version
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	25	@@ -98,13 +91,11 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	26	%dir %attr (0755, root, bin) %{_libdir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	27	%{_libdir}/lib.so
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	28
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	29	-%files -n %name-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	30	+%files devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	31	%defattr (-, root, bin)
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	32	%dir %attr (0755, root, bin) %{_includedir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	33	%{_includedir}/boost
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	34
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	35	-%files -n %name-doc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	36	-%defattr (-, root, bin)
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	37	%dir %attr (0755, root, sys) %{_datadir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	38	%dir %attr (0755, root, other) %{_docdir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	39	%{_docdir}/boost-%{version}
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	40	diff -r 8ab0b5b4e3fa SFEboost-stdcxx.spec
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	41	--- a/SFEboost-stdcxx.spec Sat Aug 06 19:29:20 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	42	+++ b/SFEboost-stdcxx.spec Sat Aug 06 19:32:48 2011 +0100
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	43	@@ -37,7 +37,7 @@
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	44	Requires: SFEicu
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	45	Requires: SUNWlibstdcxx4
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	46
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	47	-%package -n %name-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	48	+%package devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	49	Summary: %summary - development files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	50	SUNW_BaseDir: %_basedir
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	51	%include default-depend.inc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	52	@@ -135,7 +135,7 @@
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	53	%dir %attr (0755, root, bin) %_libdir
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	54	%{_libdir}/lib.so
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	55
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	56	-%files -n %name-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	57	+%files devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	58	%defattr (-, root, bin)
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	59	%dir %attr (0755, root, bin) %_includedir
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	60	%_includedir/boost
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	61	@@ -145,6 +145,8 @@
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	62	%_docdir/boost-%version/*
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	63
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	64	%changelog
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	65	+* Sun Jun 26 2011 - Alex Viskovatoff
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	66	+- Eliminate separate devel package: facets provide that functionality
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	67	* Sun Apr 3 2011 - Alex Viskovatoff <[email protected]>
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	68	- Update to 1.46.1
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	69	* Thu Jan 27 2011 - Alex Viskovatoff
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	70	diff -r 8ab0b5b4e3fa SFEgcc.spec
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	71	--- a/SFEgcc.spec Sat Aug 06 19:29:20 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	72	+++ b/SFEgcc.spec Sat Aug 06 19:32:48 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	73	@@ -98,7 +98,7 @@
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	74	%define _gnu_libdir %{_basedir}/gnu/lib
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	75
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	76	Name: SFEgccruntime
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	77	-Summary: GNU gcc runtime libraries required by applications
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	78	+Summary: GNU gcc compiler and runtime libraries
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	79	Version: 4.6.1
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	80	License: GPLv3+
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	81	SUNW_Copyright: gcc.copyright
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	82	@@ -108,7 +108,7 @@
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	83	Patch2: gcc-02-handle_pragma_pack_push_pop.diff
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	84	%else
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	85	%endif
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	86	-Patch3: gcc-03-gnulib.diff
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	87	+#Patch3: gcc-03-gnulib.diff
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	88	SUNW_BaseDir: %{_basedir}
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	89	BuildRoot: %{_tmppath}/%{name}-%{version}-build
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	90	%include default-depend.inc
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	91	@@ -157,7 +157,7 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	92
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	93	Requires: SUNWpostrun
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	94
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	95	-%package -n SFEgcc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	96	+%package devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	97	Summary: GNU gcc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	98	Version: %{version}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	99	SUNW_BaseDir: %{_basedir}
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	100	@@ -192,7 +192,7 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	101
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	102
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	103	%if %build_l10n
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	104	-%package -n SFEgcc-l10n
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	105	+%package l10n
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	106	Summary: %{summary} - l10n files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	107	SUNW_BaseDir: %{_basedir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	108	%include default-depend.inc
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	109	@@ -211,7 +211,7 @@
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	110	%patch2 -p1
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	111	%else
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	112	%endif
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	113	-%patch3 -p1
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	114	+#%patch3 -p1
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	115
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	116	%build
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	117	CPUS=`/usr/sbin/psrinfo \| grep on-line \| wc -l \| tr -d ' '`
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	118	@@ -413,7 +413,7 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	119	%clean
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	120	rm -rf $RPM_BUILD_ROOT
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	121
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	122	-%post -n SFEgcc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	123	+%post devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	124	( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	125	echo 'infos="';
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	126	echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ;
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	127	@@ -424,7 +424,7 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	128	echo 'done';
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	129	echo 'exit $retval' ) \| $PKG_INSTALL_ROOT/usr/lib/postrun -b -c SFE
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	130
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	131	-%preun -n SFEgcc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	132	+%preun devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	133	( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ;
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	134	echo 'infos="';
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	135	echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ;
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	136	@@ -448,7 +448,7 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	137	%{_gnu_libdir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	138
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	139
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	140	-%files -n SFEgcc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	141	+%files devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	142	%defattr (-, root, bin)
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	143	%dir %attr (0755, root, bin) %{_prefix}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	144	%{_prefix}/man
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	145	@@ -476,7 +476,7 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	146	%{_datadir}/gcc-%{version}/python/libstdcxx/__init__.py
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	147
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	148	%if %build_l10n
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	149	-%files -n SFEgcc-l10n
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	150	+%files l10n
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	151	%defattr (-, root, bin)
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	152	%dir %attr (0755, root, bin) %{_prefix}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	153	%dir %attr (0755, root, sys) %{_datadir}
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	154	diff -r 8ab0b5b4e3fa SFEqt-gpp.spec
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	155	--- a/SFEqt-gpp.spec Sat Aug 06 19:29:20 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	156	+++ b/SFEqt-gpp.spec Sat Aug 06 19:32:48 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	157	@@ -71,17 +71,12 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	158	#detected by ldding the binaries
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	159	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
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	160
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	161	-%package -n %name-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	162	+%package devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	163	Summary: %{summary} - development files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	164	SUNW_BaseDir: %{_basedir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	165	%include default-depend.inc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	166	Requires: %name
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	167
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	168	-%package -n %name-doc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	169	-Summary: %{summary} - documentation files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	170	-SUNW_BaseDir: %{_basedir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	171	-%include default-depend.inc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	172	-Requires: %name
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	173
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	174	%prep
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	175	%setup -q -n %srcname-%version
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	176	@@ -196,7 +191,7 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	177	%_datadir/qt/phrasebooks
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	178	%_datadir/qt/translations
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	179
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	180	-%files -n %name-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	181	+%files devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	182	%defattr (-, root, bin)
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	183	%_bindir
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	184	%dir %attr (0755, root, bin) %_includedir
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	185	@@ -210,9 +205,6 @@
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	186	%dir %attr (0755, root, other) %_prefix/imports
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	187	%_prefix/imports/*
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	188
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	189	-%files -n %name-doc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	190	-%defattr (-, root, bin)
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	191	-%dir %attr (0755, root, sys) %_datadir
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	192	%_datadir/qt/q3porting.xml
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	193	%dir %attr (0755, root, other) %_datadir/doc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	194	%_datadir/doc/*
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	195	@@ -229,6 +221,10 @@
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	196	- Add patch qt-isnan.diff to enable building with gcc 4.6
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	197	* Sat Jul 2 2011 - Alex Viskovatoff <[email protected]>
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	198	- Add missing dependency on SFEgcc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	199	+* Sun Jun 26 2011 - Alex Viskovatoff
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	200	+- Eliminate separate devel and doc IPS packages: facets provide that functionality
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	201	+- Place doc files in the devel SVr4 package, so users do not have to disable
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	202	+ the doc facet to avoid getting the Qt documenation files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	203	* Sat Jun 25 2011 - Alex Viskovatoff <[email protected]>
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	204	- Use patches from kde-solaris instead of those inherited from SFEqt47.spec
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	205	- Bump to 4.7.3
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	206	diff -r 8ab0b5b4e3fa SFEqt47.spec
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	207	--- a/SFEqt47.spec Sat Aug 06 19:29:20 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	208	+++ b/SFEqt47.spec Sat Aug 06 19:32:48 2011 +0100
01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	209	@@ -122,18 +122,12 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	210	Requires: SUNWxwxft
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	211	# The above also pulls in SUNWfreetype2
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	212
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	213	-%package -n %name-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	214	+%package devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	215	Summary: %summary - development files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	216	SUNW_BaseDir: %_basedir
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	217	%include default-depend.inc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	218	Requires: %name
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	219
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	220	-%package -n %name-doc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	221	-Summary: %summary - documentation files
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	222	-SUNW_BaseDir: %_basedir
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	223	-%include default-depend.inc
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	224	-Requires: %name
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	225	-
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	226
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	227	%prep
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	228	%setup -q -n %{srcname}-%version
18 01c2928d9810 Disable gcc-03-gnulib.diff patch, which prevents specs from placing a path at the head of runpath. Alex Viskovatoff <herzen@imap.cc> parents: 16 diff changeset	229	@@ -260,7 +254,7 @@
16 d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	230	%dir %attr (0755, root, sys) %{_datadir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	231	%{_datadir}/qt
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	232
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	233	-%files -n %name-devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	234	+%files devel
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	235	%defattr (-, root, bin)
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	236	%dir %attr (0755, root, bin) %{_includedir}
d94444f881f4 Add eliminate-subpackages MQ patch Alex Viskovatoff <herzen@imap.cc> parents: diff changeset	237	%dir %attr (0755, root, other) %{_includedir}/qt

author	Alex Viskovatoff <herzen@imap.cc>
	Sat, 06 Aug 2011 19:34:59 +0100
changeset 18	01c2928d9810
parent 16	d94444f881f4
child 19	f720bde9865f
permissions	-rwxr-xr-x