SHA256
1
0
forked from pool/proftpd

Accepting request 140003 from home:computersalat:devel:network

fix for bnc#787884

OBS-URL: https://build.opensuse.org/request/show/140003
OBS-URL: https://build.opensuse.org/package/show/network/proftpd?expand=0&rev=17
This commit is contained in:
Christian Wittmer 2012-11-02 16:30:44 +00:00 committed by Git OBS Bridge
parent b2f04f6a58
commit 452005ffa7
3 changed files with 12 additions and 0 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 2 15:15:25 UTC 2012 - chris@computersalat.de
- fix for bnc#787884
(https://bugzilla.novell.com/show_bug.cgi?id=787884)
* added extra Source proftpd.conf.tmpfile
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Aug 30 17:33:30 UTC 2012 - crrodriguez@opensuse.org Thu Aug 30 17:33:30 UTC 2012 - crrodriguez@opensuse.org

1
proftpd.conf.tmpfile Normal file
View File

@ -0,0 +1 @@
d /var/run/proftpd 0755 root root ~ -

View File

@ -30,6 +30,7 @@ Source1: ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.gz.a
Source11: %{name}.init Source11: %{name}.init
Source12: %{name}.passwd Source12: %{name}.passwd
Source13: %{name}.service Source13: %{name}.service
Source14: %{name}.conf.tmpfile
#PATCH-FIX-openSUSE: pam, logrotate, xinet #PATCH-FIX-openSUSE: pam, logrotate, xinet
Patch100: %{name}-1.3.4a-dist.patch Patch100: %{name}-1.3.4a-dist.patch
#PATCH-FIX-openSUSE: provide a useful default config #PATCH-FIX-openSUSE: provide a useful default config
@ -184,6 +185,8 @@ export CXXFLAGS="$CFLAGS"
%if 0%{?has_systemd} %if 0%{?has_systemd}
%{__install} -D -m 0644 %{S:13} %{buildroot}%{_unitdir}/%{name}.service %{__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
%endif %endif
%find_lang %{name} %find_lang %{name}
@ -277,6 +280,7 @@ fi
%exclude %{_libdir}/%{name}/mod_sql_sqlite.so %exclude %{_libdir}/%{name}/mod_sql_sqlite.so
%if 0%{?has_systemd} %if 0%{?has_systemd}
%{_unitdir}/%{name}.service %{_unitdir}/%{name}.service
%config %{_sysconfdir}/tmpfiles.d/%{name}.conf
%endif %endif
%files devel %files devel