Hello community, here is the log from the commit of package haveged for openSUSE:Factory checked in at 2011-11-29 12:52:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haveged (Old) and /work/SRC/openSUSE:Factory/.haveged.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haveged", Maintainer is "MVyskocil@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/haveged/haveged.changes 2011-11-23 19:34:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.haveged.new/haveged.changes 2011-11-29 12:52:18.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Nov 29 03:21:09 UTC 2011 - crrodriguez@opensuse.org + +- Use proper systemd macros +- reduce verbosity level to the minimum + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haveged.spec ++++++ --- /var/tmp/diff_new_pack.j0JH7h/_old 2011-11-29 12:52:19.000000000 +0100 +++ /var/tmp/diff_new_pack.j0JH7h/_new 2011-11-29 12:52:19.000000000 +0100 @@ -24,10 +24,10 @@ Summary: Feed entropy into random pool Url: http://www.issihosts.com/haveged/ Group: System/Daemons -Source0: http://www.issihosts.com/haveged/haveged-%{version}.tar.gz -Source1: haveged.init -Source2: haveged.service -Patch1: haveged-ppc64.patch +Source0: http://www.issihosts.com/haveged/%{name}-%{version}.tar.gz +Source1: %{name}.init +Source2: %{name}.service +Patch1: %{name}-ppc64.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build ExcludeArch: %{arm} Requires(pre): %insserv_prereq @@ -37,6 +37,11 @@ Requires(post): grep util-linux Enhances: openssl gpg2 php5 apache2 openvpn smtp_daemon %{!?_initddir: %global _initddir /etc/init.d} +%if 0%{?suse_version} > 1140 +BuildRequires: systemd +%{?systemd_requires} +%define have_systemd 1 +%endif %description The haveged daemon feeds the linux entropy pool with random @@ -59,10 +64,13 @@ %install %makeinstall -%{__install} -D -m0755 %{S:1} %{buildroot}%{_initddir}/haveged +%{__install} -D -m0755 %{S:1} %{buildroot}%{_initddir}/%{name} %{__mkdir_p} %{buildroot}%{_sbindir} %{__ln_s} -f %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} -%{__install} -D -m0755 %{S:2} %{buildroot}/lib/systemd/system/haveged.service + +%if 0%{?have_systemd} +%{__install} -D -m0644 %{S:2} %{buildroot}%{_unitdir}/%{name}.service +%endif %clean %{?buildroot:%__rm -rf "%{buildroot}"} @@ -70,22 +78,36 @@ %post # do not enable on condition here, let YAST, kiwi or the user do it. %{fillup_and_insserv -f %{name}} +%if 0%{?have_systemd} +%service_add_post %{name}.service +%endif %postun %restart_on_update %{name} %{insserv_cleanup} +%if 0%{?have_systemd} +%service_del_postun %{name}.service +%endif + +%pre +%if 0%{?have_systemd} +%service_add_pre %{name}.service +%endif %preun %stop_on_removal %{name} +%if 0%{?have_systemd} +%service_del_preun %{name}.service +%endif %files %defattr(-,root,root) %{_sbindir}/rc%{name} -/sbin/haveged -%config %{_initddir}/haveged -%{_mandir}/man8/haveged.8.gz -%dir /lib/systemd -%dir /lib/systemd/system -/lib/systemd/system/haveged.service +/sbin/%{name} +%config %{_initddir}/%{name} +%{_mandir}/man8/%{name}.8.gz +%if 0%{?have_systemd} +%{_unitdir}/%{name}.service +%endif %changelog ++++++ haveged.service ++++++ --- /var/tmp/diff_new_pack.j0JH7h/_old 2011-11-29 12:52:19.000000000 +0100 +++ /var/tmp/diff_new_pack.j0JH7h/_new 2011-11-29 12:52:19.000000000 +0100 @@ -4,7 +4,7 @@ [Service] Type=simple -ExecStart=/sbin/haveged -F 1 -w 1024 -v 1 +ExecStart=/sbin/haveged -F 1 -w 1024 -v 0 [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org