[nss/f14/master] Remove {nss_util|nss_softokn}_build_version, BuildRequires must match Requires

Elio Maldonado emaldonado at fedoraproject.org
Sun Sep 12 19:42:12 UTC 2010


commit 6b07fe83cccc76483117f8017ca1312fa01e7311
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sun Sep 12 12:41:41 2010 -0700

    Remove {nss_util|nss_softokn}_build_version, BuildRequires must match Requires

 nss.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/nss.spec b/nss.spec
index fe9029f..a9117c2 100644
--- a/nss.spec
+++ b/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 at redhat.com> - 3.12.7-6
+- Remove {nss_util|nss_softokn}_build_version, BuildRequires must match Requires
+
 * Sat Sep 11 2010 Elio Maldonado <emaldona at redhat.com> - 3.12.7-5
 - Bump nss_util_build_version and nss_softokn_build_version to 3.12.7
 


More information about the scm-commits mailing list