Revert "Don't compare buildID in upgradepath because builds in newer distro can be build sooner than in previous one."

Because it's already implemented by MOZ_ALLOW_DOWNGRADE env variable.
This reverts commit cc911d3225cc500830ae115bc513b468b9d5471c.

2 files changed, 1 insertions, 27 deletions

diff --git a/firefox.spec b/firefox.spec
index e56e087..0c7bb7f 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -94,7 +94,7 @@ ExcludeArch: ppc64le
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        69.0.1
-Release:        6%{?pre_tag}%{?dist}
+Release:        5%{?pre_tag}%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -142,7 +142,6 @@ Patch224:        mozilla-1170092.patch
 Patch226:        rhbz-1354671.patch
 Patch227:        firefox-locale-debug.patch
 Patch228:        mozilla-1583466.patch
-Patch229:        rh-old-version-check.patch
 
 # Upstream patches
 Patch402:        mozilla-1196777.patch
@@ -369,7 +368,6 @@ This package contains results of tests executed during build.
 %endif
 %patch227 -p1 -b .locale-debug
 %patch228 -p1 -b .mozilla-1583466
-%patch229 -p1 -b .rh-old-version-check
 
 %patch402 -p1 -b .1196777
 #%patch413 -p1 -b .1353817
@@ -985,10 +983,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
-* Wed Oct  2 2019 Jan Horak <jhorak@redhat.com> - 69.0.1-6
-- Do not compare buildID because the build time of package in
-  newer distro can be older.
-
 * Mon Sep 30 2019 Martin Stransky <stransky@redhat.com> - 69.0.1-5
 - Updated rhbz#1754460/mzbz#1583466 - per user policy dir.
 
diff --git a/rh-old-version-check.patch b/rh-old-version-check.patch
deleted file mode 100644
index b83f34b..0000000
--- a/rh-old-version-check.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -up firefox-69.0/toolkit/xre/nsAppRunner.cpp.old-version-check firefox-69.0/toolkit/xre/nsAppRunner.cpp
---- firefox-69.0/toolkit/xre/nsAppRunner.cpp.old-version-check	2019-10-02 16:58:38.018077162 +0200
-+++ firefox-69.0/toolkit/xre/nsAppRunner.cpp	2019-10-02 16:59:57.955339034 +0200
-@@ -2453,13 +2453,9 @@ int32_t CompareCompatVersions(const nsAC
-     return result;
-   }
- 
--  // Fall back to build ID comparison.
--  result = CompareBuildIDs(oldAppBuildID, newAppBuildID);
--  if (result != 0) {
--    return result;
--  }
--
--  return CompareBuildIDs(oldPlatformBuildID, newPlatformBuildID);
-+  // Don't compare build ids because the build time can be older on the
-+  // newer distribution package.
-+  return 0;
- }
- 
- /**