Add posttrans sysinit scriptlet to re-enable nssysinit - resolves rhbz#636787.

This commit is contained in:
Elio Maldonado 2010-09-27 21:47:31 -07:00
parent 53ccaaaa26
commit c51d121d29
1 changed files with 10 additions and 7 deletions

View File

@ -6,7 +6,7 @@
Summary: Network Security Services Summary: Network Security Services
Name: nss Name: nss
Version: 3.12.8 Version: 3.12.8
Release: 1%{?dist} Release: 2%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/ URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries Group: System Environment/Libraries
@ -16,7 +16,7 @@ Requires: nss-softokn%{_isa} >= %{nss_softokn_version}
Requires: nss-system-init Requires: nss-system-init
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version} BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-softokn-devel >= %{nss_softokn_version} BuildRequires: nss-softokn-devel >= %{nss_softokn_version}
BuildRequires: nss-util-devel >= %{nss_util_version} BuildRequires: nss-util-devel >= %{nss_util_version}
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: zlib-devel BuildRequires: zlib-devel
@ -372,11 +372,11 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%post sysinit # Prevent disabling of nss-sysinit on nss package upgrade caused
%{_bindir}/setup-nsssysinit.sh on # by faulty preun sysinit scriplet from a previous version nss.spec.
# It will be eventually removed.
%preun sysinit %posttrans sysinit
[ -e /etc/pki/nssdb/pkcs11.txt ] && /usr/bin/setup-nsssysinit.sh on
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -490,6 +490,9 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
%{_libdir}/libnssckfw.a %{_libdir}/libnssckfw.a
%changelog %changelog
* Mon Sep 27 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-2
- Add posttrans scriptlet (#636787)
* Thu Sep 23 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-1 * Thu Sep 23 2010 Elio Maldonado <emaldona@redhat.com> - 3.12.8-1
- Update to 3.12.8 - Update to 3.12.8
- Prevent disabling of nss-sysinit on package upgrade (#636787) - Prevent disabling of nss-sysinit on package upgrade (#636787)