From 5ab1f22724ccc66ad5344aaec6cda331148350eb19504206ffe7e511725f41ec Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 11 Dec 2017 08:32:40 +0000 Subject: [PATCH] Accepting request 555271 from home:dimstar:Factory - Explicitly buildrequires python2-xml: The build system relies on it. We wrongly relied on other packages pulling it in for us. - Escape the usage of %{VERSION} when calling out to rpm. RPM 4.14 has %{VERSION} defined as 'the main packages version'. OBS-URL: https://build.opensuse.org/request/show/555271 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=619 --- MozillaFirefox.changes | 12 ++++++++++++ MozillaFirefox.spec | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 7be2ac2..45f3b18 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Dec 8 15:52:17 UTC 2017 - dimstar@opensuse.org + +- Explicitly buildrequires python2-xml: The build system relies on + it. We wrongly relied on other packages pulling it in for us. + +------------------------------------------------------------------- +Thu Dec 7 11:12:31 UTC 2017 - dimstar@opensuse.org + +- Escape the usage of %{VERSION} when calling out to rpm. + RPM 4.14 has %{VERSION} defined as 'the main packages version'. + ------------------------------------------------------------------- Wed Nov 29 23:45:03 UTC 2017 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 037c5c7..f2a59dd 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -75,6 +75,7 @@ BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.17 BuildRequires: mozilla-nss-devel >= 3.33 BuildRequires: python-devel +BuildRequires: python2-xml BuildRequires: rust >= 1.19 BuildRequires: rust-std BuildRequires: startup-notification-devel @@ -166,8 +167,8 @@ Requires(postun): shared-mime-info desktop-file-utils %if %branding Requires: %{name}-branding > 44.0 %endif -Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) -Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) +Requires: mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr) +Requires: mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss) Recommends: libcanberra0 Recommends: libpulse0 # addon leads to startup crash (bnc#908892)