From f8d78db48fbe1af1df5edf57458fdee3955e7c2a Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Thu, 3 Oct 2019 10:24:50 +0200
Subject: [PATCH] Revert "Don't compare buildID in upgradepath because builds
 in newer distro can be build sooner than in previous one."

This reverts commit b27bc1043764e75f4e55e4439df7ac966de12584.
---
 rh-old-version-check.patch | 20 --------------------
 thunderbird.spec           |  9 +--------
 2 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 rh-old-version-check.patch

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;
- }
- 
- /**
diff --git a/thunderbird.spec b/thunderbird.spec
index 8da222b..728b8df 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -94,7 +94,7 @@ ExcludeArch: s390x
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        68.1.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        ftp://ftp.mozilla.org/pub/thunderbird/releases/%{version}%{?pre_version}/source/thunderbird-%{version}%{?pre_version}.source.tar.xz
@@ -133,12 +133,10 @@ Patch306:       mozilla-1353817.patch
 Patch307:       build-disable-elfhack.patch
 
 # Fedora specific patches
-Patch200:       rh-old-version-check.patch
 
 # Upstream patches
 Patch402:       mozilla-526293.patch
 
-
 %if %{official_branding}
 # Required by Mozilla Corporation
 
@@ -282,7 +280,6 @@ debug %{name}, you want to install %{name}-debuginfo instead.
 
 
 %patch402 -p1 -b .526293
-%patch200 -p1 -b .old-version-check
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -751,10 +748,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
-* Wed Oct  2 2019 Jan Horak <jhorak@redhat.com> - 68.1.1-2
-- Do not compare buildID to check for older version because
-  it could cause problems after distro upgrade
-
 * Fri Sep 27 2019 Jan Horak <jhorak@redhat.com> - 68.1.1-1
 - Update to 68.1.1