SPECS: proftpd.spec - adapterized

[glen]

Author: glen                         Date: Wed Aug 10 09:31:52 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- adapterized

---- Files affected:
SPECS:
   proftpd.spec (1.208 -> 1.209) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.208 SPECS/proftpd.spec:1.209
--- SPECS/proftpd.spec:1.208	Mon Aug  8 16:30:57 2005
+++ SPECS/proftpd.spec	Wed Aug 10 11:31:46 2005
@@ -36,7 +36,7 @@
 Source6:	%{name}.init
 Source7:	ftpusers.tar.bz2
 # Source7-md5:	76c80b6ec9f4d079a1e27316edddbe16
-Source8:	http://www.castaglia.org/proftpd/modules/proftpd-mod-shaper-0.5.5.tar.gz
+Source8:	http://www.castaglia.org/proftpd/modules/%{name}-mod-shaper-0.5.5.tar.gz
 # Source8-md5:	ca3d63ffbc6ad5b6a9063f79b36d1b55
 Patch0:		%{name}-umode_t.patch
 Patch1:		%{name}-glibc.patch
@@ -60,7 +60,7 @@
 %{?with_quotapgsql:BuildRequires:	postgresql-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/ftpd
+%define		_sysconfdir		/etc/ftpd
 %define		_localstatedir	/var/run
 
 %description
@@ -207,8 +207,8 @@
 cp -f /usr/share/automake/config.sub .
 %{__autoconf}
 RUN_DIR=%{_localstatedir} ; export RUN_DIR
-CFLAGS="%{rpmcflags} -I/usr/include/ncurses %{?with_mysql:-I/usr/include/mysql}"
-CPPFLAGS="%{rpmcflags} -I/usr/include/ncurses %{?with_mysql:-I/usr/include/mysql}"
+CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses %{?with_mysql:-I%{_includedir}/mysql}"
+CPPFLAGS="%{rpmcflags} -I%{_includedir}/ncurses %{?with_mysql:-I%{_includedir}/mysql}"
 
 MODULES="
 mod_ratio
@@ -269,6 +269,8 @@
 
 :> $RPM_BUILD_ROOT/etc/security/blacklist.ftp
 
+rm -f %{_mandir}/ftpusers-path.diff*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -318,7 +320,7 @@
 
 %triggerpostun inetd -- %{name}-inetd <= 1.2.10-1
 echo "Changing deprecated config options"
-cp -f /etc/ftpd/proftpd.conf{,.rpmorig}
+cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
 sed -i -e '
 	s/AuthPAMAuthoritative\b/AuthPAM/
 	s/TCPDServiceName/TCPServiceName/
@@ -331,11 +333,11 @@
 	s/TlsCipherList/TLSCipherSuite/
 	s/TlsCertsOk/TLSVerifyClient/
 	/UseTCPD/d
-' /etc/ftpd/proftpd.conf
+' %{_sysconfdir}/proftpd.conf
 
 %triggerpostun standalone -- %{name}-standalone <= 1.2.10-1
 echo "Changing deprecated config options"
-cp -f /etc/ftpd/proftpd.conf{,.rpmorig}
+cp -f %{_sysconfdir}/proftpd.conf{,.rpmorig}
 sed -i -e '
 	s/AuthPAMAuthoritative\b/AuthPAM/
 	s/TCPDServiceName/TCPServiceName/
@@ -348,7 +350,7 @@
 	s/TlsCipherList/TLSCipherSuite/
 	s/TlsCertsOk/TLSVerifyClient/
 	/UseTCPD/d
-' /etc/ftpd/proftpd.conf
+' %{_sysconfdir}/proftpd.conf
 
 %files common
 %defattr(644,root,root,755)
@@ -361,7 +363,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %ghost %{_sysconfdir}/ftpusers
 %attr(640,root,root) %{_sysconfdir}/ftpusers.default
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/logrotate.d/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/logrotate.d/*
 %attr(640,root,root) %ghost /var/log/*
 %{?with_pam:%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*}
 
@@ -387,7 +389,7 @@
 
 %files standalone
 %defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/sysconfig/proftpd
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/proftpd
 %attr(754,root,root) /etc/rc.d/init.d/proftpd
 %{_mandir}/man5/*
 %lang(ja) %{_mandir}/ja/man5/ftpusers*
@@ -401,6 +403,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.209  2005/08/10 09:31:46  glen
+- adapterized
+
 Revision 1.208  2005/08/08 14:30:57  glen
 - optimize, increase readability, unify triggers/post scriptlets
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/proftpd.spec?r1=1.208&r2=1.209&f=u