Hello community, here is the log from the commit of package ddclient for openSUSE:Factory checked in at 2014-05-23 08:08:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ddclient (Old) and /work/SRC/openSUSE:Factory/.ddclient.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ddclient" Changes: -------- --- /work/SRC/openSUSE:Factory/ddclient/ddclient.changes 2014-01-03 14:57:48.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ddclient.new/ddclient.changes 2014-05-23 08:08:50.000000000 +0200 @@ -1,0 +2,13 @@ +Thu May 22 13:14:42 UTC 2014 - [email protected] + +- update systemd stuff + * add {?has_systemd} to fix build for Systems using init scripts +- spec cleanup + * add missing BuildRoot + +------------------------------------------------------------------- +Tue May 20 14:29:35 UTC 2014 - [email protected] + +- ensure proper handling of .service files with %service_add_pre + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ddclient.spec ++++++ --- /var/tmp/diff_new_pack.OAFFSK/_old 2014-05-23 08:08:51.000000000 +0200 +++ /var/tmp/diff_new_pack.OAFFSK/_new 2014-05-23 08:08:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ddclient # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,11 +29,17 @@ Source3: %{name}-tmpfiles.conf Source4: rc.%{name} Patch0: %{name}-3.8.1-config.patch -BuildRequires: pkgconfig(systemd) +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch Requires(pre): %fillup_prereq -Requires: perl >= 5.004 + +%if 0%{?suse_version} >= 1230 +BuildRequires: pkgconfig(systemd) %{?systemd_requires} +%define has_systemd 1 +%endif + +Requires: perl >= 5.004 Recommends: perl-IO-Socket-SSL %description @@ -65,44 +71,41 @@ %install #make DESTDIR=$RPM_BUILD_ROOT install -%{__mkdir_p} %{buildroot}%{_sbindir} -%{__mkdir_p} %{buildroot}%{_sysconfdir} -%if 0%{?suse_version} >=1230 -%{__mkdir_p} %{buildroot}%{_unitdir} -%{__mkdir_p} %{buildroot}%{_libexecdir}/tmpfiles.d -%else -%{__mkdir_p} %{buildroot}%{_sysconfdir}/init.d -%endif -%{__install} -m 755 %{name} %{buildroot}%{_sbindir}/ -%{__install} -m 644 examples/sample-etc_ddclient.conf %{buildroot}%{_sysconfdir}/%{name}.conf +%{__install} -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name} +%{__install} -D -m 644 examples/sample-etc_ddclient.conf %{buildroot}%{_sysconfdir}/%{name}.conf # init script and config file -%if 0%{?suse_version} >=1230 -%{__install} -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service -%{__install} -m 644 %{SOURCE3} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf +%if 0%{?has_systemd} +%{__install} -D -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service +%{__install} -D -m 644 %{SOURCE3} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %else -%{__install} -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/init.d/%{name} +%{__install} -D -m 755 %{SOURCE4} %{buildroot}%{_sysconfdir}/init.d/%{name} %{__ln_s} %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} %endif %{__install} -d -m 755 %{buildroot}/var/adm/fillup-templates %{__install} -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} %{__install} -d -m 755 %{buildroot}/var/cache/%{name} +%if 0%{?has_systemd} +%pre +%service_add_pre %{name}.service +%endif + %post %{fillup_only} -%if 0%{?suse_version} >=1230 +%if 0%{?has_systemd} %service_add_post %{name}.service %endif %preun -%if 0%{?suse_version} >=1230 +%if 0%{?has_systemd} %service_del_preun %{name}.service %else %stop_on_removal ddclient %endif %postun -%if 0%{?suse_version} >=1230 +%if 0%{?has_systemd} %service_del_postun %{name}.service %else %restart_on_update ddclient @@ -113,7 +116,7 @@ %defattr(-, root, root) %doc COPY* README* examples %config(noreplace) %attr(600,root,root) %{_sysconfdir}/%{name}.conf -%if 0%{?suse_version} >=1230 +%if 0%{?has_systemd} %{_unitdir}/%{name}.service %{_libexecdir}/tmpfiles.d/ddclient.conf %else -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
