Accepting request 209397 from home:seife:branches:network

- fix the breakage from last submission
  * service file was put into tmpfiles.d
  * tmpfiles config was put into systemd service dir
  * rcddclient link was broken (pointed to "service" file)
- fix rpmlint warnings, also introduced by last submission:
  * service files and tmpdir config are neither config files nor
    should be executable
- package is noarch, mark it as such
- documentation should not have executable bit set

OBS-URL: https://build.opensuse.org/request/show/209397
OBS-URL: https://build.opensuse.org/package/show/network/ddclient?expand=0&rev=29
This commit is contained in:
Stefan Seyfried 2013-12-04 13:27:38 +00:00 committed by Git OBS Bridge
parent 7f5d7b4416
commit 4be12eb8ac
2 changed files with 23 additions and 9 deletions

View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Wed Dec 4 13:08:25 UTC 2013 - seife+obs@b1-systems.com
- fix the breakage from last submission:
* service file was put into tmpfiles.d
* tmpfiles config was put into systemd service dir
* rcddclient link was broken (pointed to "service" file)
- fix rpmlint warnings, also introduced by last submission:
* service files and tmpdir config are neither config files nor
should be executable
- package is noarch, mark it as such
- documentation should not have executable bit set
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 27 15:12:09 UTC 2013 - p.drouand@gmail.com Sun Oct 27 15:12:09 UTC 2013 - p.drouand@gmail.com

View File

@ -26,11 +26,12 @@ Url: http://ddclient.sourceforge.net/
Source0: http://switch.dl.sourceforge.net/sourceforge/ddclient/%{name}-%{version}.tar.bz2 Source0: http://switch.dl.sourceforge.net/sourceforge/ddclient/%{name}-%{version}.tar.bz2
Source1: %{name}.service Source1: %{name}.service
Source2: %{name}.sysconfig 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
Patch1: %{name}-3.8.1-update_nic.patch Patch1: %{name}-3.8.1-update_nic.patch
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
BuildArch: noarch
Requires(pre): %fillup_prereq Requires(pre): %fillup_prereq
Requires: perl >= 5.004 Requires: perl >= 5.004
%{?systemd_requires} %{?systemd_requires}
@ -53,7 +54,7 @@ cron.
%patch0 %patch0
%patch1 %patch1
rm -f sample-etc_ddclient.conf.orig rm -f sample-etc_ddclient.conf.orig
chmod a-x sample-etc* chmod a-x sample-*
mkdir examples mkdir examples
mv sample-ddclient-wrapper.sh examples mv sample-ddclient-wrapper.sh examples
@ -78,11 +79,11 @@ mv sample-ddclient-wrapper.sh examples
%{__install} -m 644 sample-etc_ddclient.conf %{buildroot}%{_sysconfdir}/%{name}.conf %{__install} -m 644 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%{?suse_version} >=1230
%{__install} -m 755 %{SOURCE1} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf %{__install} -m 644 %{SOURCE1} %{buildroot}/%{_unitdir}/%{name}.service
%{__install} -m 755 %{SOURCE3} %{buildroot}/%{_unitdir}/%{name}.service %{__install} -m 644 %{SOURCE3} %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf
%{__ln_s} %{_unitdir}/%{name}.service %{buildroot}%{_sbindir}/rc%{name} %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
%else %else
%{__install} -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/init.d/%{name} %{__install} -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
@ -115,10 +116,10 @@ mv sample-ddclient-wrapper.sh examples
%doc COPY* README* sample* examples %doc COPY* README* sample* 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%{?suse_version} >=1230
%config %attr(0755,root,root) %{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%config %attr(0644,root,root) %{_libexecdir}/tmpfiles.d/ddclient.conf %{_libexecdir}/tmpfiles.d/ddclient.conf
%else %else
%config %attr(0755,root,root) /etc/init.d/%{name} /etc/init.d/%{name}
%endif %endif
%{_sbindir}/%{name} %{_sbindir}/%{name}
%{_sbindir}/rc%{name} %{_sbindir}/rc%{name}