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