Hello community, here is the log from the commit of package proftpd for openSUSE:Factory checked in at 2013-08-05 20:50:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/proftpd (Old) and /work/SRC/openSUSE:Factory/.proftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "proftpd" Changes: -------- --- /work/SRC/openSUSE:Factory/proftpd/proftpd.changes 2013-05-02 11:31:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.proftpd.new/proftpd.changes 2013-08-05 20:50:57.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Jul 29 01:12:53 UTC 2013 - [email protected] + +- Improve systemd service file +- use upstream tmpfiles.d file. related to [bnc#811793] +- Use /run instead of /var/run + +------------------------------------------------------------------- Old: ---- proftpd.conf.tmpfile ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ proftpd.spec ++++++ --- /var/tmp/diff_new_pack.DOj92o/_old 2013-08-05 20:50:58.000000000 +0200 +++ /var/tmp/diff_new_pack.DOj92o/_new 2013-08-05 20:50:58.000000000 +0200 @@ -30,7 +30,6 @@ Source11: %{name}.init Source12: %{name}.passwd Source13: %{name}.service -Source14: %{name}.conf.tmpfile Source15: %{name}.keyring #PATCH-FIX-openSUSE: pam, logrotate, xinet Patch100: %{name}-dist.patch @@ -151,7 +150,11 @@ --bindir=%{_sbindir} \ --libexecdir=%{_libdir}/%{name} \ --sysconfdir=%{_sysconfdir}/%{name} \ +%if 0%{?has_systemd} + --localstatedir=/run/%{name} \ +%else --localstatedir=%{_localstatedir}/run/%{name} \ +%endif --enable-sendfile \ --enable-ctrls \ --enable-dso \ @@ -189,7 +192,7 @@ %if 0%{?has_systemd} %{__install} -D -m 0644 %{S:13} %{buildroot}%{_unitdir}/%{name}.service # systemd need to create a tmp dir: /var/run/proftpd -%{__install} -D -m 0644 %{S:14} %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf +install -D -m 0644 contrib/dist/rpm/proftpd-tmpfs.conf %{buildroot}%{_prefix}/lib/tmpfiles.d/proftpd.conf %endif %find_lang %{name} @@ -271,7 +274,9 @@ %config(noreplace) %{_sysconfdir}/%{name}/dhparams.pem %{_sysconfdir}/init.d/%{name} %dir %attr(0750,ftp,ftp) %{_localstatedir}/log/%{name} +%if ! 0%{?has_systemd} %ghost %{_localstatedir}/run/%{name} +%endif %{_sbindir}/* %{_mandir}/man?/* %dir %attr(0755,root,root) %{_libdir}/%{name}/ @@ -283,7 +288,7 @@ %exclude %{_libdir}/%{name}/mod_sql_sqlite.so %if 0%{?has_systemd} %{_unitdir}/%{name}.service -%config %{_sysconfdir}/tmpfiles.d/%{name}.conf +%{_prefix}/lib/tmpfiles.d/proftpd.conf %endif %files devel ++++++ proftpd.service ++++++ --- /var/tmp/diff_new_pack.DOj92o/_old 2013-08-05 20:50:58.000000000 +0200 +++ /var/tmp/diff_new_pack.DOj92o/_new 2013-08-05 20:50:58.000000000 +0200 @@ -1,6 +1,6 @@ [Unit] Description=ProFTPd FTP server -After=network.target remote-fs.target +After=systemd-user-sessions.service network.target nss-lookup.target local-fs.target remote-fs.target [Service] ExecStart=/usr/sbin/proftpd --nodaemon -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
