[haveged/f15] Update to 1.3

[Jirka Hladky]

commit 8a786cb4d43f0a05431939dfd3923093a44cc985
Author: Jirka Hladky <hladky.jiri at gmail.com>
Date:   Sat Nov 5 22:26:01 2011 +0100

    Update to 1.3

 .gitignore   |    2 ++
 haveged.spec |   45 +++++++++++++++++++++++++++++++++++----------
 sources      |    3 ++-
 3 files changed, 39 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0ecc58b..720283c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /haveged-1.2.tar.gz
+/haveged-1.3_ppc.patch
+/haveged-1.3.tar.gz
diff --git a/haveged.spec b/haveged.spec
index c76b479..f76f435 100644
--- a/haveged.spec
+++ b/haveged.spec
@@ -1,20 +1,23 @@
-Summary:        A Linux entropy source using the HAVEGE algorithm.
+Summary:        A Linux entropy source using the HAVEGE algorithm
 Name:           haveged
-Version:        1.2
-Release:        3%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 License:        GPLv3+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Group:          System Environment/Daemons
 URL:            http://www.irisa.fr/caps/projects/hipsor/
-Source0:        http://www.issihosts.com/haveged/haveged-1.2.tar.gz
+Source0:        http://www.issihosts.com/haveged/haveged-1.3.tar.gz
+#Source1:       test.gdb
+Patch0:         haveged-1.3_ppc.patch
+#Source2:       cpuid-20110305.src.tar.gz
 # Patch represents changes planed for the version 1.3:
 # - changed run levels:
 # - added option to write random bytes to stdout: -f -
-Patch0:         haveged-1.2_jh.patch 
+#Patch0:         haveged-1.2_jh.patch 
 Requires(post):   chkconfig
 Requires(preun):  chkconfig, initscripts
 Requires(postun): initscripts
-BuildRequires:  automake
+BuildRequires:  automake gdb coreutils
 
 %description
 A Linux entropy source using the HAVEGE algorithm
@@ -38,13 +41,29 @@ attempt to select appropriate values from internal tables.
 %patch0 -p1
 
 %build
-automake
+autoreconf -fiv
 %configure
 make %{?_smp_mflags}
 
 %check
+#install -p -m 644 %%{SOURCE1} ./
+#install -p -m 644 %%{SOURCE2} ./
+#tar zxvf cpuid-20110305.src.tar.gz
+#cd cpuid-20110305
+#make
+#cd ..
+#uname -a
+#cat /proc/cpuinfo
+#gcc --version
+#cpuid-20110305/cpuid -r
+#cpuid-20110305/cpuid
+#cat /sys/devices/system/cpu/cpu0/cache/index*/size
+#cat /sys/devices/system/cpu/cpu0/cache/index*/type
+#gdb src/haveged --batch -x test.gdb
+#src/haveged -r 1 -v -1
 make check
 
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
@@ -54,8 +73,8 @@ make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 #Need to remove haveged specific script from __buildroot__ since it's installed to the wrong location 
 #(/etc/init.d instead of /etc/rc.d/init.d)
 rm -rf %{buildroot}/etc/init.d
-install -m755 -D init.d/haveged_fedora %{buildroot}%{_initrddir}/haveged
-
+install -m755 -D contrib/haveged_fedora %{buildroot}%{_initrddir}/haveged
+chmod 0644 COPYING README ChangeLog AUTHORS
 
 %clean
 rm -rf %{buildroot}
@@ -83,11 +102,17 @@ fi
 %doc COPYING README ChangeLog AUTHORS
 
 %changelog
+* Sat Nov 05 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.3-1
+- update from the upstream (1.3 stable)
+* Mon Oct 03 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.3-0
+-version 1.3 beta
+* Fri Sep 30 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.2-4
+- ppc64 build
 * Mon Sep 26 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.2-3
 - Cleaned spec file according to https://bugzilla.redhat.com/show_bug.cgi?id=739347#c11
 * Sat Sep 24 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.2-2
 - Added comment to explain why we need use Fedora specific start script
 * Wed Sep 21 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.2-1
 - Cleaned spec file according to https://bugzilla.redhat.com/show_bug.cgi?id=739347#c1
-* Wed Sep 7 2011  Jirka Hladky <hladky.jiri at gmail.com> - 1.2-0
+* Wed Sep 07 2011  Jirka Hladky <hladky.jiri at gmail.com> - 1.2-0
 - Initial build
diff --git a/sources b/sources
index 9d1b0b4..82c60ba 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-dc961f36c065239f2ddeeb840ddf9ec0  haveged-1.2.tar.gz
+e9df9a5e18cb86e38d8fff47bc09626d  haveged-1.3_ppc.patch
+7e7fed038fa45f455610ed430ca30a5e  haveged-1.3.tar.gz