up to 1.9.6

- update source URL (project moved to github)
- added link fix (https://github.com/jirka-h/haveged/issues/20)
- run autotools
- package systemd service
- rel 1

diff --git a/haveged-link.patch b/haveged-link.patch
new file mode 100644 (file)
index 0000000..fff1b20
--- /dev/null
+++ b/haveged-link.patch
@@ -0,0 +1,20 @@
+--- haveged-1.9.6/src/Makefile.am.orig 2019-08-26 11:59:29.000000000 +0200
++++ haveged-1.9.6/src/Makefile.am      2019-08-27 20:15:28.231748308 +0200
+@@ -21,13 +21,12 @@
+ libhavege_la_LDFLAGS = -version-number @HAVEGE_LT_VERSION@
+ libhavege_la_LIBADD = @HA_LDFLAGS@
+ 
+-libhavege_la_SOURCES = havege.c havegetune.c havegecollect.c havegetest.c havegecmd.c \
+-            cpuid-43.h havege.h havegetune.h havegecollect.h havegetest.h oneiteration.h \
+-            havegecmd.h
++libhavege_la_SOURCES = havege.c havegetune.c havegecollect.c havegetest.c \
++            cpuid-43.h havege.h havegetune.h havegecollect.h havegetest.h oneiteration.h
+ 
+-pkginclude_HEADERS = havege.h havegecmd.h
++pkginclude_HEADERS = havege.h
+ 
+-haveged_SOURCES = haveged.c haveged.h
++haveged_SOURCES = haveged.c haveged.h havegecmd.c havegecmd.h
+ 
+ haveged_LDADD = @HA_LDFLAGS@ libhavege.la
+ ##libtool_end##

diff --git a/haveged.spec b/haveged.spec
index 92862c09ee016e68c0c0604a8c87f0796a376ede..0a34ebff8c7545c0451593cf125c4fe32f654ca1 100644 (file)
--- a/haveged.spec
+++ b/haveged.spec
@@ -1,21 +1,20 @@
 Summary:       A Linux entropy source using the HAVEGE algorithm
 Name:          haveged
-Version:       1.9.1
-Release:       0.1
+Version:       1.9.6
+Release:       1
 License:       GPL v3+
 Group:         Daemons
-Source0:       http://www.issihosts.com/haveged/%{name}-%{version}.tar.gz
-# Source0-md5: 015ff58cd10607db0e0de60aeca2f5f8
+Source0:       https://github.com/jirka-h/haveged/archive/v%{version}.tar.gz
+# Source0-md5: 445ebbe0ecce01de06847689e9822efd
+Patch0:                %{name}-link.patch
 URL:           http://www.irisa.fr/caps/projects/hipsor/
-#Source1:      %{name}.service
+BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-BuildRequires: gdb
-BuildRequires: systemd-units
-%if 0
-Requires(post):        systemd
-Requires(preun):       systemd
-Requires(postun):      systemd
-%endif
+BuildRequires: libtool
+BuildRequires: rpmbuild(macros) >= 1.644
+BuildRequires: systemd-devel
+Requires(post,preun,postun):   systemd-units >= 38
+Requires:      systemd-units >= 38
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -53,22 +52,23 @@ Headers and shared object symbolic links for the HAVEGE algorithm
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-#autoreconf -fiv
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-       --disable-static
+       --disable-static \
+       --enable-init=service.fedora
 # SMP build is not working
 %{__make} -j1
 
-%if %{with tests}
-%{__make} check
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
-       INSTALL="install -p" \
        DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT%{systemdunitdir}
@@ -83,7 +83,6 @@ rm -rf $RPM_BUILD_ROOT
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
-%if 0
 %post
 %systemd_post haveged.service
 
@@ -91,15 +90,14 @@ rm -rf $RPM_BUILD_ROOT
 %systemd_preun haveged.service
 
 %postun
-%systemd_postun_with_restart haveged.service
-%endif
+%systemd_reload
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING README ChangeLog AUTHORS contrib/build/havege_sample.c
+%doc AUTHORS ChangeLog NEWS README contrib/build/havege_sample.c
 %attr(755,root,root) %{_sbindir}/haveged
 %{_mandir}/man8/haveged.8*
-#%{systemdunitdir}/haveged.service
+%{systemdunitdir}/haveged.service
 
 %files libs
 %defattr(644,root,root,755)