SPECS (DEVEL): proftpd.spec - just testing DSO in 1.3.0. read READ...

[glen]

Author: glen                         Date: Wed Aug 10 21:46:06 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- just testing DSO in 1.3.0. read README.DSO in sources
- note rc2 doesn't compile, while rc1 does.
- had to update sharper to 0.5.6 for 1.3.0

---- Files affected:
SPECS:
   proftpd.spec (1.211 -> 1.211.2.1) 

---- Diffs:

================================================================
Index: SPECS/proftpd.spec
diff -u SPECS/proftpd.spec:1.211 SPECS/proftpd.spec:1.211.2.1
--- SPECS/proftpd.spec:1.211	Wed Aug 10 22:46:43 2005
+++ SPECS/proftpd.spec	Wed Aug 10 23:46:00 2005
@@ -13,7 +13,10 @@
 %bcond_with	quotaldap	# enable quota ldap support
 %bcond_with	quotamysql	# enable quota mysql support
 %bcond_with	quotapgsql	# enable quota pgsql support
+%bcond_with	dso			# enable DSO (available since 1.3.0)
 %bcond_with	linuxprivs	# enable libcap support
+
+%define	with_dso 1
 #
 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,13 +24,14 @@
 Summary(pt_BR):	Servidor FTP profissional, com sintaxe de configuraçăo semelhante ŕ do apache
 Summary(zh_CN):	Ň×ÓÚšÜŔíľÄ,°˛ČŤľÄ FTP ˇţÎńĆ÷
 Name:		proftpd
-Version:	1.2.10
-Release:	7
+Version:	1.3.0
+%define	_rc	rc1
+Release:	%{_rc}.4
 Epoch:		1
 License:	GPL v2+
 Group:		Daemons
-Source0:	ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}.tar.bz2
-# Source0-md5:	5feb4a7348e12faefc25e34fd92efdd6
+Source0:	ftp://ftp.proftpd.org/distrib/source/%{name}-%{version}%{_rc}.tar.bz2
+# Source0-md5:	3faad77dba49262d26abd3f4f2e1c62d
 Source1:	%{name}.conf
 Source3:	ftp.pamd
 Source4:	%{name}.inetd
@@ -35,8 +39,8 @@
 Source6:	%{name}.init
 Source7:	ftpusers.tar.bz2
 # Source7-md5:	76c80b6ec9f4d079a1e27316edddbe16
-Source8:	http://www.castaglia.org/proftpd/modules/%{name}-mod-shaper-0.5.5.tar.gz
-# Source8-md5:	ca3d63ffbc6ad5b6a9063f79b36d1b55
+Source8:	http://www.castaglia.org/proftpd/modules/%{name}-mod-shaper-0.5.6.tar.gz
+# Source8-md5:	a81c3ed2d45f7c938416a970fd559703
 Patch0:		%{name}-umode_t.patch
 Patch1:		%{name}-glibc.patch
 Patch2:		%{name}-paths.patch
@@ -186,14 +190,14 @@
 exit 1
 %endif
 
-%setup -q -a 8
+%setup -q -a 8 -n %{name}-%{version}%{?_rc}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
+#%patch5 -p1
+#%patch6 -p1
 # move mod_shaper code on to the source tree
 mv mod_shaper/mod_shaper.c contrib/
 
@@ -223,7 +227,8 @@
 
 %configure \
 	--enable-autoshadow \
-	--with-modules=$(echo $MODULES | tr ' ' ':') \
+	%{?with_dso:--enable-dso --with-shared=$(echo $MODULES | tr ' ' ':')} \
+	%{!?with_dso:--with-modules=$(echo $MODULES | tr ' ' ':')} \
 	%{?with_ipv6:--enable-ipv6} \
 	%{!?with_ssl:--disable-tls} \
 	--enable-ctrls \
@@ -236,8 +241,12 @@
 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}
 
+install -d $RPM_BUILD_ROOT%{_libdir}/%{name}
+install -d $RPM_BUILD_ROOT/var/run/proftpd
+
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
+	LIBEXECDIR=$RPM_BUILD_ROOT%{_libdir}/%{name} \
 	INSTALL_USER=%(id -u) \
 	INSTALL_GROUP=%(id -g)
 
@@ -262,6 +271,11 @@
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/ftpusers-path.diff*
 
+%if %{with dso}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -348,7 +362,8 @@
 %doc sample-configurations/*.conf CREDITS ChangeLog NEWS RELEASE_NOTES
 %doc README README.LDAP README.PAM README.capabilities README.classes README.controls README.IPv6
 %doc README.modules
-%doc doc/*html contrib/*.html
+%doc doc/*html
+#%doc doc/*html contrib/*.html
 
 %attr(750,root,ftp) %dir %{_sysconfdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
@@ -362,6 +377,15 @@
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_sbindir}/*
 
+%if %{with dso}
+%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/*.so
+# works without .la. so don't include it?
+#%{_libdir}/%{name}/*.la
+%endif
+
+%dir /var/run/proftpd
+
 %{_mandir}/man[18]/*
 
 %dir /var/lib/ftp
@@ -393,6 +417,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.211.2.1  2005/08/10 21:46:00  glen
+- just testing DSO in 1.3.0. read README.DSO in sources
+- note rc2 doesn't compile, while rc1 does.
+- had to update sharper to 0.5.6 for 1.3.0
+
 Revision 1.211  2005/08/10 20:46:43  glen
 - no main package is built, moved %descriptions to -common package
 - rel 7
================================================================

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