pool/ddclient
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 235113 from home:computersalat:devel:network

Browse Source 
update/fix systemd stuff

OBS-URL: https://build.opensuse.org/request/show/235113
OBS-URL: https://build.opensuse.org/package/show/network/ddclient?expand=0&rev=34
This commit is contained in:
Christian Wittmer 2014-05-22 13:47:19 +00:00 committed by Git OBS Bridge
parent 0e5585bd54
commit 1cea4f58f8
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ddclient.changes
View File

@ -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 Tue May 20 14:29:35 UTC 2014 - jsegitz@novell.com

40
ddclient.spec
View File

@ -29,11 +29,17 @@ Source2: %{name}.sysconfig
Source3: %{name}-tmpfiles.conf Source3: %{name}-tmpfiles.conf
Source4: rc.%{name} Source4: rc.%{name}
Patch0: %{name}-3.8.1-config.patch Patch0: %{name}-3.8.1-config.patch
BuildRequires: pkgconfig(systemd) BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
Requires(pre): %fillup_prereq Requires(pre): %fillup_prereq
Requires: perl >= 5.004
%if 0%{?suse_version} >= 1230
BuildRequires: pkgconfig(systemd)
%{?systemd_requires} %{?systemd_requires}
%define has_systemd 1
%endif
Requires: perl >= 5.004
Recommends: perl-IO-Socket-SSL Recommends: perl-IO-Socket-SSL
%description %description
@ -65,49 +71,41 @@ mv sample-* examples
%install %install
#make DESTDIR=$RPM_BUILD_ROOT install #make DESTDIR=$RPM_BUILD_ROOT install
%{__mkdir_p} %{buildroot}%{_sbindir} %{__install} -D -m 755 %{name} %{buildroot}%{_sbindir}/%{name}
%{__mkdir_p} %{buildroot}%{_sysconfdir} %{__install} -D -m 644 examples/sample-etc_ddclient.conf %{buildroot}%{_sysconfdir}/%{name}.conf
%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
# init script and config file # init script and config file
%if 0%{?suse_version} >=1230 %if 0%{?has_systemd}
%{__install} -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service %{__install} -D -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service
%{__install} -m 644 %{SOURCE3} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf %{__install} -D -m 644 %{SOURCE3} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf
%{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%else %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} %{__ln_s} %{_sysconfdir}/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name}
%endif %endif
%{__install} -d -m 755 %{buildroot}/var/adm/fillup-templates %{__install} -d -m 755 %{buildroot}/var/adm/fillup-templates
%{__install} -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} %{__install} -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name}
%{__install} -d -m 755 %{buildroot}/var/cache/%{name} %{__install} -d -m 755 %{buildroot}/var/cache/%{name}
%if 0%{?has_systemd}
%pre %pre
%if 0%{?suse_version} >=1230
%service_add_pre %{name}.service %service_add_pre %{name}.service
%endif %endif
%post %post
%{fillup_only} %{fillup_only}
%if 0%{?suse_version} >=1230 %if 0%{?has_systemd}
%service_add_post %{name}.service %service_add_post %{name}.service
%endif %endif
%preun %preun
%if 0%{?suse_version} >=1230 %if 0%{?has_systemd}
%service_del_preun %{name}.service %service_del_preun %{name}.service
%else %else
%stop_on_removal ddclient %stop_on_removal ddclient
%endif %endif
%postun %postun
%if 0%{?suse_version} >=1230 %if 0%{?has_systemd}
%service_del_postun %{name}.service %service_del_postun %{name}.service
%else %else
%restart_on_update ddclient %restart_on_update ddclient
@ -118,7 +116,7 @@ mv sample-* examples
%defattr(-, root, root) %defattr(-, root, root)
%doc COPY* README* examples %doc COPY* README* examples
%config(noreplace) %attr(600,root,root) %{_sysconfdir}/%{name}.conf %config(noreplace) %attr(600,root,root) %{_sysconfdir}/%{name}.conf
%if 0%{?suse_version} >=1230 %if 0%{?has_systemd}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%{_libexecdir}/tmpfiles.d/ddclient.conf %{_libexecdir}/tmpfiles.d/ddclient.conf
%else %else