- up to 2.0.3

[packages/vsftpd.git] / vsftpd.spec

diff --git a/vsftpd.spec b/vsftpd.spec
index 3d18051f6313d53d22bc78951edb2947157ce703..4c5402c24d10856b5762dca432da0722abe5024b 100644 (file)
--- a/vsftpd.spec
+++ b/vsftpd.spec
@@ -1,21 +1,28 @@
+#
+%define                _ftpdir /home/services/ftp
+#
 Summary:       vsftpd - Very Secure FTP Daemon
 Summary(pl):   Bardzo Bezpieczny Demon FTP
-Summary(pt_BR):        vsftpd - Daemon Ftp Muito Seguro
+Summary(pt_BR):        vsftpd - Daemon FTP Muito Seguro
 Name:          vsftpd
-Version:       1.2.1
-Release:       2
+Version:       2.0.3
+Release:       1
 License:       GPL v2
 Group:         Daemons
 Source0:       ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
-# Source0-md5: 3dd254f9c9c1aea370b2f1ff6212af6e
+# Source0-md5: 74936cbd8e8251deb1cd99c5fb18b6f8
 Source1:       %{name}.inetd
 Source2:       %{name}.pamd
 Source3:       %{name}-ftpusers
 Source4:       ftpusers.tar.bz2
 # Source4-md5: 76c80b6ec9f4d079a1e27316edddbe16
+Patch0:                %{name}-builddefs.patch
+Patch1:                %{name}-amd64-findlibs.patch
 URL:           http://vsftpd.beasts.org/
 PreReq:                rc-inetd
 BuildRequires: libcap-devel
+BuildRequires: libwrap-devel
+BuildRequires: openssl-devel >= 0.9.7d
 Requires:      FHS >= 2.3
 Requires:      pam >= 0.77.3
 Provides:      ftpserver
@@ -23,6 +30,7 @@ Obsoletes:    ftpserver
 Obsoletes:     anonftp
 Obsoletes:     bftpd
 Obsoletes:     ftpd-BSD
+Obsoletes:     glftpd
 Obsoletes:     heimdal-ftpd
 Obsoletes:     linux-ftpd
 Obsoletes:     muddleftpd
@@ -50,6 +58,8 @@ Man Security Audit Team" Evans.
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
@@ -61,7 +71,7 @@ Man Security Audit Team" Evans.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_datadir}/empty,%{_mandir}/man{5,8}} \
        $RPM_BUILD_ROOT/etc/{pam.d,sysconfig/rc-inetd,logrotate.d,ftpd} \
-       $RPM_BUILD_ROOT{/srv/ftp/pub/incoming,/var/log}
+       $RPM_BUILD_ROOT{%{_ftpdir}/pub/incoming,/var/log}
 
 install vsftpd $RPM_BUILD_ROOT%{_sbindir}/vsftpd
 install vsftpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/vsftpd.conf
@@ -111,7 +121,7 @@ fi
 %lang(pl) %{_mandir}/pl/man5/ftpusers*
 %lang(pt_BR) %{_mandir}/pt_BR/man5/ftpusers*
 %lang(ru) %{_mandir}/ru/man5/ftpusers*
-%dir /srv/ftp
-%dir /srv/ftp/pub
+%dir %{_ftpdir}
+%dir %{_ftpdir}/pub
 # it's safe - by default anon_upload_enable=NO, anon_world_readable_only=YES
-%attr(775,root,ftp) %dir /srv/ftp/pub/incoming
+%attr(775,root,ftp) %dir %{_ftpdir}/pub/incoming