Author: megabajt Date: Mon May 2 19:59:49 2011 GMT Module: packages Tag: HEAD ---- Log message: - revert to iceweasel-branding.tar.bz2 which is updated for iceweasel 4 (fixes lp#773519) - install icons to hicolor icon theme so that higher resolutions are available - release 3
---- Files affected: packages/iceweasel: iceweasel.spec (1.143 -> 1.144) ---- Diffs: ================================================================ Index: packages/iceweasel/iceweasel.spec diff -u packages/iceweasel/iceweasel.spec:1.143 packages/iceweasel/iceweasel.spec:1.144 --- packages/iceweasel/iceweasel.spec:1.143 Fri Apr 29 19:17:47 2011 +++ packages/iceweasel/iceweasel.spec Mon May 2 21:59:44 2011 @@ -31,13 +31,13 @@ Summary(pl.UTF-8): Iceweasel - przeglądarka WWW Name: iceweasel Version: 4.0.1 -Release: 2.3 +Release: 3 License: MPL 1.1 or GPL v2+ or LGPL v2.1+ Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2 # Source0-md5: 9abda7d23151e97913c8555a64c13f34 Source1: %{name}-branding.tar.bz2 -# Source1-md5: b49feae9f6434eca8a749776160c15a8 +# Source1-md5: 7ab5e80db1ffe8784f1cb55dc5651e2f Source2: %{name}-rm_nonfree.sh Source3: %{name}.desktop Source4: %{name}.sh @@ -82,7 +82,7 @@ BuildRequires: pkgconfig BuildRequires: python-modules BuildRequires: rpm >= 4.4.9-56 -BuildRequires: rpmbuild(macros) >= 1.453 +BuildRequires: rpmbuild(macros) >= 1.601 BuildRequires: sqlite3-devel >= 3.7.5-2 BuildRequires: startup-notification-devel >= 0.8 BuildRequires: xorg-lib-libXext-devel @@ -96,6 +96,7 @@ BuildRequires: zip BuildRequires: zlib-devel >= 1.2.3 Requires(post): mktemp >= 1.5-18 +Requires: hicolor-icon-theme %if %{with xulrunner} %requires_eq_to xulrunner xulrunner-devel %else @@ -263,7 +264,7 @@ cd mozilla install -d \ $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \ - $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ + $RPM_BUILD_ROOT%{_desktopdir} \ $RPM_BUILD_ROOT%{_datadir}/%{name} %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins @@ -310,7 +311,14 @@ ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/firefox ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox -cp -a iceweasel/branding/default64.png $RPM_BUILD_ROOT%{_pixmapsdir}/iceweasel.png +# install icons and desktop file +cp iceweasel/branding/{mozicon,default}128.png +for i in 16 32 48 64 128; do + install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps + cp -a iceweasel/branding/default${i}.png \ + $RPM_BUILD_ROOT%{_iconsdir}/hicolor/${i}x${i}/apps/iceweasel.png +done + cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop # files created by regxpcom and iceweasel -register @@ -357,10 +365,12 @@ %post %{_sbindir}/%{name}-chrome+xpcom-generate %update_browser_plugins +%update_icon_cache hicolor %postun if [ "$1" = 0 ]; then %update_browser_plugins + %update_icon_cache hicolor fi %files @@ -482,7 +492,7 @@ %attr(755,root,root) %{_libdir}/%{name}/plugin-container %endif -%{_pixmapsdir}/iceweasel.png +%{_iconsdir}/hicolor/*/*/iceweasel.png %{_desktopdir}/iceweasel.desktop # symlinks @@ -525,6 +535,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.144 2011/05/02 19:59:44 megabajt +- revert to iceweasel-branding.tar.bz2 which is updated for iceweasel 4 (fixes lp#773519) +- install icons to hicolor icon theme so that higher resolutions are available +- release 3 + Revision 1.143 2011/04/29 17:17:47 baggins - fractional release because something is really fucked up wrt session save/restore here ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.143&r2=1.144&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
