X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=blobdiff_plain;f=mozilla-firefox-bin.spec;h=5b78b1339e84f99917efc3bf01954c341450e015;hb=613dc1199f7a70cb10f8123c05bca1c806e19fb8;hp=71711975166b6fe84853d8e24e2c6dc0c2247185;hpb=5a29cce744bcb953da94f2baf0e8c8aaf1e7d46c;p=packages%2Fmozilla-firefox-bin.git diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec index 7171197..5b78b13 100644 --- a/mozilla-firefox-bin.spec +++ b/mozilla-firefox-bin.spec @@ -2,22 +2,20 @@ Summary: Mozilla Firefox web browser Summary(pl.UTF-8): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox-bin -Version: 33.0 +Version: 36.0.1 Release: 1 License: MPL/LGPL Group: X11/Applications/Networking Source0: http://download.cdn.mozilla.net/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2?/%{realname}-%{version}.i686.tar.bz2 -# Source0-md5: 542b27d5f3afcb55406a7af72f68f3d5 +# Source0-md5: b079611053993a13decefb2d5a796e41 Source1: http://download.cdn.mozilla.net/pub/mozilla.org/%{realname}/releases/%{version}/linux-x86_64/en-US/%{realname}-%{version}.tar.bz2?/%{realname}-%{version}.x8664.tar.bz2 -# Source1-md5: ae4e8275750fd5f87963cbe263e8ba34 +# Source1-md5: d3ba7c117b7663a3ec644acc80e73811 Source2: %{name}.desktop Source3: %{name}.sh -#Patch0: %{name}-agent.patch -#Patch1: %{name}-ti-agent.patch -#Patch2: nochilds.patch URL: http://www.mozilla.org/projects/firefox/ BuildRequires: rpmbuild(macros) >= 1.453 BuildRequires: zip +Requires(post,postun): desktop-file-utils Requires: browser-plugins >= 2.0 Requires: myspell-common Requires: nss >= 1:3.15.4 @@ -58,13 +56,6 @@ myślą o zgodności ze standardami, wydajnością i przenośnością. %ifarch %{x8664} %{__tar} jxf %{SOURCE1} --strip-components=1 %endif -%if "%{pld_release}" == "th" -#%patch0 -p0 -%endif -%if "%{pld_release}" == "ti" -#%patch1 -p0 -%endif -#%patch2 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -81,28 +72,26 @@ cp -a browser/icons/mozicon128.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins # use system dict -rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries +rm -r $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries # use system sqlite -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite3.so -ln -s /%{_lib}/libsqlite3.so.0 $RPM_BUILD_ROOT%{_libdir}/%{name}/libsqlite3.so +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozsqlite3.so +ln -s /%{_lib}/libsqlite3.so.0 $RPM_BUILD_ROOT%{_libdir}/%{name}/libmozsqlite3.so # never package these # nss -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.* +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.* # nspr -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so -# mozldap -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so grep -v 'libnspr4.so\|libplc4.so\|libplds4.so\|libnssutil3.so\|libnss3.so\|libsmime3.so\|libssl3.so' \ dependentlibs.list > $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list # remove update notifier, we prefer rpm packages for updating -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/updater -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/updater.ini -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/update.locale -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/Throbber-small.gif +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/updater +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/updater.ini +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/update-settings.ini +rm $RPM_BUILD_ROOT%{_libdir}/%{name}/Throbber-small.gif # remove unecessary stuff rm $RPM_BUILD_ROOT%{_libdir}/%{name}/removed-files @@ -118,8 +107,10 @@ exit 0 %post %update_browser_plugins +%update_desktop_database_post %postun +%update_desktop_database_postun if [ "$1" = 0 ]; then %update_browser_plugins fi @@ -144,14 +135,12 @@ fi %dir %{_libdir}/%{name}/browser/components %{_libdir}/%{name}/browser/components/components.manifest %attr(755,root,root) %{_libdir}/%{name}/browser/components/libbrowsercomps.so -#%{_libdir}/%{name}/browserconfig.properties %{_libdir}/%{name}/chrome.manifest %{_libdir}/%{name}/omni.ja %{_libdir}/%{name}/platform.ini %attr(755,root,root) %{_libdir}/%{name}/firefox %attr(755,root,root) %{_libdir}/%{name}/firefox-bin %attr(755,root,root) %{_libdir}/%{name}/precomplete -%attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client %attr(755,root,root) %{_libdir}/%{name}/plugin-container %{_libdir}/%{name}/browser/chrome @@ -159,12 +148,7 @@ fi %{_libdir}/%{name}/defaults %{_libdir}/%{name}/dependentlibs.list %{_libdir}/%{name}/dictionaries -#%{_libdir}/%{name}/greprefs -#%{_libdir}/%{name}/hyphenation -#%{_libdir}/%{name}/hyphenation/hyph_en_US.dic %{_libdir}/%{name}/icons -#%{_libdir}/%{name}/modules -#%{_libdir}/%{name}/res %{_libdir}/%{name}/browser/searchplugins %{_libdir}/%{name}/webapprt %attr(755,root,root) %{_libdir}/%{name}/webapprt-stub @@ -173,18 +157,11 @@ fi # the signature of the default theme %{_libdir}/%{name}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -#%dir %{_libdir}/%{name}/distribution -#%dir %{_libdir}/%{name}/distribution/extensions -#%{_libdir}/%{name}/distribution/extensions/testpilot@labs.mozilla.com.xpi - %dir %{_libdir}/%{name}/components %attr(755,root,root) %{_libdir}/%{name}/components/*.so %{_libdir}/%{name}/components/components.manifest -#%{_libdir}/%{name}/components/*.js -#%{_libdir}/%{name}/components/*.xpt %dir %{_libdir}/%{name}/browser/plugins -#%attr(755,root,root) %{_libdir}/%{name}/plugins/libnullplugin.so %attr(755,root,root) %{_libdir}/%{name}/*.so %attr(755,root,root) %{_libdir}/%{name}/*.sh @@ -193,5 +170,10 @@ fi %{_libdir}/%{name}/browser/crashreporter-override.ini %{_libdir}/%{name}/crashreporter.ini +%dir %{_libdir}/%{name}/gmp-clearkey +%dir %{_libdir}/%{name}/gmp-clearkey/0.1 +%{_libdir}/%{name}/gmp-clearkey/0.1/clearkey.info +%attr(755,root,root) %{_libdir}/%{name}/gmp-clearkey/0.1/libclearkey.so + %{_pixmapsdir}/%{name}.png %{_desktopdir}/%{name}.desktop