author | Alex Viskovatoff <herzen@imap.cc> |
Mon, 25 Jul 2011 18:11:39 +0100 | |
changeset 16 | d94444f881f4 |
child 18 | 01c2928d9810 |
permissions | -rw-r--r-- |
16
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
1 |
diff -r bfbf8169a069 SFEboost-gpp.spec |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
2 |
--- a/SFEboost-gpp.spec Sun Jul 17 21:52:10 2011 +0000 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
3 |
+++ b/SFEboost-gpp.spec Mon Jul 18 02:09:00 2011 +0100 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
4 |
@@ -24,19 +24,12 @@ |
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 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
25 |
@@ -90,18 +83,17 @@ |
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 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
34 |
- |
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} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
40 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
41 |
%changelog |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
42 |
+* Sun Jun 26 2011 - Alex Viskovatoff |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
43 |
+- Eliminate separate devel and doc packages: facets provide that functionality |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
44 |
* Thu Jun 23 2011 - Alex Viskovatoff |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
45 |
- set correct runpath for libboost_regex, so it finds ICU libraries |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
46 |
* Sun Apr 3 2011 - Alex Viskovatoff |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
47 |
diff -r bfbf8169a069 SFEboost-stdcxx.spec |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
48 |
--- a/SFEboost-stdcxx.spec Sun Jul 17 21:52:10 2011 +0000 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
49 |
+++ b/SFEboost-stdcxx.spec Mon Jul 18 02:09:00 2011 +0100 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
50 |
@@ -37,7 +37,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
51 |
Requires: SFEicu |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
52 |
Requires: SUNWlibstdcxx4 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
53 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
54 |
-%package -n %name-devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
55 |
+%package devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
56 |
Summary: %summary - development files |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
57 |
SUNW_BaseDir: %_basedir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
58 |
%include default-depend.inc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
59 |
@@ -135,7 +135,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
60 |
%dir %attr (0755, root, bin) %_libdir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
61 |
%{_libdir}/lib*.so* |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
62 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
63 |
-%files -n %name-devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
64 |
+%files devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
65 |
%defattr (-, root, bin) |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
66 |
%dir %attr (0755, root, bin) %_includedir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
67 |
%_includedir/boost |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
68 |
@@ -145,6 +145,8 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
69 |
%_docdir/boost-%version/* |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
70 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
71 |
%changelog |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
72 |
+* Sun Jun 26 2011 - Alex Viskovatoff |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
73 |
+- Eliminate separate devel package: facets provide that functionality |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
74 |
* Sun Apr 3 2011 - Alex Viskovatoff <[email protected]> |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
75 |
- Update to 1.46.1 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
76 |
* Thu Jan 27 2011 - Alex Viskovatoff |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
77 |
diff -r bfbf8169a069 SFEgcc.spec |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
78 |
--- a/SFEgcc.spec Sun Jul 17 21:52:10 2011 +0000 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
79 |
+++ b/SFEgcc.spec Mon Jul 18 02:09:00 2011 +0100 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
80 |
@@ -154,7 +154,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
81 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
82 |
Requires: SUNWpostrun |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
83 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
84 |
-%package -n SFEgcc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
85 |
+%package devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
86 |
Summary: GNU gcc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
87 |
Version: %{version} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
88 |
SUNW_BaseDir: %{_basedir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
89 |
@@ -189,7 +189,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
90 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
91 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
92 |
%if %build_l10n |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
93 |
-%package -n SFEgcc-l10n |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
94 |
+%package l10n |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
95 |
Summary: %{summary} - l10n files |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
96 |
SUNW_BaseDir: %{_basedir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
97 |
%include default-depend.inc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
98 |
@@ -411,7 +411,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
99 |
%clean |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
100 |
rm -rf $RPM_BUILD_ROOT |
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 |
-%post -n SFEgcc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
103 |
+%post devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
104 |
( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ; |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
105 |
echo 'infos="'; |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
106 |
echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ; |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
107 |
@@ -422,7 +422,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
108 |
echo 'done'; |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
109 |
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
|
110 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
111 |
-%preun -n SFEgcc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
112 |
+%preun devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
113 |
( echo 'PATH=/usr/bin:/usr/sfw/bin; export PATH' ; |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
114 |
echo 'infos="'; |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
115 |
echo 'gcc.info cpp.info gccint.info cppinternals.info gccinstall.info gfortran.info' ; |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
116 |
@@ -446,7 +446,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
117 |
%{_gnu_libdir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
118 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
119 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
120 |
-%files -n SFEgcc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
121 |
+%files devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
122 |
%defattr (-, root, bin) |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
123 |
%dir %attr (0755, root, bin) %{_prefix} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
124 |
%{_prefix}/man |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
125 |
@@ -474,7 +474,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
126 |
%{_datadir}/gcc-%{version}/python/libstdcxx/__init__.py |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
127 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
128 |
%if %build_l10n |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
129 |
-%files -n SFEgcc-l10n |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
130 |
+%files l10n |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
131 |
%defattr (-, root, bin) |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
132 |
%dir %attr (0755, root, bin) %{_prefix} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
133 |
%dir %attr (0755, root, sys) %{_datadir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
134 |
diff -r bfbf8169a069 SFEqt47-gpp.spec |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
135 |
--- a/SFEqt47-gpp.spec Sun Jul 17 21:52:10 2011 +0000 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
136 |
+++ b/SFEqt47-gpp.spec Mon Jul 18 02:09:00 2011 +0100 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
137 |
@@ -63,17 +63,12 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
138 |
#detected by ldding the binaries |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
139 |
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
|
140 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
141 |
-%package -n %name-devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
142 |
+%package devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
143 |
Summary: %{summary} - development files |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
144 |
SUNW_BaseDir: %{_basedir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
145 |
%include default-depend.inc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
146 |
Requires: %name |
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 |
-%package -n %name-doc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
149 |
-Summary: %{summary} - documentation files |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
150 |
-SUNW_BaseDir: %{_basedir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
151 |
-%include default-depend.inc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
152 |
-Requires: %name |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
153 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
154 |
%prep |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
155 |
%setup -q -n %srcname-%version |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
156 |
@@ -186,7 +181,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
157 |
%_datadir/qt/phrasebooks |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
158 |
%_datadir/qt/translations |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
159 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
160 |
-%files -n %name-devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
161 |
+%files devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
162 |
%defattr (-, root, bin) |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
163 |
%_bindir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
164 |
%dir %attr (0755, root, bin) %_includedir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
165 |
@@ -198,9 +193,6 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
166 |
%dir %attr (0755, root, sys) %_datadir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
167 |
%_datadir/qt/mkspecs |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
168 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
169 |
-%files -n %name-doc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
170 |
-%defattr (-, root, bin) |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
171 |
-%dir %attr (0755, root, sys) %_datadir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
172 |
%_datadir/qt/q3porting.xml |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
173 |
%dir %attr (0755, root, other) %_datadir/doc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
174 |
%_datadir/doc/* |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
175 |
@@ -209,6 +201,10 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
176 |
%changelog |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
177 |
* Sat Jul 2 2011 - Alex Viskovatoff <[email protected]> |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
178 |
- Add missing dependency on SFEgcc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
179 |
+* Sun Jun 26 2011 - Alex Viskovatoff |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
180 |
+- 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
|
181 |
+- 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
|
182 |
+ the doc facet to avoid getting the Qt documenation files |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
183 |
* Sat Jun 25 2011 - Alex Viskovatoff <[email protected]> |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
184 |
- 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
|
185 |
- Bump to 4.7.3 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
186 |
diff -r bfbf8169a069 SFEqt47.spec |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
187 |
--- a/SFEqt47.spec Sun Jul 17 21:52:10 2011 +0000 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
188 |
+++ b/SFEqt47.spec Mon Jul 18 02:09:00 2011 +0100 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
189 |
@@ -121,18 +121,12 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
190 |
Requires: SUNWxwxft |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
191 |
# The above also pulls in SUNWfreetype2 |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
192 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
193 |
-%package -n %name-devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
194 |
+%package devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
195 |
Summary: %summary - development files |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
196 |
SUNW_BaseDir: %_basedir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
197 |
%include default-depend.inc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
198 |
Requires: %name |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
199 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
200 |
-%package -n %name-doc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
201 |
-Summary: %summary - documentation files |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
202 |
-SUNW_BaseDir: %_basedir |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
203 |
-%include default-depend.inc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
204 |
-Requires: %name |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
205 |
- |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
206 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
207 |
%prep |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
208 |
%setup -q -n %{srcname}-%version |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
209 |
@@ -259,7 +253,7 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
210 |
%dir %attr (0755, root, sys) %{_datadir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
211 |
%{_datadir}/qt |
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 |
-%files -n %name-devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
214 |
+%files devel |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
215 |
%defattr (-, root, bin) |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
216 |
%dir %attr (0755, root, bin) %{_includedir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
217 |
%dir %attr (0755, root, other) %{_includedir}/qt |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
218 |
@@ -268,14 +262,14 @@ |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
219 |
%dir %attr (0755, root, other) %{_libdir}/pkgconfig |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
220 |
%{_libdir}/pkgconfig/* |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
221 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
222 |
-%files -n %name-doc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
223 |
-%defattr (-, root, bin) |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
224 |
%dir %attr (0755, root, sys) %{_datadir} |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
225 |
%dir %attr (0755, root, other) %{_datadir}/doc |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
226 |
%{_datadir}/doc/* |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
227 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
228 |
|
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
229 |
%changelog |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
230 |
+* Sun Jun 26 2011 - Alex Viskovatoff |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
231 |
+- Eliminate separate devel and doc packages: facets provide that functionality |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
232 |
* Wed Mar 30 2011 - Alex Viskovatoff |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
233 |
- create separate doc package |
d94444f881f4
Add eliminate-subpackages MQ patch
Alex Viskovatoff <herzen@imap.cc>
parents:
diff
changeset
|
234 |
* Tue Mar 29 2011 - Thomas Wagner |