Author: glen Date: Sun Apr 23 00:09:24 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - move 1.0 upgrade message to trigger and correct english - 755 attr for plugin files - kill bashism in %preun, rel 2
---- Files affected: SPECS: mozilla-firefox.spec (1.131.2.1 -> 1.131.2.2) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.131.2.1 SPECS/mozilla-firefox.spec:1.131.2.2 --- SPECS/mozilla-firefox.spec:1.131.2.1 Fri Apr 14 12:28:54 2006 +++ SPECS/mozilla-firefox.spec Sun Apr 23 02:09:19 2006 @@ -19,7 +19,7 @@ Summary(pl): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox Version: 1.5.0.2 -Release: 1 +Release: 2 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 @@ -46,14 +46,14 @@ BuildRequires: libjpeg-devel >= 6b BuildRequires: libpng-devel >= 1.2.0 BuildRequires: libstdc++-devel -BuildRequires: nspr-devel >= 1:4.6.1 +BuildRequires: nspr-devel >= 1:4.6.1-2 BuildRequires: nss-devel >= 3.10.2 BuildRequires: pango-devel >= 1:1.6.0 BuildRequires: perl-modules >= 5.004 BuildRequires: pkgconfig BuildRequires: zip Requires: %{name}-lang-resources = %{version} -Requires: nspr >= 1:4.6.1 +Requires: nspr >= 1:4.6.1-2 Requires: nss >= 3.10.2 Provides: wwwbrowser Obsoletes: mozilla-firebird @@ -77,7 +77,7 @@ Summary(pl): Mozilla Firefox - pliki nagłówkowe Group: X11/Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: nspr-devel >= 1:4.6.1 +Requires: nspr-devel >= 1:4.6.1-2 Obsoletes: mozilla-devel %description devel @@ -275,15 +275,6 @@ %post %{_sbindir}/firefox-chrome+xpcom-generate -%banner %{name} -e <<EOF -################################################################### -# # -# NOTICE: # -# If you have problem with upgrade old mozilla-firefox 1.0.x, you # -# should remove it first. # -# # -################################################################### -EOF %postun if [ "$1" != "0" ]; then @@ -291,13 +282,20 @@ fi %preun -if [ "$1" == "0" ]; then +if [ "$1" = "0" ]; then rm -rf %{_firefoxdir}/chrome/overlayinfo rm -f %{_firefoxdir}/chrome/*.rdf rm -rf %{_firefoxdir}/components rm -rf %{_firefoxdir}/extensions fi +%triggerpostun -- %{name} < 1.5 +%banner %{name} -e <<EOF +NOTICE: +If you have problem with upgrade from old mozilla-firefox 1.0.x, +you should remove it first and reinstall %{name}-%{version} +EOF + %files %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/mozilla* @@ -309,7 +307,8 @@ %attr(755,root,root) %{_firefoxdir}/components/*.so %{_firefoxdir}/components/*.js %{_firefoxdir}/components/*.xpt -%{_firefoxdir}/plugins +%dir %{_firefoxdir}/plugins +%attr(755,root,root) %{_firefoxdir}/plugins/*.so %{_firefoxdir}/searchplugins %{_firefoxdir}/icons %{_firefoxdir}/defaults @@ -358,6 +357,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.131.2.2 2006/04/23 00:09:19 glen +- move 1.0 upgrade message to trigger and correct english +- 755 attr for plugin files +- kill bashism in %preun, rel 2 + Revision 1.131.2.1 2006/04/14 10:28:54 blekot - up to 1.5.0.2 - Patch{5,6} included in sources ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.131.2.1&r2=1.131.2.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
