- added desktop database update

- dropped commented out patches not updated for more than 3y
- rm one more update related file
- rel 2

diff --git a/mozilla-firefox-bin-agent.patch b/mozilla-firefox-bin-agent.patch
deleted file mode 100644 (file)
index a36850b..0000000
--- a/mozilla-firefox-bin-agent.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- defaults/pref/firefox.js.orig      2010-04-04 21:49:10.532414172 +0200
-+++ defaults/pref/firefox.js   2010-04-04 21:52:41.597427771 +0200
-@@ -144,6 +144,9 @@
- pref("general.useragent.locale", "en-US");
- pref("general.skins.selectedSkin", "classic/1.0");
- pref("general.useragent.extra.firefox", "Firefox/3.6.11");
-+pref("general.useragent.vendor", "PLD");
-+pref("general.useragent.vendorSub", "3.0");
-+pref("general.useragent.vendorComment", "Th");
- 
- pref("general.smoothScroll", false);
- //@line 190 "/builds/slave/linux_build/build/browser/app/profile/firefox.js"

diff --git a/mozilla-firefox-bin-ti-agent.patch b/mozilla-firefox-bin-ti-agent.patch
deleted file mode 100644 (file)
index 0e062ad..0000000
--- a/mozilla-firefox-bin-ti-agent.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- defaults/pref/firefox.js.orig      2010-06-26 07:59:44.000000000 +0200
-+++ defaults/pref/firefox.js   2010-06-27 22:01:45.022918561 +0200
-@@ -144,6 +144,8 @@
- pref("general.useragent.locale", "en-US");
- pref("general.skins.selectedSkin", "classic/1.0");
- pref("general.useragent.extra.firefox", "Firefox/3.6.11");
-+pref("general.useragent.vendor", "PLD");
-+pref("general.useragent.vendorSub", "Titanium");
- 
- pref("general.smoothScroll", false);
- //@line 190 "/builds/slave/linux_build/build/browser/app/profile/firefox.js"

diff --git a/mozilla-firefox-bin.spec b/mozilla-firefox-bin.spec
index 231cfe14ef29f3b3b50b1c2b9bc08f5cdcbb2222..93f0b5fe0f6c5cd313068c74722359f989c4c735 100644 (file)
--- a/mozilla-firefox-bin.spec
+++ b/mozilla-firefox-bin.spec
@@ -3,7 +3,7 @@ Summary:        Mozilla Firefox web browser
 Summary(pl.UTF-8):     Mozilla Firefox - przeglądarka WWW
 Name:          mozilla-firefox-bin
 Version:       33.1.1
-Release:       1
+Release:       2
 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
@@ -12,12 +12,10 @@ Source1:    http://download.cdn.mozilla.net/pub/mozilla.org/%{realname}/releases/%{
 # Source1-md5: 9e0ee774f648c0eaf97afb9f8322281e
 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
@@ -102,6 +93,7 @@ grep -v 'libnspr4.so\|libplc4.so\|libplds4.so\|libnssutil3.so\|libnss3.so\|libsm
 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}/update-settings.ini
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/Throbber-small.gif
 
 # remove unecessary stuff
@@ -118,8 +110,10 @@ exit 0
 
 %post
 %update_browser_plugins
+%update_desktop_database_post
 
 %postun
+%update_desktop_database_postun
 if [ "$1" = 0 ]; then
        %update_browser_plugins
 fi

diff --git a/nochilds.patch b/nochilds.patch
deleted file mode 100644 (file)
index 9a1204b..0000000
--- a/nochilds.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- mozilla-firefox-bin-3.6.8/firefox  2010-07-23 01:31:13.000000000 +0300
-+++ mozilla-firefox-bin-3.6.8/firefox  2010-08-18 10:26:59.365912397 +0300
-@@ -135,8 +135,11 @@
- if [ $debugging = 1 ]
- then
-   echo $dist_bin/run-mozilla.sh $script_args $dist_bin/$MOZILLA_BIN "$@"
-+  "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
-+else
-+  exec "$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
-+  # NORETURN
- fi
--"$dist_bin/run-mozilla.sh" $script_args "$dist_bin/$MOZILLA_BIN" "$@"
- exitcode=$?
- 
- exit $exitcode
---- mozilla-firefox-bin-3.6.8/run-mozilla.sh   2010-07-23 01:31:13.000000000 +0300
-+++ mozilla-firefox-bin-3.6.8/run-mozilla.sh   2010-08-18 10:24:42.485849818 +0300
-@@ -140,7 +140,8 @@
-       ##
-       ## Run the program
-       ##
--      "$prog" ${1+"$@"}
-+      exec "$prog" ${1+"$@"}
-+      # NORETURN
-       exitcode=$?
- }
- ##########################################################################