- up to 2.3

[packages/bftpd.git] / bftpd.spec

diff --git a/bftpd.spec b/bftpd.spec
index 64564197fd9bf1035aa05ed7faa3223ad0d9ae83..24dd8e5c21427629a238fc03902c564d152451cb 100644 (file)
--- a/bftpd.spec
+++ b/bftpd.spec
@@ -1,39 +1,25 @@
 Summary:       Small FTP server
-Summary(pl):   Ma³y serwer FTP
+Summary(pl.UTF-8):     Mały serwer FTP
 Name:          bftpd
-Version:       1.0.24
-Release:       2
+Version:       2.3
+Release:       1
 License:       GPL
 Group:         Daemons
-Source0:       http://bftpd.sourceforge.net/downloads/src/%{name}-%{version}.tar.gz
-# Source0-md5: 74b1c2bad8fe85d78c8fa67cbf135bed
+Source0:       http://dl.sourceforge.net/bftpd/%{name}-%{version}.tar.gz
+# Source0-md5: 4ab1eb33135fa5eaaf050e6d3dd0b319
 Source1:       %{name}.inetd
 Source2:       %{name}.conf
 Source3:       ftpusers.tar.bz2
 # Source3-md5: 76c80b6ec9f4d079a1e27316edddbe16
-URL:           http://www.bftpd.org/
+URL:           http://bftpd.sourceforge.net/
 Patch0:                %{name}-NOROOT.patch
 BuildRequires: autoconf
-Prereq:                rc-inetd
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires:      inetdaemon
+Requires:      rc-inetd
 Provides:      ftpserver
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes:     ftpserver
-Obsoletes:     anonftp
-Obsoletes:     ftpd-BSD
-Obsoletes:     glftpd
-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
 Conflicts:     man-pages < 1.51
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 bftpd is a Linux FTP server with chroot and setreuid. Not all FTP
@@ -41,14 +27,14 @@ commands are included. It doesn't need special home directory
 preparation and accesses either the user's home directory or its .ftp
 subdirectory, and user authentication is via passwd/shadow or PAM.
 
-%description -l pl
+%description -l pl.UTF-8
 bftpd jest linuksowym serwerem FTP z chroot i setreuid. Nie wszystkie
-komendy FTP s± dostêpne. Nie wymaga specjalnego katalogu domowego i
-dostêpu poza katalogiem domowym u¿ytkownika i podkatalogiem .ftp.
-Autoryzacja u¿ytkowników poprzez passwd/shadow lub PAM.
+komendy FTP są dostępne. Nie wymaga specjalnego katalogu domowego i
+dostępu poza katalogiem domowym użytkownika i podkatalogiem .ftp.
+Autoryzacja użytkowników poprzez passwd/shadow lub PAM.
 
 %prep
-%setup -q
+%setup -q -n %{name}
 %patch0 -p1
 
 %build
@@ -63,7 +49,6 @@ install -d $RPM_BUILD_ROOT{%{_prefix}{/sbin,/share/man/man8},/etc/sysconfig/rc-i
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-#install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/ftp
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
 install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}
 
@@ -73,15 +58,11 @@ bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart 1>&2
-else
-       echo "Type \"/etc/rc.d/init.d/rc-inetd start\" to start inet server" 1>&2
-fi
+%service -q rc-inetd reload
 
 %postun
-if [ "$1" = "0" -a -f /var/lock/subsys/rc-inetd ]; then
-       /etc/rc.d/init.d/rc-inetd restart
+if [ "$1" = "0" ]; then
+       %service -q rc-inetd reload
 fi
 
 %files
@@ -90,9 +71,9 @@ fi
 %doc %lang(en) doc/en/*.{html,txt}
 %doc %lang(pl) doc/pl/*.{html,txt}
 %attr(755,root,root) %{_sbindir}/*
-#%attr(640,root,root) /etc/pam.d/ftp
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/%{name}.conf
-%attr(640,root,root) %config /etc/sysconfig/rc-inetd/ftpd
+#%%attr(640,root,root) /etc/pam.d/ftp
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/rc-inetd/ftpd
 %dir %attr(555,ftp,ftp) /home/services/ftp
 
 %{_mandir}/man5/ftpusers.5*