diff --git a/ddclient.changes b/ddclient.changes index e799497..06aa28d 100644 --- a/ddclient.changes +++ b/ddclient.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 22 13:14:42 UTC 2014 - chris@computersalat.de + +- 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 - jsegitz@novell.com diff --git a/ddclient.spec b/ddclient.spec index c2bd0a6..a4ad523 100644 --- a/ddclient.spec +++ b/ddclient.spec @@ -29,11 +29,17 @@ Source2: %{name}.sysconfig 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,49 +71,41 @@ mv sample-* examples %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 -%if 0%{?suse_version} >=1230 %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 @@ -118,7 +116,7 @@ mv sample-* examples %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