rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

Accepting request 555271 from home:dimstar:Factory

Browse Source 
- 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
This commit is contained in:
Wolfgang Rosenauer 2017-12-11 08:32:40 +00:00 committed by Git OBS Bridge
parent 0eb4f70103
commit 5ab1f22724
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MozillaFirefox.changes
View File

@ -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 Wed Nov 29 23:45:03 UTC 2017 - wr@rosenauer.org

5
MozillaFirefox.spec
View File

@ -75,6 +75,7 @@ BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.17 BuildRequires: mozilla-nspr-devel >= 4.17
BuildRequires: mozilla-nss-devel >= 3.33 BuildRequires: mozilla-nss-devel >= 3.33
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: python2-xml
BuildRequires: rust >= 1.19 BuildRequires: rust >= 1.19
BuildRequires: rust-std BuildRequires: rust-std
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
@ -166,8 +167,8 @@ Requires(postun): shared-mime-info desktop-file-utils
%if %branding %if %branding
Requires: %{name}-branding > 44.0 Requires: %{name}-branding > 44.0
%endif %endif
Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nspr >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr)
Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) Requires: mozilla-nss >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss)
Recommends: libcanberra0 Recommends: libcanberra0
Recommends: libpulse0 Recommends: libpulse0
# addon leads to startup crash (bnc#908892) # addon leads to startup crash (bnc#908892)