Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb45887' into 'master'
[packaging] Drop installation requirement of nss-devel from softokn-freebl. Fixes JB#45887

See merge request mer-core/nss!12
  • Loading branch information
kende committed Sep 11, 2019
2 parents bb05841 + 10d772f commit cf648ae
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions nss.changes
@@ -1,3 +1,6 @@
* Wed Sep 11 2019 Marko Kenttälä <marko.kenttala@jolla.com> - 3.39-9
- Drop installation requirement of nss-devel from softokn-freebl. Fixes JB#45887

* Tue Mar 12 2019 Andrew Branson <andrew.branson@jollamobile.com> - 3.39-8
- Revert previous change as NSS is no longer in the critical build path. JB#36034

Expand Down
4 changes: 2 additions & 2 deletions nss.spec
Expand Up @@ -17,7 +17,7 @@ rpm.define(string.format("nss_archive_version %s",
Summary: Network Security Services
Name: nss
Version: %{nss_version}
Release: 8%{?dist}
Release: 9%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
Expand Down Expand Up @@ -137,7 +137,7 @@ low level services.
%package softokn-freebl
Summary: Network Security Services Softoken and Freebl Cryptographic Modules
Group: System Environment/Base
Requires: nss-devel = %{version}-%{release}
BuildRequires: nss-devel
Requires: nspr >= 4.12
Requires: nss >= 3.33

Expand Down

0 comments on commit cf648ae

Please sign in to comment.