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

Accepting request 555272 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/555272
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=392
This commit is contained in:
Wolfgang Rosenauer 2017-12-11 08:32:59 +00:00 committed by Git OBS Bridge
parent ca09b0503f
commit a9f94c0e74
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
MozillaThunderbird.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Dec 8 15:53:30 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:13:41 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 22 10:02:35 UTC 2017 - wr@rosenauer.org

9
MozillaThunderbird.spec
View File

@ -44,6 +44,7 @@ BuildRequires: libnotify-devel
BuildRequires: mozilla-nspr-devel >= 4.13.1
BuildRequires: mozilla-nss-devel >= 3.28.6
BuildRequires: python
BuildRequires: python2-xml
BuildRequires: startup-notification-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
@ -128,8 +129,8 @@ Recommends: libpulse0
%define __find_requires sh %{SOURCE7}
%global provfind sh -c "grep -v '.so' | %__find_provides"
%global __find_provides %provfind
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)
Conflicts: thunderbird-esr
%define progname thunderbird
%define progdir %{_prefix}/%_lib/thunderbird
@ -171,8 +172,8 @@ of MozillaThunderbird.
%package devel
Summary: Mozilla Thunderbird SDK
Group: Development/Libraries/Other
Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel)
PreReq: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel)
Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nspr-devel)
PreReq: mozilla-nss-devel >= %(rpm -q --queryformat '%%{VERSION}' mozilla-nss-devel)
PreReq: %{name} = %{mainversion}
%description devel