rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Jan Horak 2019-10-02 17:24:01 +02:00
parent 38abd39b89
commit b27bc10437
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rh-old-version-check.patch Normal file
View File

@ -0,0 +1,20 @@
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;
}
/**

9
thunderbird.spec
View File

@ -94,7 +94,7 @@ ExcludeArch: s390x
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
Version: 68.1.1
Release: 1%{?dist}
Release: 2%{?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,10 +133,12 @@ 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
@ -280,6 +282,7 @@ 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
@ -748,6 +751,10 @@ 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