Merge branch 'f13' into f12
This commit is contained in:
commit
c1dd8ec026
11
nss.spec
11
nss.spec
|
@ -1,14 +1,12 @@
|
|||
%global nspr_version 4.8.6
|
||||
%global nss_util_version 3.12.7
|
||||
%global nss_util_build_version 3.12.7
|
||||
%global nss_softokn_version 3.12.7
|
||||
%global nss_softokn_build_version 3.12.7
|
||||
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
|
||||
|
||||
Summary: Network Security Services
|
||||
Name: nss
|
||||
Version: 3.12.7
|
||||
Release: 5%{?dist}
|
||||
Release: 6%{?dist}
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||
Group: System Environment/Libraries
|
||||
|
@ -18,8 +16,8 @@ Requires: nss-softokn%{_isa} >= %{nss_softokn_version}
|
|||
Requires: nss-system-init
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
BuildRequires: nspr-devel >= %{nspr_version}
|
||||
BuildRequires: nss-softokn-devel >= %{nss_softokn_build_version}
|
||||
BuildRequires: nss-util-devel >= %{nss_util_build_version}
|
||||
BuildRequires: nss-softokn-devel >= %{nss_softokn_version}
|
||||
BuildRequires: nss-util-devel >= %{nss_util_version}
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: pkgconfig
|
||||
|
@ -491,6 +489,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
|
|||
%{_libdir}/libnssckfw.a
|
||||
|
||||
%changelog
|
||||
* Sun Sep 12 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-6
|
||||
- Remove {nss_util|nss_softokn}_build_version, BuildRequires must match Requires
|
||||
|
||||
* Sat Sep 11 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.7-5
|
||||
- Bump nss_util_build_version and nss_softokn_build_version to 3.12.7
|
||||
|
||||
|
|
Loading…
Reference in New Issue