rpm/proftpd
SHA256
1
0
Fork 0
forked from pool/proftpd
Code Pull Requests Activity

Accepting request 687031 from home:jengelh:sct

Browse Source 
- 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.

OBS-URL: https://build.opensuse.org/request/show/687031
OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=59
This commit is contained in:
Tomáš Chvátal 2019-03-25 08:45:50 +00:00 committed by Git OBS Bridge
parent 2ec65a0682
commit 9f4f26f752
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
proftpd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Mar 20 18:46:47 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- 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 Wed Jul 11 08:05:29 UTC 2018 - chris@computersalat.de

19
proftpd.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package proftpd # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 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. # Please save your time and do not update to "rc" versions.
# We only accept updates for "STABLE" Versions # We only accept updates for "STABLE" Versions
License: GPL-2.0-or-later License: GPL-2.0-or-later
@ -69,17 +69,16 @@ Recommends: %{name}-lang
%endif %endif
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
BuildRequires: systemd BuildRequires: systemd-rpm-macros
%{?systemd_requires} %{?systemd_ordering}
%define has_systemd 1 %define has_systemd 1
%else %else
Requires(pre): %insserv_prereq Requires(pre): %insserv_prereq
%endif %endif
%description %description
ProFTPD is a highly configurable FTP daemon for Unix and Unix-like ProFTPD is a configurable FTP daemon for Unix and Unix-like
operating systems. See the README.ports file for more details about operating systems.
the platforms on which ProFTPD in known or thought to build and run.
%{?lang_package} %{?lang_package}
@ -181,7 +180,7 @@ export CXXFLAGS="$CFLAGS"
make %{?_smp_mflags} make %{?_smp_mflags}
%install %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/ftp.pamd %{buildroot}/%{_sysconfdir}/pam.d/%{name}
install -D -m 0644 contrib/dist/rpm/%{name}.logrotate %{buildroot}/%{_sysconfdir}/logrotate.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 %post
%if 0%{?has_systemd} %if 0%{?has_systemd}
%service_add_post %{name}.service %service_add_post %{name}.service
%tmpfiles_create %{_tmpfilesdir}/%{name}.conf || : %tmpfiles_create %{_tmpfilesdir}/%{name}.conf
%else %else
%{fillup_and_insserv -f proftpd} %{fillup_and_insserv -f proftpd}
install -d %{_localstatedir}/run/%{name} install -d %{_localstatedir}/run/%{name}