Attachment 864909 Details for Bug 1050163 – Move sharedb files to the main package where the belong

[patch] Move sharedb files to the main package where the belong

movefiles.patch (text/plain), 2.46 KB, created by Elio Maldonado Batiz on 2014-02-19 02:39:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-02-19 02:39:53 UTC

Size: 2.46 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index 8a75461..46f93f8 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -20,7 +20,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.15.4
>-Release:          4%{?dist}
>+Release:          5%{?dist}
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -537,7 +537,7 @@ done
> %{__install} -p -m 755 ./dist/pkgconfig/nss-config $RPM_BUILD_ROOT/%{_bindir}/nss-config
> # Copy the pkcs #11 configuration script
> %{__install} -p -m 755 ./dist/pkgconfig/setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh
>-# install a symbolic link top it, without the ".sh" suffix,
>+# install a symbolic link to it, without the ".sh" suffix,
> # that matches the man page documentation
> ln -r -s -f $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit.sh $RPM_BUILD_ROOT/%{_bindir}/setup-nsssysinit
> 
>@@ -627,6 +627,9 @@ fi
> %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/cert8.db
> %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/key3.db
> %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/pki/nssdb/secmod.db
>+%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/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
>@@ -637,9 +640,6 @@ fi
> %files sysinit
> %defattr(-,root,root)
> %{_libdir}/libnsssysinit.so
>-%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
> %{_bindir}/setup-nsssysinit.sh
> # symbolic link to setup-nsssysinit.sh
> %{_bindir}/setup-nsssysinit
>@@ -757,6 +757,10 @@ fi
> 
> 
> %changelog
>+* Wed Feb 19 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.4-5
>+- Move cert9.db, key4.db, and pkcs11.txt to the main package
>+- Resolves: Bug 1050163 - Same files in two packages create rpm conflict
>+
> * Mon Jan 27 2014 Elio Maldonado <emaldona@redhat.com> - 3.15.4-4
> - Update pem sources to latest from nss-pem upstream
> - Pick up pem module fixes verified on RHEL and applied upstream

Actions: View | Diff

Attachments on bug 1050163: 847753 | 864909