Mailinglist Archive: opensuse-commit (4019 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package unscd for openSUSE:Factory checked 
in at 2011-12-01 12:26:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/unscd (Old)
 and      /work/SRC/openSUSE:Factory/.unscd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "unscd", Maintainer is "PBaudis@xxxxxxxxxx"

Changes:
--------
--- /work/SRC/openSUSE:Factory/unscd/unscd.changes      2011-11-28 
12:58:26.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.unscd.new/unscd.changes 2011-12-01 
12:26:50.000000000 +0100
@@ -1,0 +2,5 @@
+Tue Nov 29 02:30:14 UTC 2011 - crrodriguez@xxxxxxxxxxxx
+
+- Use proper systemd macros. 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ unscd.spec ++++++
--- /var/tmp/diff_new_pack.OA6QfV/_old  2011-12-01 12:26:51.000000000 +0100
+++ /var/tmp/diff_new_pack.OA6QfV/_new  2011-12-01 12:26:51.000000000 +0100
@@ -16,6 +16,7 @@
 #
 
 
+%define         pkg_name nscd
 
 Name:           unscd
 Version:        0.47
@@ -34,6 +35,11 @@
 Source4:        nscd.service
 Source5:        nscd.socket
 PreReq:         %insserv_prereq
+%if 0%{?suse_version} > 1140
+BuildRequires:  systemd
+%{?systemd_requires}
+%define i_have_systemd 1
+%endif
 
 %description
 unscd caches application requests for resolving hostnames,
@@ -59,26 +65,44 @@
 ln -sf /etc/init.d/nscd $RPM_BUILD_ROOT/usr/sbin/rcnscd
 mkdir -p $RPM_BUILD_ROOT/var/run/nscd
 touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
-install -D -m 0644  %{S:4} %{buildroot}/lib/systemd/system/nscd.service
-install -D -m 0644  %{S:5} %{buildroot}/lib/systemd/system/nscd.socket
+%if 0%{?i_have_systemd}
+install -D -m 0644  %{S:4} %{buildroot}%{_unitdir}/nscd.service
+install -D -m 0644  %{S:5} %{buildroot}%{_unitdir}/nscd.socket
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%if 0%{?i_have_systemd}
+%service_add_pre %{pkg_name}.service %{pkg_name}.socket
+%endif
+
 %preun
 %stop_on_removal nscd
+%if 0%{?i_have_systemd}
+%service_del_preun  %{pkg_name}.service %{pkg_name}.socket
+%endif
 
 %post
 %{insserv_force_if_yast nscd}
+%if 0%{?i_have_systemd}
+%service_add_post %{pkg_name}.service %{pkg_name}.socket
+%endif
 
 %postun
 %restart_on_update nscd
 %insserv_cleanup
+%if 0%{?i_have_systemd}
+%service_del_postun %{pkg_name}.service %{pkg_name}.socket
+%endif
 
 %files
 %defattr(-,root,root,-)
-/lib/systemd/system/nscd.service
-/lib/systemd/system/nscd.socket
+%if 0%{?i_have_systemd}
+%{_unitdir}/nscd.service
+%{_unitdir}/nscd.socket
+%endif
 %config(noreplace) /etc/nscd.conf
 %config /etc/init.d/nscd
 %attr(0755,root,root) %_sbindir/*

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx