Accepting request 485216 from network
1 OBS-URL: https://build.opensuse.org/request/show/485216 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/proftpd?expand=0&rev=27
This commit is contained in:
commit
eef92c21ee
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 23 15:05:22 UTC 2017 - jengelh@inai.de
|
||||
|
||||
- Remove --with-pic, there are no static libs.
|
||||
- Replace %__-type macro indirections.
|
||||
- Replace old $RPM shell vars by macros.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 6 22:32:07 UTC 2017 - chris@computersalat.de
|
||||
|
||||
|
46
proftpd.spec
46
proftpd.spec
@ -18,10 +18,10 @@
|
||||
|
||||
Name: proftpd
|
||||
Summary: Highly configurable GPL-licensed FTP server software
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Networking/Ftp/Servers
|
||||
# Please save your time and do not update to "rc" versions.
|
||||
# We only accept updates for "STABLE" Versions
|
||||
License: GPL-2.0+
|
||||
Group: Productivity/Networking/Ftp/Servers
|
||||
Version: 1.3.5d
|
||||
Release: 0
|
||||
Url: http://www.proftpd.org/
|
||||
@ -143,7 +143,7 @@ Here are Documentation for ProFTPD
|
||||
%prep
|
||||
#gpg_verify %{S:1}
|
||||
%setup -q
|
||||
%{__rm} README.AIX
|
||||
rm README.AIX
|
||||
%patch100
|
||||
%patch101
|
||||
%patch102
|
||||
@ -154,9 +154,9 @@ Here are Documentation for ProFTPD
|
||||
%build
|
||||
rm contrib/mod_wrap.c
|
||||
PROFTPD_SHARED_MODS="$(for spec_mod in $(find contrib -name mod_\*.c); do echo "$(basename ${spec_mod%%.c})"; done | tr '\n' ':' | sed -e 's|:$||')"
|
||||
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -DLDAP_DEPRECATED"
|
||||
export CFLAGS="%{optflags} -D_GNU_SOURCE -DLDAP_DEPRECATED"
|
||||
export CXXFLAGS="$CFLAGS"
|
||||
%configure --disable-static --with-pic \
|
||||
%configure --disable-static \
|
||||
--bindir=%{_sbindir} \
|
||||
--libexecdir=%{_libdir}/%{name} \
|
||||
--sysconfdir=%{_sysconfdir}/%{name} \
|
||||
@ -179,36 +179,36 @@ export CXXFLAGS="$CFLAGS"
|
||||
--disable-strip
|
||||
|
||||
# --enable-memcache \
|
||||
%{__make} %{?_smp_mflags}
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
%makeinstall INSTALL_USER=`id -un` INSTALL_GROUP=`id -gn`
|
||||
%{__install} -D -m 0644 contrib/dist/rpm/ftp.pamd $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/%{name}
|
||||
%{__install} -D -m 0644 contrib/dist/rpm/xinetd $RPM_BUILD_ROOT%{_sysconfdir}/xinetd.d/%{name}
|
||||
%{__install} -D -m 0644 contrib/dist/rpm/%{name}.logrotate $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
|
||||
install -D -m 0644 contrib/dist/rpm/ftp.pamd %{buildroot}/%{_sysconfdir}/pam.d/%{name}
|
||||
install -D -m 0644 contrib/dist/rpm/xinetd %{buildroot}/%{_sysconfdir}/xinetd.d/%{name}
|
||||
install -D -m 0644 contrib/dist/rpm/%{name}.logrotate %{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
|
||||
#
|
||||
%{__rm} -fv $RPM_BUILD_ROOT%{_libdir}/%{name}/*.{a,la}
|
||||
rm -fv %{buildroot}/%{_libdir}/%{name}/*.{a,la}
|
||||
|
||||
# install ftpasswd
|
||||
%{__install} -D -m 0755 contrib/ftpasswd $RPM_BUILD_ROOT%{_sbindir}/
|
||||
install -D -m 0755 contrib/ftpasswd %{buildroot}/%{_sbindir}/
|
||||
|
||||
# some needed dirs
|
||||
%{__install} -D -m 0440 %{S:12} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/auth/passwd
|
||||
%{__install} -D -m 0644 %{S:16} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d/tls.template
|
||||
%{__install} -D -m 0644 %{S:18} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d/README
|
||||
%{__install} -D -m 0644 %{S:17} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/includes/limit.template
|
||||
%{__install} -D -m 0644 %{S:18} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/ssl/README
|
||||
%{__install} -d -m 0750 $RPM_BUILD_ROOT/var/log/%{name}
|
||||
install -D -m 0440 %{S:12} %{buildroot}/%{_sysconfdir}/%{name}/auth/passwd
|
||||
install -D -m 0644 %{S:16} %{buildroot}/%{_sysconfdir}/%{name}/conf.d/tls.template
|
||||
install -D -m 0644 %{S:18} %{buildroot}/%{_sysconfdir}/%{name}/conf.d/README
|
||||
install -D -m 0644 %{S:17} %{buildroot}/%{_sysconfdir}/%{name}/includes/limit.template
|
||||
install -D -m 0644 %{S:18} %{buildroot}/%{_sysconfdir}/%{name}/ssl/README
|
||||
install -d -m 0750 %{buildroot}/var/log/%{name}
|
||||
|
||||
# systemd vs SysVinit
|
||||
%if 0%{?has_systemd}
|
||||
%{__install} -D -m 0644 %{S:13} %{buildroot}%{_unitdir}/%{name}.service
|
||||
%{__ln_s} -f %{_sbindir}/service $RPM_BUILD_ROOT%{_sbindir}/rc%{name}
|
||||
install -D -m 0644 %{S:13} %{buildroot}%{_unitdir}/%{name}.service
|
||||
ln -sf %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
|
||||
# systemd need to create a tmp dir: /run/proftpd
|
||||
%{__install} -D -m 0644 %{S:14} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
|
||||
install -D -m 0644 %{S:14} %{buildroot}%{_prefix}/lib/tmpfiles.d/%{name}.conf
|
||||
%else #SysVinit
|
||||
%{__install} -D -m 0755 %{S:11} $RPM_BUILD_ROOT%{_sysconfdir}/init.d/%{name}
|
||||
%{__ln_s} -f %{_sysconfdir}/init.d/%{name} $RPM_BUILD_ROOT%{_sbindir}/rc%{name}
|
||||
install -D -m 0755 %{S:11} %{buildroot}/%{_sysconfdir}/init.d/%{name}
|
||||
ln -sf %{_sysconfdir}/init.d/%{name} %{buildroot}/%{_sbindir}/rc%{name}
|
||||
%endif
|
||||
|
||||
%find_lang %{name}
|
||||
@ -231,7 +231,7 @@ export CXXFLAGS="$CFLAGS"
|
||||
/usr/bin/systemd-tmpfiles --create %{name}.conf || :
|
||||
%else
|
||||
%{fillup_and_insserv -f proftpd}
|
||||
%{__install} -d %{_localstatedir}/run/%{name}
|
||||
install -d %{_localstatedir}/run/%{name}
|
||||
%endif
|
||||
|
||||
%postun
|
||||
|
Loading…
x
Reference in New Issue
Block a user