[softhsm/el6] * Tue Apr 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.2-1 - Updated to 1.3.2. - Changed user fr

[Paul Wouters]

commit c6fb12905c93aeb96a8fa885c89a77e442b25258
Author: Paul Wouters <pwouters at redhat.com>
Date:   Tue Apr 3 15:37:40 2012 -0400

    * Tue Apr 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.2-1
    - Updated to 1.3.2.
    - Changed user from opendnssec to ods, as used in the opendnssec package
    
    Conflicts:
    
    	softhsm.spec

 .gitignore   |    1 +
 softhsm.spec |   22 +++++++++++++---------
 sources      |    1 +
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1b69c6d..5dd6b60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /softhsm-1.3.0.tar.gz
+/softhsm-1.3.2.tar.gz
diff --git a/softhsm.spec b/softhsm.spec
index dd4f0aa..35b57c4 100644
--- a/softhsm.spec
+++ b/softhsm.spec
@@ -1,7 +1,7 @@
 Summary: Software version of a PKCS#11 Hardware Security Module
 Name: softhsm
-Version: 1.3.0
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 License: BSD
 Url: http://www.opendnssec.org/
 Source: http://www.opendnssec.org/files/source/%{name}-%{version}.tar.gz
@@ -28,7 +28,7 @@ The devel package contains the libsofthsm include files
 %setup -q 
 
 %build
-%configure --libdir=%{_libdir}/softhsm/
+%configure --libdir=%{_libdir}/ 
 make %{?_smp_mflags}
 
 %check
@@ -38,7 +38,7 @@ make check
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 rm %{buildroot}/etc/softhsm.conf.sample
-rm %{buildroot}/%{_libdir}/softhsm/*a
+rm -f %{buildroot}/%{_libdir}/softhsm/*a
 mkdir -p %{buildroot}%{_includedir}/softhsm
 cp src/lib/*.h %{buildroot}%{_includedir}/softhsm
 mkdir -p %{buildroot}/var/softhsm
@@ -52,7 +52,7 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %dir %{_libdir}/softhsm/
 %{_libdir}/softhsm/libsofthsm.so
-%attr(0770,opendnssec,opendnssec) %dir /var/softhsm
+%attr(0770,ods,ods) %dir /var/softhsm
 %doc AUTHORS NEWS README
 %{_mandir}/*/*
 
@@ -63,13 +63,17 @@ rm -rf %{buildroot}
 %doc README
 
 %pre
-getent group opendnssec >/dev/null || groupadd -r opendnssec
-getent passwd opendnssec >/dev/null || \
-    useradd -r -g opendnssec -d /var/softhsm -s /sbin/nologin \
-    -c "DNSSEC private keys owner" opendnssec
+getent group ods >/dev/null || groupadd -r ods
+getent passwd ods >/dev/null || \
+    useradd -r -g ods -d /var/softhsm -s /sbin/nologin \
+    -c "DNSSEC private keys owner" ods
 exit 0
 
 %changelog
+* Tue Apr 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.2-1
+- Updated to 1.3.2.
+- Changed user from opendnssec to ods, as used in the opendnssec package
+
 * Thu Oct 27 2011 Paul Wouters <paul at xelerance.com> - 1.3.0-3
 - Initial Fedora package
 - Do not install the .a file
diff --git a/sources b/sources
index abc673c..f877958 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 67ff2c617c5a89a178ab4269a5cc4524  softhsm-1.3.0.tar.gz
+da08e2e229cda5907e8db90429e14f15  softhsm-1.3.2.tar.gz