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