- rever $version simplify, need $major in nss-config; rel 3

Changed files:
    nss-config.in -> 1.6
    nss.spec -> 1.72

diff --git a/nss-config.in b/nss-config.in
index b81913c6c73f5d7209c825b123ed92358a120a6e..9692ad5e1cd4523736ff2da6c06f74a6824adf41 100644 (file)
--- a/nss-config.in
+++ b/nss-config.in
@@ -2,6 +2,10 @@
 
 prefix=@prefix@
 
+major_version=@MOD_MAJOR_VERSION@
+minor_version=@MOD_MINOR_VERSION@
+patch_version=@MOD_PATCH_VERSION@
+
 usage()
 {
        cat <<EOF
@@ -62,7 +66,7 @@ while test $# -gt 0; do
       echo_libdir=yes
       ;;
     --version)
-      echo @version@
+      echo ${major_version}.${minor_version}.${patch_version}
       ;;
     --cflags)
       echo_cflags=yes

diff --git a/nss.spec b/nss.spec
index c4d02520b5fe907ae7dc39cd1adedd780ce4300c..e687a5ca50a983230422c164d84ceba573c18876 100644 (file)
--- a/nss.spec
+++ b/nss.spec
@@ -3,7 +3,7 @@ Summary:        NSS - Network Security Services
 Summary(pl):   NSS - Network Security Services
 Name:          nss
 Version:       3.11.3
-Release:       2
+Release:       3
 Epoch:         1
 License:       GPL
 Group:         Libraries
@@ -143,7 +143,9 @@ NSS_VPATCH=$(awk '/#define.*NSS_VPATCH/ {print $3}' mozilla/security/nss/lib/nss
        s,@prefix@,%{_prefix},g
        s,@exec_prefix@,%{_prefix},g
        s,@includedir@,%{_includedir}/nss,g
-       s,@version@,%{version},g
+       s,@MOD_MAJOR_VERSION@,$NSS_VMAJOR,g
+       s,@MOD_MINOR_VERSION@,$NSS_VMINOR,g
+       s,@MOD_PATCH_VERSION@,$NSS_VPATCH,g
 " %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/nss-config
 chmod +x $RPM_BUILD_ROOT%{_bindir}/nss-config