[nss/f20] Revert previous change that moved some sysinit manpages

Elio Maldonado emaldonado at fedoraproject.org
Sat Feb 8 21:56:37 UTC 2014


commit acb52374e232296960174e0933df124f6a5dbdf8
Author: Elio Maldonado <emaldona at redhat.com>
Date:   Sat Feb 8 13:56:42 2014 -0800

    Revert previous change that moved some sysinit manpages
    
    - Restore nss-sysinit manpages tar archives to %files sysinit
    - Removing spurious wildcard entry was the only change needed

 nss.spec |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)
---
diff --git a/nss.spec b/nss.spec
index bb7990c..b62cd38 100644
--- a/nss.spec
+++ b/nss.spec
@@ -19,7 +19,7 @@
 Summary:          Network Security Services
 Name:             nss
 Version:          3.15.4
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MPLv2.0
 URL:              http://www.mozilla.org/projects/security/pki/nss/
 Group:            System Environment/Libraries
@@ -610,9 +610,6 @@ fi
 %attr(0644,root,root) %doc /usr/share/man/man5/cert8.db.5.gz
 %attr(0644,root,root) %doc /usr/share/man/man5/key3.db.5.gz
 %attr(0644,root,root) %doc /usr/share/man/man5/secmod.db.5.gz
-%attr(0644,root,root) %doc /usr/share/man/man5/cert9.db.5.gz
-%attr(0644,root,root) %doc /usr/share/man/man5/key4.db.5.gz
-%attr(0644,root,root) %doc /usr/share/man/man5/pkcs11.txt.5.gz
 
 %files sysinit
 %defattr(-,root,root)
@@ -620,6 +617,9 @@ fi
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert9.db
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key4.db
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/pkcs11.txt
+%attr(0644,root,root) %doc /usr/share/man/man5/cert9.db.5.gz
+%attr(0644,root,root) %doc /usr/share/man/man5/key4.db.5.gz
+%attr(0644,root,root) %doc /usr/share/man/man5/pkcs11.txt.5.gz
 %{_bindir}/setup-nsssysinit.sh
 # symbolic link to setup-nsssysinit.sh
 %{_bindir}/setup-nsssysinit
@@ -737,6 +737,11 @@ fi
 
 
 %changelog
+* Sat Feb 08 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.4-3
+- Revert previous change that moved some sysinit manpages
+- Restore nss-sysinit manpages tar archives to %%files sysinit
+- Removing spurious wildcard entry was the only change needed
+
 * Sun Feb 02 2014 Elio Maldonado <emaldona at redhat.com> - 3.15.4-2
 - Selective merge fom master to pick up various fixes
 - Update pem sources to latest from nss-pem upstream


More information about the scm-commits mailing list