From da78e5df4b7e600859e32716ad0ad19cbf694d6c Mon Sep 17 00:00:00 2001
From: Tomáš Mráz <tmraz@fedoraproject.org>
Date: Mar 19 2009 09:17:39 +0000
Subject: - move binaries and libraries to /usr


---

diff --git a/.cvsignore b/.cvsignore
index 1a7daa4..9b604df 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-fipscheck-1.1.0.tar.bz2
+fipscheck-1.1.1.tar.bz2
diff --git a/fipscheck.spec b/fipscheck.spec
index 7f9c22c..28f9fbd 100644
--- a/fipscheck.spec
+++ b/fipscheck.spec
@@ -1,6 +1,6 @@
 Summary:	A library for integrity verification of FIPS validated modules
 Name:		fipscheck
-Version:	1.1.0
+Version:	1.1.1
 Release:	1%{?dist}
 License:	BSD
 Group:		System Environment/Libraries
@@ -31,8 +31,7 @@ This package contains development files for %{name}.
 %setup -q
 
 %build
-%configure --disable-static \
-	--bindir=/bin
+%configure --disable-static
 
 make %{?_smp_mflags}
 
@@ -41,9 +40,9 @@ make %{?_smp_mflags}
     %{?__debug_package:%{__debug_install_post}} \
     %{__arch_install_post} \
     %{__os_install_post} \
-    $RPM_BUILD_ROOT/bin/fipshmac $RPM_BUILD_ROOT/bin/fipscheck \
-    $RPM_BUILD_ROOT/bin/fipshmac $RPM_BUILD_ROOT/%{_lib}/libfipscheck.so.1.1.0 \
-    ln -s .libfipscheck.so.1.1.0.hmac $RPM_BUILD_ROOT/%{_lib}/.libfipscheck.so.1.hmac \
+    $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 \
 %{nil}
 
 %install
@@ -53,11 +52,6 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name "*.la" -delete
 
-mkdir $RPM_BUILD_ROOT/%{_lib}
-mv $RPM_BUILD_ROOT%{_libdir}/libfipscheck.so.* $RPM_BUILD_ROOT/%{_lib}
-
-ln -sf ../../%{_lib}/libfipscheck.so.1 $RPM_BUILD_ROOT%{_libdir}/libfipscheck.so
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -68,11 +62,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README AUTHORS
-/%{_lib}/libfipscheck.so.*
-/%{_lib}/.libfipscheck.so.*
-/bin/fipscheck
-/bin/.fipscheck.hmac
-/bin/fipshmac
+%{_libdir}/libfipscheck.so.*
+%{_libdir}/.libfipscheck.so.*
+%{_bindir}/fipscheck
+%{_bindir}/.fipscheck.hmac
+%{_bindir}/fipshmac
 
 %files devel
 %defattr(-,root,root,-)
@@ -80,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libfipscheck.so
 
 %changelog
+* Thu Mar 19 2009 Tomas Mraz - 1.1.1-1
+- move binaries and libraries to /usr
+
 * Wed Mar 18 2009 Tomas Mraz - 1.1.0-1
 - hmac check itself as required by FIPS
 
diff --git a/sources b/sources
index a31473d..e39dfa1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb294821de9dd1174df721f4741d82ba  fipscheck-1.1.0.tar.bz2
+fd57a73f6a79485dc4152b316778998b  fipscheck-1.1.1.tar.bz2