SPECS (DEVEL): proftpd.spec - mod_shaper in separate spec - create...

Sat Apr 29 16:00:44 CEST 2006

Author: glen                         Date: Sat Apr 29 14:00:44 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- mod_shaper in separate spec
- created -devel for modules building

---- Files affected:
SPECS:
   proftpd.spec (1.211.2.14 -> 1.211.2.15) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211.2.14 SPECS/proftpd.spec:1.211.2.15

--- SPECS/proftpd.spec:1.211.2.14	Sat Apr 29 15:06:31 2006
+++ SPECS/proftpd.spec	Sat Apr 29 16:00:39 2006
@@ -12,7 +12,6 @@
 %bcond_without	quotaldap	# enable quota ldap support
 %bcond_without	quotamysql	# enable quota mysql support
 %bcond_without	quotapgsql	# enable quota pgsql support
-%bcond_with	linuxprivs	# enable libcap support
 #
 Summary:	PROfessional FTP Daemon with apache-like configuration syntax
 Summary(es):	Servidor FTP profesional, con sintaxis de configuración semejante a la del apache
@@ -21,7 +20,7 @@
 Summary(zh_CN):	Ň×ÓÚšÜŔíľÄ,°˛ČŤľÄ FTP ˇţÎńĆ÷
 Name:		proftpd
 Version:	1.3.0
-Release:	0.15
+Release:	0.19
 Epoch:		1
 License:	GPL v2+
 Group:		Daemons
@@ -34,9 +33,7 @@
 Source6:	%{name}.init
 Source7:	ftpusers.tar.bz2
 # Source7-md5:	76c80b6ec9f4d079a1e27316edddbe16
-Source8:	http://www.castaglia.org/proftpd/modules/%{name}-mod-shaper-0.5.6.tar.gz
 Source9:	%{name}-mod_pam.conf
-# Source8-md5:	a81c3ed2d45f7c938416a970fd559703
 Patch0:		%{name}-umode_t.patch
 Patch1:		%{name}-glibc.patch
 Patch2:		%{name}-paths.patch
@@ -105,9 +102,6 @@
 <http://www.proftpd.org/>, including a server configuration directive
 reference manual.
 
-This package also includes mod_shaper module from
-<http://www.castaglia.org/proftpd/>
-
 %description common -l es
 ProFTPD es un servidor FTP altamente configurable para sistemas
 operativos unix. Está proyectado para ser un substituto directo al
@@ -200,6 +194,13 @@
 Pliki konfiguracyjne ProFTPD do startowania demona w trybie
 standalone.
 
+%package devel
+Summary:	Header files ProFTPD
+Group:		Development/Libraries
+
+%description devel
+This is the package containing the header files for ProFTPD.
+
 %package mod_auth_pam
 Summary:	ProFTPD PAM auth module
 Group:		Daemons
@@ -277,14 +278,6 @@
 %description mod_readme
 "README" file support.
 
-%package mod_shaper
-Summary:	ProFTPD shaper module
-Group:		Daemons
-Requires:	%{name}-common = %{epoch}:%{version}-%{release}
-
-%description mod_shaper
-A module implementing daemon-wide rate throttling via IPC.
-
 %package mod_sql
 Summary:	ProFTPD SQL support module
 Group:		Daemons
@@ -337,7 +330,7 @@
 will add hosts to the /etc/hosts.deny file.
 
 %prep
-%setup -q -a 8 -n %{name}-%{version}%{?_rc}
+%setup -q -n %{name}-%{version}%{?_rc}
 %patch0 -p1
 #%patch1 -p1 CONFUSES mod_ls.c
 %patch2 -p1
@@ -345,8 +338,6 @@
 %patch4 -p1
 #%patch5 -p1 NEEDS UPDATE
 %patch6 -p1
-# move mod_shaper code on to the source tree
-mv mod_shaper/mod_shaper.c contrib/
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -355,9 +346,8 @@
 MODULES="
 mod_ratio
 mod_readme
-mod_shaper
+mod_wrap
 %{?with_ssl:mod_tls}
-%{?with_ipv6:mod_wrap}
 %{?with_pam:mod_auth_pam}
 %{?with_ldap:mod_ldap}
 %{?with_quotafile:mod_quotatab mod_quotatab_file}
@@ -387,7 +377,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{pam.d,security,sysconfig/rc-inetd,rc.d/init.d} \
 	$RPM_BUILD_ROOT/var/{lib/ftp/pub/Incoming,log} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d
+	$RPM_BUILD_ROOT%{_sysconfdir}/conf.d \
+	$RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -405,14 +396,12 @@
 echo 'LoadModule        mod_quotatab_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_quotatab_sql.conf
 echo 'LoadModule        mod_ratio.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_ratio.conf
 echo 'LoadModule        mod_readme.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_readme.conf
-echo 'LoadModule        mod_shaper.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_shaper.conf
 echo 'LoadModule        mod_sql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql.conf
 echo 'LoadModule        mod_sql_mysql.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_mysql.conf
 echo 'LoadModule        mod_sql_postgres.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_sql_postgres.conf
 echo 'LoadModule        mod_tls.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_tls.conf
 echo 'LoadModule        mod_wrap.c' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/mod_wrap.conf
 
-
 %{?with_pam:install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/ftp}
 install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/ftpd
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/proftpd
@@ -434,6 +423,7 @@
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
+cp -a include/* config.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -508,7 +498,6 @@
 %module_scripts mod_quotatab_sql
 %module_scripts mod_ratio
 %module_scripts mod_readme
-%module_scripts mod_shaper
 %module_scripts mod_sql
 %module_scripts mod_sql_mysql
 %module_scripts mod_sql_postgres
@@ -590,6 +579,10 @@
 %lang(pt_BR) %{_mandir}/pt_BR/man5/ftpusers*
 %lang(ru) %{_mandir}/ru/man5/ftpusers*
 
+%files devel
+%defattr(644,root,root,755)
+%{_includedir}/%{name}
+
 %files mod_auth_pam
 %defattr(644,root,root,755)
 %doc README.PAM
@@ -633,11 +626,6 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_readme.conf
 %attr(755,root,root) %{_libexecdir}/mod_readme.so
 
-%files mod_shaper
-%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_shaper.conf
-%attr(755,root,root) %{_libexecdir}/mod_shaper.so
-
 %files mod_sql
 %defattr(644,root,root,755)
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/mod_sql.conf
@@ -669,6 +657,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.211.2.15  2006/04/29 14:00:39  glen
+- mod_shaper in separate spec
+- created -devel for modules building
+
 Revision 1.211.2.14  2006/04/29 13:06:31  glen
 - add missing module descriptions
 - update module inner deps
================================================================

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

