[haveged/f18] Update to version 1.7. Devel package is now available.
Jirka Hladky
jhladky at fedoraproject.org
Sat Jan 19 23:33:55 UTC 2013
commit 50e507740fcb8d4fac1edcd107fc32bddda3c614
Author: Jirka Hladky <hladky.jiri at gmail.com>
Date: Sun Jan 20 00:33:48 2013 +0100
Update to version 1.7. Devel package is now available.
.gitignore | 1 +
haveged.spec | 101 +++++++++++++++++++++++++++++++++++-----------------------
sources | 4 +-
3 files changed, 64 insertions(+), 42 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7651bec..c624936 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/haveged-1.4.tar.gz
/haveged.service
/haveged-1.5.tar.gz
+/haveged-1.7.tar.gz
diff --git a/haveged.spec b/haveged.spec
index 6a5e44f..f8baf5f 100644
--- a/haveged.spec
+++ b/haveged.spec
@@ -1,7 +1,7 @@
Summary: A Linux entropy source using the HAVEGE algorithm
Name: haveged
-Version: 1.5
-Release: 2%{?dist}
+Version: 1.7
+Release: 0%{?dist}
License: GPLv3+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Group: System Environment/Daemons
@@ -12,14 +12,6 @@ Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
-# SystemV -> SystemD conversion
-# This is actually needed for the %%triggerun script but Requires(triggerun)
-# is not valid. We can use %%post because this particular %%triggerun script
-# should fire just after this package is installed.
-Requires(post): systemd-sysv
-# SystemV -> SystemD conversion
-
-
BuildRequires: automake gdb coreutils glibc-common
%description
@@ -39,43 +31,31 @@ HAVEGE collector. The haveged default is a 4kb data cache and a 16kb
instruction cache. On machines with a cpuid instruction, haveged will
attempt to select appropriate values from internal tables.
+%package devel
+Summary: Headers and shared development libraries for HAVEGE algorithm
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Headers and shared object symbolic links for the HAVEGE algorithm
+
%prep
%setup -q
-iconv -f iso-8859-15 -t utf8 README > README.new
-touch -r README README.new
-mv README.new README
-
-iconv -f iso-8859-15 -t utf8 man/haveged.8 > man/haveged.8.new
-touch -r man/haveged.8 man/haveged.8.new
-mv man/haveged.8.new man/haveged.8
%build
-autoreconf -fiv
+#autoreconf -fiv
%configure
-make %{?_smp_mflags}
+#SMP build is not working
+#make %{?_smp_mflags}
+make
%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"
+make install DESTDIR=%{buildroot} INSTALL="install -p"
chmod 0644 COPYING README ChangeLog AUTHORS
@@ -86,31 +66,72 @@ mkdir -p .%{_unitdir}
install -p -m644 %{SOURCE1} .%{_unitdir}/haveged.service
popd
+# We don't ship .la files.
+rm -rf %{buildroot}%{_libdir}/libhavege.*a
+
%clean
rm -rf %{buildroot}
%post
+/sbin/ldconfig
+%if 0%{?systemd_post:1}
%systemd_post haveged.service
+%else
+if [ $1 = 1 ]; then
+ # Initial installation
+ /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
+%endif
%preun
+%if 0%{?systemd_preun:1}
%systemd_preun haveged.service
+%else
+if [ $1 = 0 ]; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable haveged.service >/dev/null 2>&1 || :
+ /bin/systemctl stop haveged.service >/dev/null 2>&1 || :
+fi
+%endif
%postun
+%if 0%{?systemd_postun_with_restart:1}
%systemd_postun_with_restart haveged.service
+%else
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ]; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart haveged.service >/dev/null 2>&1 || :
+fi
+%endif
+/sbin/ldconfig
%files
%defattr(-, root, root, -)
%{_mandir}/man8/haveged.8*
%{_sbindir}/haveged
%{_unitdir}/haveged.service
-%doc COPYING README ChangeLog AUTHORS
+%{_libdir}/*so.*
+%doc COPYING README ChangeLog AUTHORS contrib/build/havege_sample.c
+
+%files devel
+%defattr(-, root, root, -)
+%{_mandir}/man3/libhavege.3*
+%dir %{_includedir}/%{name}
+%{_includedir}/%{name}/havege.h
+%{_libdir}/*.so
+
%changelog
+* Sat Jan 19 2013 Jirka Hladky <hladky.jiri at gmail.com> - 1.7-0
+- Updated to the version 1.7
+- Version 1.7 brings developement libraries
+- Added devel package
* Sat Oct 13 2012 Jirka Hladky <hladky.jiri at gmail.com> - 1.5-2
- BZ 850144
- Introduce new systemd-rpm macros in haveged spec file
- Fedora 19 changes the way how to work with services in spec files.
-- It introduces new macros - %systemd_post, %systemd_preun and %systemd_postun;
+- It introduces new macros - systemd_post, systemd_preun and systemd_postun;
- which replace scriptlets from Fedora 18 and older
- see https://fedoraproject.org/wiki/Packaging:ScriptletSnippets#Systemd
@@ -119,18 +140,18 @@ rm -rf %{buildroot}
- Main new feature is a run time verification of the produced random numbers
- PIDFILE set to /run/haveged.pid
- converted README and man page to UTF-8. Informed the upstream to fix it.
-* Tue Feb 15 2012 Jirka Hladky <hladky.jiri at gmail.com> - 1.4-3
+* Wed Feb 15 2012 Jirka Hladky <hladky.jiri at gmail.com> - 1.4-3
- PIDFile should be stored at /run instead of the default location /var/run
- There is long term plan that directory /var/run will not further exist in the future Fedora versions
- Asked upstream to add -p <PID_FILE_location> switch to influence the location of the PID File
- Set PIDFile=/var/run/haveged.pid This is needed as long -p option is not implemented
- https://bugzilla.redhat.com/show_bug.cgi?id=770306#c10
-* Tue Feb 15 2012 Jirka Hladky <hladky.jiri at gmail.com> - 1.4-2
+* Wed Feb 15 2012 Jirka Hladky <hladky.jiri at gmail.com> - 1.4-2
- Updated systemd service file, https://bugzilla.redhat.com/show_bug.cgi?id=770306
* Tue Feb 14 2012 Jirka Hladky <hladky.jiri at gmail.com> - 1.4-1
- Update to the version 1.4
- Conversion to systemd, drop init script
-* Sat Nov 06 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.3-2
+* Sun Nov 06 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.3-2
- Fixed a bug on non x86 systems
* Sat Nov 05 2011 Jirka Hladky <hladky.jiri at gmail.com> - 1.3-1
- update from the upstream (1.3 stable)
diff --git a/sources b/sources
index 0ead48f..cd53ef8 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-c1f34be00c3f438ec83862e90e192e4b haveged-1.5.tar.gz
-94a8695cd139f474b2fe7855013e12a3 haveged.service
+ec152ea00fa1f804278940d5f94166e5 haveged-1.7.tar.gz
+274a74314d65023cedb93ea56903a336 haveged.service
More information about the scm-commits
mailing list