Author: glen Date: Thu Jan 25 12:52:37 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - drop -devel, use xulrunner-devel instead; rel 3
---- Files affected: SPECS: mozilla-firefox.spec (1.169 -> 1.170) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.169 SPECS/mozilla-firefox.spec:1.170 --- SPECS/mozilla-firefox.spec:1.169 Wed Jan 10 00:07:08 2007 +++ SPECS/mozilla-firefox.spec Thu Jan 25 13:52:32 2007 @@ -14,7 +14,7 @@ Summary(pl): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox Version: 2.0.0.1 -Release: 2 +Release: 3 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 @@ -89,21 +89,6 @@ %description libs -l pl Biblioteki współdzielone przeglądarki Mozilla Firefox. -%package devel -Summary: Headers for developing programs that will use Mozilla Firefox -Summary(pl): Mozilla Firefox - pliki nagłówkowe -Group: X11/Development/Libraries -Requires: %{name}-libs = %{epoch}:%{version}-%{release} -Requires: nspr-devel >= 1:4.6.3 -Requires: nss-devel >= 1:3.11.3-3 -Obsoletes: mozilla-devel - -%description devel -Mozilla Firefox development package. - -%description devel -l pl -Pliki nagłówkowe przeglądarki Mozilla Firefox. - %package lang-en Summary: English resources for Mozilla Firefox Summary(pl): Anglojęzyczne zasoby dla przeglądarki Mozilla Firefox @@ -206,8 +191,7 @@ install -d \ $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ - $RPM_BUILD_ROOT%{_datadir}/%{name} \ - $RPM_BUILD_ROOT{%{_includedir},%{_pkgconfigdir}} + $RPM_BUILD_ROOT%{_datadir}/%{name} %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins @@ -244,28 +228,9 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} # header/development files -cp -rfLp dist/include $RPM_BUILD_ROOT%{_includedir}/%{name} -cp -rfLp dist/idl $RPM_BUILD_ROOT%{_includedir}/%{name} -ln -sf necko/nsIURI.h $RPM_BUILD_ROOT%{_includedir}/mozilla-firefox/nsIURI.h -install dist/bin/regxpcom $RPM_BUILD_ROOT%{_bindir} -mv $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir}}/xpidl -mv $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir}}/xpt_dump -mv $RPM_BUILD_ROOT{%{_libdir}/%{name},%{_bindir}}/xpt_link - -# pkgconfig files -for f in build/unix/*.pc; do - sed -e 's/firefox-%{version}/mozilla-firefox/' $f > $RPM_BUILD_ROOT%{_pkgconfigdir}/${f##*/} -done - -# already provided by standalone packages -rm $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-{nss,nspr}.pc - -sed -i -e 's#firefox-nspr =.*#mozilla-nspr#g' -e 's#irefox-nss =.*#mozilla-nss#g' \ - $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc - -# includedir/dom CFLAGS -sed -i -e '/Cflags:/{/{includedir}\/dom/!s,$, -I${includedir}/dom,}' \ - $RPM_BUILD_ROOT%{_pkgconfigdir}/firefox-plugin.pc +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_dump +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpt_link # files created by regxpcom and firefox -register touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat @@ -332,9 +297,10 @@ %attr(755,root,root) %{_libdir}/%{name}/m* %attr(755,root,root) %{_libdir}/%{name}/f* %attr(755,root,root) %{_libdir}/%{name}/regxpcom -%attr(755,root,root) %{_libdir}/%{name}/x* -%{_pixmapsdir}/* -%{_desktopdir}/*.desktop +%attr(755,root,root) %{_libdir}/%{name}/xpcshell +%attr(755,root,root) %{_libdir}/%{name}/xpicleanup +%{_pixmapsdir}/mozilla-firefox.png +%{_desktopdir}/mozilla-firefox.desktop # symlinks %{_libdir}/%{name}/chrome @@ -378,15 +344,6 @@ %dir %{_libdir}/%{name} %attr(755,root,root) %{_libdir}/%{name}/*.so -%files devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/regxpcom -%attr(755,root,root) %{_bindir}/xpidl -%attr(755,root,root) %{_bindir}/xpt_dump -%attr(755,root,root) %{_bindir}/xpt_link -%{_includedir}/%{name} -%{_pkgconfigdir}/* - %files lang-en %defattr(644,root,root,755) %{_datadir}/%{name}/chrome/en-US.jar @@ -401,6 +358,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.170 2007/01/25 12:52:32 glen +- drop -devel, use xulrunner-devel instead; rel 3 + Revision 1.169 2007/01/09 23:07:08 glen - R browser-plugins2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.169&r2=1.170&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
