[nss-softokn/f14/master] Match BuildRequires with Requires
Elio Maldonado
emaldonado at fedoraproject.org
Sun Sep 12 18:08:49 UTC 2010
commit 525f844dff059ab2656e8abe31376c2abd79a39b
Author: Elio Maldonado <emaldona at redhat.com>
Date: Sun Sep 12 11:08:43 2010 -0700
Match BuildRequires with Requires
nss-softokn.spec | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/nss-softokn.spec b/nss-softokn.spec
index ed4b3ee..3847907 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,9 +1,6 @@
%global nspr_version 4.8.6
-%global nspr_build_version 4.8.6
%global nss_name nss
-%global nss_softokn_build_version 3.12.6
%global nss_util_version 3.12.7
-%global nss_util_build_version 3.12.6
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
@@ -20,7 +17,7 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
Version: 3.12.7
-Release: 3%{?dist}
+Release: 4%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -28,8 +25,8 @@ Requires: nspr >= %{nspr_version}
Requires: nss-util >= %{nss_util_version}
Requires: nss-softokn-freebl%{_isa} >= %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: nspr-devel >= %{nspr_build_version}
-BuildRequires: nss-util-devel >= %{nss_util_build_version}
+BuildRequires: nspr-devel >= %{nspr_version}
+BuildRequires: nss-util-devel >= %{nss_util_version}
BuildRequires: sqlite-devel
BuildRequires: zlib-devel
BuildRequires: pkgconfig
@@ -86,8 +83,8 @@ Requires: nss-softokn%{?_isa} = %{version}-%{release}
Requires: nspr-devel >= %{nspr_version}
Requires: nss-util-devel >= %{version}
Requires: pkgconfig
-BuildRequires: nspr-devel >= %{nspr_build_version}
-BuildRequires: nss-util-devel >= %{nss_util_build_version}
+BuildRequires: nspr-devel >= %{nspr_version}
+BuildRequires: nss-util-devel >= %{nss_util_version}
# require nss at least the version when we split via subpackages
BuildRequires: nss-devel >= 3.12.2.99.3-11
@@ -315,6 +312,9 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Sun Sep 12 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-4
+- Match the BuildRequires versions with the Requires
+
* Mon Aug 30 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-3
- Transitional build for the update of nss to 3.12.7
More information about the scm-commits
mailing list