diff --git a/proftpd.changes b/proftpd.changes index 48297b8..ee91853 100644 --- a/proftpd.changes +++ b/proftpd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Mar 20 18:46:47 UTC 2019 - Jan Engelhardt + +- Reduce hard dependency on systemd to only that which is + necessary for building and installation. +- Modernize RPM macro use (%make_install, %tmpfiles_create). +- Strip emphasis from description and trim other platform mentions. + ------------------------------------------------------------------- Wed Jul 11 08:05:29 UTC 2018 - chris@computersalat.de diff --git a/proftpd.spec b/proftpd.spec index eafafe2..edb4b67 100644 --- a/proftpd.spec +++ b/proftpd.spec @@ -1,7 +1,7 @@ # # spec file for package proftpd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,12 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: proftpd -Summary: Highly configurable GPL-licensed FTP server software +Summary: Configurable GPL-licensed FTP server software # Please save your time and do not update to "rc" versions. # We only accept updates for "STABLE" Versions License: GPL-2.0-or-later @@ -69,17 +69,16 @@ Recommends: %{name}-lang %endif %if 0%{?suse_version} >= 1210 -BuildRequires: systemd -%{?systemd_requires} +BuildRequires: systemd-rpm-macros +%{?systemd_ordering} %define has_systemd 1 %else Requires(pre): %insserv_prereq %endif %description -ProFTPD is a highly configurable FTP daemon for Unix and Unix-like -operating systems. See the README.ports file for more details about -the platforms on which ProFTPD in known or thought to build and run. +ProFTPD is a configurable FTP daemon for Unix and Unix-like +operating systems. %{?lang_package} @@ -181,7 +180,7 @@ export CXXFLAGS="$CFLAGS" make %{?_smp_mflags} %install -%makeinstall INSTALL_USER=`id -un` INSTALL_GROUP=`id -gn` +%make_install INSTALL_USER=`id -un` INSTALL_GROUP=`id -gn` install -D -m 0644 contrib/dist/rpm/ftp.pamd %{buildroot}/%{_sysconfdir}/pam.d/%{name} install -D -m 0644 contrib/dist/rpm/%{name}.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # @@ -228,7 +227,7 @@ ln -sf %{_sysconfdir}/init.d/%{name} %{buildroot}/%{_sbindir}/rc%{name} %post %if 0%{?has_systemd} %service_add_post %{name}.service -%tmpfiles_create %{_tmpfilesdir}/%{name}.conf || : +%tmpfiles_create %{_tmpfilesdir}/%{name}.conf %else %{fillup_and_insserv -f proftpd} install -d %{_localstatedir}/run/%{name}