X-Git-Url: http://git.pld-linux.org/?p=packages%2Fftpd-BSD.git;a=blobdiff_plain;f=ftpd-BSD.spec;h=20b587548550bb5846abab0083673d1ac760f4c5;hp=72045e41c90224174c31f8d7c85e7949c8247e92;hb=536d4eab2b6ac2f5d18e8c8fd67217a54a7bac19;hpb=d06946ac4ef28c0f0336166161eb56ee174c1523

diff --git a/ftpd-BSD.spec b/ftpd-BSD.spec
index 72045e4..20b5875 100644
--- a/ftpd-BSD.spec
+++ b/ftpd-BSD.spec
@@ -1,14 +1,17 @@
 Summary:	OpenBSD's ftpd ported to Linux (with IPv6 support)
-Summary(pl):	Port ftpd z OpenBSD dla Linuxa (z wsparciem do IPv6)
+Summary(pl):	Port ftpd z OpenBSD dla Linuksa (z obs³ug± IPv6)
 Name:		ftpd-BSD
 Version:	0.3.3
-Release:	4
+Release:	8
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	ftp://quatramaran.ens.fr/pub/madore/ftpd-BSD/contrib/%{name}-%{version}.tar.gz
+# Source0-md5:	db925235417c8699bb1eb8ca77811fc5
 Source1:	%{name}.inetd
 Source2:	%{name}.pamd
 Source3:	%{name}-ftpusers
+Source4:	ftpusers.tar.bz2
+# Source4-md5: 76c80b6ec9f4d079a1e27316edddbe16
 Patch0:		%{name}-anonuser.patch
 Patch1:		%{name}-paths.patch
 Patch2:		%{name}-username.patch
@@ -19,15 +22,24 @@ Buildrequires:	libwrap-devel
 Buildrequires:	pam-devel
 Requires:	rc-inetd
 Requires:	inetdaemon
-Provides:	ftpserver
+Requires:	pam >= 0.77.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides:	ftpserver
+Obsoletes:	ftpserver
+Obsoletes:	anonftp
 Obsoletes:	bftpd
 Obsoletes:	heimdal-ftpd
 Obsoletes:	linux-ftpd
+Obsoletes:	muddleftpd
 Obsoletes:	proftpd
+Obsoletes:	proftpd-common
+Obsoletes:	proftpd-inetd
+Obsoletes:	proftpd-standalone
 Obsoletes:	pure-ftpd
+Obsoletes:	troll-ftpd
+Obsoletes:	vsftpd
 Obsoletes:	wu-ftpd
-Obsoletes:	muddleftpd
+Conflicts:	man-pages < 1.51
 
 %description
 This is a Linux port of the BSD ftp server (ftpd). It doesn't have all
@@ -40,7 +52,7 @@ is after release 2.7). The ftpd version number is 6.5 and this port's
 version number is 0.3.2.
 
 Package comes with anonymous upload disabled. If you really want to
-enable it - chmod /home/ftp/upload to 0730.
+enable it - chmod /home/services/ftp/upload to 0730.
 
 %description -l pl
 Pakiet ten zawiera linuksowy port serwera ftp BSD (ftpd). Nie zawiera
@@ -52,7 +64,8 @@ CVS OpenBSD z dnia 2000/07/07 (tj. po wersji 2.7). Numer wersji ftpd
 to 6.5, za¶ numer wersji tego portu to 0.3.2.
 
 Pakiet przychodzi z wy³±czonym anonimowym uploadem. Je¶li naprawdê
-chcesz go w³±czyæ - zmieñ uprawnienia do /home/ftp/upload na 0730.
+chcesz go w³±czyæ - zmieñ uprawnienia do /home/services/ftp/upload
+na 0730.
 
 %prep
 %setup -q -n ftpd-bsd-%{version}
@@ -69,7 +82,7 @@ chcesz go w
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man8} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{ftpd,pam.d,sysconfig/rc-inetd} \
-	$RPM_BUILD_ROOT/home/ftp/{upload,pub}
+	$RPM_BUILD_ROOT/home/services/ftp/{upload,pub}
 
 install ftpd $RPM_BUILD_ROOT%{_sbindir}/ftpd-BSD
 install ftpd.8 $RPM_BUILD_ROOT%{_mandir}/man8/
@@ -77,7 +90,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/ftp
 install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ftpd/ftpusers
 
-gzip -9nf README*
+bzip2 -dc %{SOURCE4} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -96,13 +109,17 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc README*.gz
+%doc README*
 %attr(755,root,root) %{_sbindir}/ftpd-BSD
 %dir %{_sysconfdir}/ftpd
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/pam.d/ftp
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/ftp
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ftpd/ftpusers
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/sysconfig/rc-inetd/ftpd
-%dir /home/ftp
-%dir /home/ftp/pub
-%attr(700,root,ftp) %verify(not mode) %dir /home/ftp/upload
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/ftpd
+%dir /home/services/ftp
+%dir /home/services/ftp/pub
+%attr(700,root,ftp) %verify(not mode) %dir /home/services/ftp/upload
 %{_mandir}/man8/*
+%lang(ja) %{_mandir}/ja/man5/ftpusers*
+%lang(pl) %{_mandir}/pl/man5/ftpusers*
+%lang(pt_BR) %{_mandir}/pt_BR/man5/ftpusers*
+%lang(ru) %{_mandir}/ru/man5/ftpusers*