rpms/nss-softokn/devel nss-softokn.spec,1.16,1.17
Elio Maldonado
emaldonado at fedoraproject.org
Fri Sep 4 17:14:44 UTC 2009
Author: emaldonado
Update of /cvs/extras/rpms/nss-softokn/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8073
Modified Files:
nss-softokn.spec
Log Message:
update to 3.12.4, don't require sqlite, and fix postun logic
Index: nss-softokn.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-softokn/devel/nss-softokn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- nss-softokn.spec 31 Aug 2009 17:09:12 -0000 1.16
+++ nss-softokn.spec 4 Sep 2009 17:14:44 -0000 1.17
@@ -16,15 +16,14 @@
Summary: Network Security Services Soktoken Module
Name: nss-softokn
-Version: 3.12.3.99.3
-Release: 24%{?dist}
+Version: 3.12.4
+Release: 1%{?dist}
License: MPLv1.1 or GPLv2+ or LGPLv2+
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
Requires: nspr >= %{nspr_version}
Requires: nss-util >= %{nss_util_version}
Requires: nss-softokn-freebl%{_isa} >= %{version}
-Requires: sqlite
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: nspr-devel >= %{nspr_version}
BuildRequires: nss-util-devel >= %{version}
@@ -52,11 +51,6 @@ Source2: nss-softokn.pc.in
Source3: nss-softokn-config.in
Source4: nss-softokn-prelink.conf
-# patches moved here from nss because they affect softoken only
-# won't be needed when we upgrade to 3.12.4
-Patch1: nss-nolocalsql.patch
-Patch2: nss-stubs-bug502133.patch
-
%description
Network Security Services Softoken Cryptographic Module
@@ -90,11 +84,6 @@ Header and Library files for doing devel
%prep
%setup -q
-# patches moved here from nss because they affect softokn only
-# they won't be needed when we upgrade to 3.12.4
-%patch1 -p0
-%patch2 -p0 -b .502133
-
%build
FREEBL_NO_DEPEND=1
@@ -195,6 +184,7 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-s
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
%{__mkdir_p} $RPM_BUILD_ROOT/%{saved_files_dir}
+# FIXME - bug 521155, will fix later for stability
# Copy the binary libraries we want
for file in libsoftokn3.so libfreebl3.so libnssdbm3.so
do
@@ -202,6 +192,7 @@ do
ln -sf ../../%{_lib}/$file $RPM_BUILD_ROOT/%{_libdir}/$file
done
+# FIXME - bug 521155, will fix later for stability
# Make sure chk files can be found in both places
for file in libsoftokn3.chk libfreebl3.chk libnssdbm3.chk
do
@@ -241,7 +232,7 @@ done
# 2) prelink is already installed, and nss-softokn is installed or upgraded
%triggerin -- prelink
%{__install} -p -m 644 %{saved_files_dir}/nss-softokn-prelink.conf \
- %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+%{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
# This trigger scriptlet is run when:
# 1) prelink is installed, and nss-softokn removed
@@ -250,17 +241,20 @@ done
[ $2 = 0 ] || exit 0
%{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
-
%post
/sbin/ldconfig >/dev/null 2>/dev/null
%postun
/sbin/ldconfig >/dev/null 2>/dev/null
-[ $1 != 0 ] || %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
-
+[ $1 > 0 ] then;
+ %{__rm} -f %{_sysconfdir}/prelink.conf.d/nss-softokn-prelink.conf
+fi
+exit 0
%files
%defattr(-,root,root)
+# FIXME - bug 521155, will fix later for stability
+# this would be replaced with the ones in devel
/%{_lib}/libnssdbm3.so
/%{_lib}/libnssdbm3.chk
/%{_lib}/libsoftokn3.so
@@ -283,6 +277,8 @@ done
%files devel
%defattr(-,root,root)
+# FIXME - bug 521155, will fix later for stability
+# these ar currently symbloc links to the libraries in "%"{_lib}
%{_libdir}/libsoftokn3.so
%{_libdir}/libsoftokn3.chk
%{_libdir}/libfreebl3.so
@@ -312,6 +308,11 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Tue Sep 01 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.4-1
+- Update to 3.12.4
+- Fix logic on postun
+- Don't require sqlite
+
* Mon Aug 31 2009 Elio Maldonado<emaldona at redhat.com> - 3.12.3.99.3-24
- Fixed test on %postun to avoid returning 1 when nss-softokn instances still remain
More information about the fedora-extras-commits
mailing list