Hello community, here is the log from the commit of package pure-ftpd for openSUSE:Factory checked in at 2014-04-13 13:16:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pure-ftpd (Old) and /work/SRC/openSUSE:Factory/.pure-ftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pure-ftpd" Changes: -------- --- /work/SRC/openSUSE:Factory/pure-ftpd/pure-ftpd.changes 2013-01-24 10:32:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.pure-ftpd.new/pure-ftpd.changes 2014-04-13 13:16:34.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Apr 9 17:04:26 UTC 2014 - [email protected] + +- Remove all init scripts but keep the rc link working. + +------------------------------------------------------------------- Old: ---- pure-ftpd.init ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pure-ftpd.spec ++++++ --- /var/tmp/diff_new_pack.qzyE87/_old 2014-04-13 13:16:35.000000000 +0200 +++ /var/tmp/diff_new_pack.qzyE87/_new 2014-04-13 13:16:35.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package pure-ftpd # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -24,7 +24,6 @@ Group: Productivity/Networking/Ftp/Servers Url: http://www.pureftpd.org Source: ftp://ftp.pureftpd.org/pub/%{name}/releases/%{name}-%version.tar.bz2 -Source1: %{name}.init Source2: %{name}.pamd Source3: %{name}.xinetd Source4: %{name}.xml @@ -54,17 +53,11 @@ BuildRequires: openldap2-devel BuildRequires: pam-devel BuildRequires: postgresql-devel -Requires(pre): %insserv_prereq Requires(pre): coreutils Provides: ftp-server Provides: pureftpd = %{version}-%{release} - -%{!?_initddir: %global _initddir /etc/init.d} -%if 0%{?suse_version} > 1140 -BuildRequires: systemd +BuildRequires: pkgconfig(systemd) %{?systemd_requires} -%define have_systemd 1 -%endif %description Pure-FTPd is a fast, production-quality, and standard-conforming FTP @@ -122,7 +115,7 @@ %makeinstall %{__install} -dD -m 0755 \ - %{buildroot}%{_sysconfdir}/{init.d,%{name},%{name}/vhosts,pam.d,xinetd.d,openldap/schema} + %{buildroot}%{_sysconfdir}/{%{name},%{name}/vhosts,pam.d,xinetd.d,openldap/schema} %{__install} -m 0755 \ configuration-file/pure-config.pl \ configuration-file/pure-config-args \ @@ -130,8 +123,7 @@ %{__install} -m 0644 configuration-file/pure-ftpd.conf \ %{buildroot}%{_sysconfdir}/%{name} -%{__install} -m 0755 %{S:1} %{buildroot}%{_sysconfdir}/init.d/%{name} -ln -sf /etc/init.d/%{name} %{buildroot}%{_sbindir}/rc%{name} +ln -sf /usr/sbin/service %{buildroot}%{_sbindir}/rc%{name} %{__install} -m 0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/pure-ftpd %{__install} -m 0644 %{S:3} %{buildroot}%{_sysconfdir}/xinetd.d/pure-ftpd @@ -142,38 +134,25 @@ %{__install} -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ %{__install} -m 644 %{S:5} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name -%if 0%{?have_systemd} %{__install} -D -m0644 %{S:6} %{buildroot}%{_unitdir}/%{name}.service -%endif %clean %{__rm} -rf %{buildroot} %pre -%if 0%{?have_systemd} %service_add_pre %{name}.service -%endif %preun -%stop_on_removal %{name} -%if 0%{?have_systemd} %service_del_preun %{name}.service -%endif %post if [ -f etc/pure-ftpd.conf ]; then mv etc/pure-ftpd.conf etc/pure-ftpd/pure-ftpd.conf fi -%if 0%{?have_systemd} %service_add_post %{name}.service -%endif %postun -%insserv_cleanup -%restart_on_update %{name} -%if 0%{?have_systemd} %service_del_postun %{name}.service -%endif %files %defattr(-, root, root) @@ -189,13 +168,10 @@ %dir %{_sysconfdir}/%{name} %dir %{_sysconfdir}/%{name}/vhosts %config %{_sysconfdir}/openldap/schema/pureftpd.schema -%config %{_sysconfdir}/init.d/pure-ftpd %config %{_sysconfdir}/pam.d/pure-ftpd %config(noreplace) %{_sysconfdir}/%{name}/pure-ftpd.conf %config(noreplace) %{_sysconfdir}/xinetd.d/pure-ftpd %config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%name -%if 0%{?have_systemd} %{_unitdir}/%{name}.service -%endif %changelog -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
