Hello community, here is the log from the commit of package atftp for openSUSE:Factory checked in at 2015-02-16 21:14:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/atftp (Old) and /work/SRC/openSUSE:Factory/.atftp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "atftp" Changes: -------- --- /work/SRC/openSUSE:Factory/atftp/atftp.changes 2013-11-15 16:55:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.atftp.new/atftp.changes 2015-02-16 21:14:48.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 16 13:06:57 UTC 2015 - p.drouand@gmail.com + +- Add systemd support for openSUSE >= 12.1 + +------------------------------------------------------------------- New: ---- atftpd.service atftpd.socket ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ atftp.spec ++++++ --- /var/tmp/diff_new_pack.l788Mr/_old 2015-02-16 21:14:49.000000000 +0100 +++ /var/tmp/diff_new_pack.l788Mr/_new 2015-02-16 21:14:49.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package atftp # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 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 @@ -32,6 +32,8 @@ Source2: atftpd.sysconfig Source3: atftpd.logrotate Source4: atftp.fw +Source5: atftpd.service +Source6: atftpd.socket Patch1: atftp-0.7.dif Patch2: atftp-CLK_TCK.diff Patch3: atftp-0.7_compiler_warnings.patch @@ -52,7 +54,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: tftp(client) Provides: tftp(server) -PreReq: %insserv_prereq %fillup_prereq +%if 0%{?suse_version} >= 1210 +BuildRequires: systemd-rpm-macros +%{?systemd_requires} +%else +PreReq: %insserv_prereq +%endif +PreReq: %fillup_prereq PreReq: pwdutils BuildRequires: autoconf BuildRequires: automake @@ -95,8 +103,14 @@ %install %makeinstall # SuSE rc +%if 0%{?suse_version} >= 1210 +%{__install} -D -m 0755 %{S:5} %{buildroot}/%{_unitdir}/atftpd.service +%{__install} -D -m 0755 %{S:6} %{buildroot}/%{_unitdir}/atftpd.socket +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcatftpd +%else %{__install} -D -m 0755 %{S:1} %{buildroot}/etc/init.d/atftpd %{__ln_s} -f ../../etc/init.d/atftpd %{buildroot}%{_sbindir}/rcatftpd +%endif %{__install} -D -m 0644 %{S:2} %{buildroot}/var/adm/fillup-templates/sysconfig.atftpd %{__install} -D -m 0644 %{S:3} %{buildroot}/etc/logrotate.d/%{name} %{__mkdir} -p %{buildroot}/%{_fwdefdir} @@ -117,16 +131,30 @@ %{__sed} -i -e "s@^\(ATFTPD_OPTIONS=\"--daemon \"\)@#\1@" /etc/sysconfig/atftpd %{__sed} -i -e "s@^\(ATFTPD_DIRECTORY=\"/tftpboot\"\)@#\1@" /etc/sysconfig/atftpd fi +%if 0%{?suse_version} >= 1210 +%service_add_pre atftpd.service atftpd.socket +%endif %preun +%if 0%{?suse_version} >= 1210 +%service_del_preun atftpd.service atftpd.socket +%else %stop_on_removal atftpd +%endif %post +%if 0%{?suse_version} >= 1210 +%service_add_post atftpd.service atftpd.socket +%endif %{fillup_only -n atftpd} %postun +%if 0%{?suse_version} >= 1210 +%service_del_postun atftpd.service atftpd.socket +%else %restart_on_update atftpd %{insserv_cleanup} +%endif %files %defattr(-,root,root) @@ -135,7 +163,12 @@ %{_sbindir}/atftpd %{_sbindir}/in.tftpd %{_sbindir}/rcatftpd +%if 0%{?suse_version} >= 1210 +%{_unitdir}/atftpd.service +%{_unitdir}/atftpd.socket +%else /etc/init.d/atftpd +%endif %config /etc/logrotate.d/%{name} /var/adm/fillup-templates/sysconfig.atftpd %{_mandir}/man1/atftp.1.gz ++++++ atftpd.service ++++++ [Unit] Description=Advanced TFTP Server [Service] EnvironmentFile=/etc/sysconfig/atftpd ExecStart=/usr/sbin/atftpd --user $ATFTPD_USER --group $ATFTPD_GROUP $ATFTPD_OPTIONS $ATFTPD_DIRECTORY StandardInput=socket ++++++ atftpd.socket ++++++ [Unit] Description=Advanced tftp Server Activation Socket [Socket] ListenDatagram=69 [Install] WantedBy=sockets.target -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org