- better trigger

Changed files:
    proftpd.spec -> 1.189

diff --git a/proftpd.spec b/proftpd.spec
index 71998904a1ab6b20529426345949e8f93b4c4e21..72a378d676dfb9e95d136248e324b5b074a6025c 100644 (file)
--- a/proftpd.spec
+++ b/proftpd.spec
@@ -16,7 +16,7 @@ Summary(pt_BR):       Servidor FTP profissional, com sintaxe de configura
 Summary(zh_CN):        Ò×ÓÚ¹ÜÀíµÄ,°²È«µÄ FTP ·þÎñÆ÷
 Name:          proftpd
 Version:       1.2.10
-Release:       1.2
+Release:       1.3
 Epoch:         1
 License:       GPL v2+
 Group:         Daemons
@@ -198,11 +198,11 @@ CPPFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 install -d $RPM_BUILD_ROOT/etc/{logrotate.d,pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
        $RPM_BUILD_ROOT/var/{lib/ftp/pub/Incoming,log}
 
-%{__make} install DESTDIR=$RPM_BUILD_ROOT \
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
        INSTALL_USER=`id -u` \
        INSTALL_GROUP=`id -g`
 
@@ -282,11 +282,19 @@ fi
 echo "Changing deprecated config uptions"
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
+grep -v UseTCPD /etc/ftpd/proftpd.conf > /etc/ftpd/proftpd.conf.tmp
+mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
+chmod 640 /etc/ftpd/proftpd.conf
 
 %triggerpostun -- %{name}-standalone <= 1.2.10-1
-echo "Changing deprecated config uption"
+echo "Changing deprecated config uptions"
 cp /etc/ftpd/proftpd.conf /etc/ftpd/proftpd.conf.backup
 sed -i -e 's/AuthPAMAuthoritative\b/AuthPAM/' /etc/ftpd/proftpd.conf
+sed -i -e 's/TCPDServiceName/TCPServiceName/' /etc/ftpd/proftpd.conf
+grep -v UseTCPD /etc/ftpd/proftpd.conf > /etc/ftpd/proftpd.conf.tmp
+mv -f /etc/ftpd/proftpd.conf.tmp /etc/ftpd/proftpd.conf
+chmod 640 /etc/ftpd/proftpd.conf
 
 %files common
 %defattr(644,root,root,755)