[fipscheck] - look up the hmac files in the _libdir/fipscheck first

[Tomáš Mráz]

commit c7430a1fc5b84769b0a03ae339839ea0877d139f
Author: Tomas Mraz <tmraz at fedoraproject.org>
Date:   Tue Sep 7 23:05:48 2010 +0200

    - look up the hmac files in the _libdir/fipscheck first

 .gitignore     |    1 +
 fipscheck.spec |   26 +++++++++++---------------
 sources        |    2 +-
 3 files changed, 13 insertions(+), 16 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 07c4176..d9adb58 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 fipscheck-1.2.0.tar.bz2
+/fipscheck-1.3.0.tar.bz2
diff --git a/fipscheck.spec b/fipscheck.spec
index 4ad1a56..fd937c6 100644
--- a/fipscheck.spec
+++ b/fipscheck.spec
@@ -1,7 +1,7 @@
 Summary:	A library for integrity verification of FIPS validated modules
 Name:		fipscheck
-Version:	1.2.0
-Release:	4%{?dist}
+Version:	1.3.0
+Release:	1%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
 # This is a Red Hat maintained package which is specific to
@@ -51,9 +51,8 @@ make %{?_smp_mflags}
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    $RPM_BUILD_ROOT%{_bindir}/fipshmac $RPM_BUILD_ROOT%{_bindir}/fipscheck \
-    $RPM_BUILD_ROOT%{_bindir}/fipshmac $RPM_BUILD_ROOT%{_libdir}/libfipscheck.so.1.1.0 \
-    ln -s .libfipscheck.so.1.1.0.hmac $RPM_BUILD_ROOT%{_libdir}/.libfipscheck.so.1.hmac \
+    $RPM_BUILD_ROOT%{_bindir}/fipshmac -d $RPM_BUILD_ROOT%{_libdir}/fipscheck $RPM_BUILD_ROOT%{_bindir}/fipscheck $RPM_BUILD_ROOT%{_libdir}/libfipscheck.so.1.1.0 \
+    ln -s libfipscheck.so.1.1.0.hmac $RPM_BUILD_ROOT%{_libdir}/fipscheck/libfipscheck.so.1.hmac \
 %{nil}
 
 %install
@@ -63,6 +62,8 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/fipscheck
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -74,13 +75,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README AUTHORS
 %{_bindir}/fipscheck
-%{_bindir}/.fipscheck.hmac
 %{_bindir}/fipshmac
+%{_libdir}/fipscheck/fipscheck.hmac
 
 %files lib
 %defattr(-,root,root,-)
 %{_libdir}/libfipscheck.so.*
-%{_libdir}/.libfipscheck.so.*
+%dir %{_libdir}/fipscheck
+%{_libdir}/fipscheck/libfipscheck.so.*.hmac
 
 %files devel
 %defattr(-,root,root,-)
@@ -88,14 +90,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfipscheck.so
 
 %changelog
-* Tue Oct 27 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-4
-- ldconfig must be in the lib subpackage post(un)
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz at redhat.com> - 1.2.0-3
-- rebuilt with new openssl
-
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+* Tue Sep  7 2010 Tomas Mraz - 1.3.0-1
+- look up the hmac files in the _libdir/fipscheck first
 
 * Tue May 26 2009 Tomas Mraz - 1.2.0-1
 - add lib subpackage to avoid multilib on the base package
diff --git a/sources b/sources
index 4b6cb06..4c1cd93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5bfe67a0360ab5e09b7a068ed9eeda90  fipscheck-1.2.0.tar.bz2
+9936b287b70c6588e257f31b1be05a5e  fipscheck-1.3.0.tar.bz2