rpms/proftpd/devel proftpd-1.3.2-parallel-build.patch, NONE, 1.1 proftpd.spec, 1.50, 1.51

[Paul Howarth]

Author: pghmcfc

Update of /cvs/pkgs/rpms/proftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13287

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.2-parallel-build.patch 
Log Message:
Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)

proftpd-1.3.2-parallel-build.patch:
 Makefile.in |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE proftpd-1.3.2-parallel-build.patch ---
diff -ru proftpd-1.3.2-orig/Makefile.in proftpd-1.3.2/Makefile.in
--- proftpd-1.3.2-orig/Makefile.in	2008-11-19 04:51:38.000000000 +0100
+++ proftpd-1.3.2/Makefile.in	2009-02-16 14:28:43.000000000 +0100
@@ -54,13 +54,13 @@
 proftpd$(EXEEXT): lib src modules dirs locale
 	$(LIBTOOL) --mode=link --tag=CC $(CC) $(LDFLAGS) $(MAIN_LDFLAGS) -o $@ $(BUILD_PROFTPD_OBJS) $(BUILD_PROFTPD_ARCHIVES) $(LIBS) $(MAIN_LIBS)
 
-ftpcount$(EXEEXT): utils
+ftpcount$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPCOUNT_OBJS) $(UTILS_LIBS)
 
-ftpdctl$(EXEEXT): src
+ftpdctl$(EXEEXT): lib src
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPDCTL_OBJS) $(LIBS)
 
-ftpshut$(EXEEXT): utils
+ftpshut$(EXEEXT): lib utils
 	$(CC) $(LDFLAGS) -o $@ $(BUILD_FTPSHUT_OBJS) $(UTILS_LIBS)
 
 ftptop$(EXEEXT): lib utils


Index: proftpd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- proftpd.spec	30 Jul 2009 10:25:53 -0000	1.50
+++ proftpd.spec	31 Jul 2009 12:33:11 -0000	1.51
@@ -7,7 +7,7 @@
 %endif
 
 #global prever rc3
-%global rpmrel 1
+%global rpmrel 2
 
 Summary:		Flexible, stable and highly-configurable FTP server
 Name:			proftpd
@@ -28,6 +28,7 @@ Source8:		proftpd-mod_quotatab_ldap.sche
 Source9:		proftpd.sysconfig
 Patch0:			proftpd-1.3.2rc3-nostrip.patch
 Patch1:			proftpd-1.3.2a-defines.patch
+Patch2:			proftpd-1.3.2-parallel-build.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root
 Requires(post):		/sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig, coreutils, findutils
@@ -84,6 +85,9 @@ Module to add PostgreSQL support to the 
 # Reinstate command-line defines (http://bugs.proftpd.org/3221)
 %patch1 -p1 -b .defines
 
+# Fix parallel build (http://bugs.proftpd.org/3189)
+%patch2 -p1 -b .parallel
+
 # Avoid documentation name conflicts
 %{__mv} contrib/README contrib/README.contrib
 
@@ -142,10 +146,7 @@ SMOD5=mod_wrap2:mod_wrap2_file:mod_wrap2
 	--with-modules=mod_readme:mod_auth_pam:mod_tls \
 	--with-shared=${SMOD1}:${SMOD2}:${SMOD3}:${SMOD4}:${SMOD5}:mod_ifsession
 
-# Note: %{?_smp_mflags} not used because ftpcount has missing dependency on -lsupp,
-# which can cause build failures with parallel builds
-# (http://bugs.proftpd.org/show_bug.cgi?id=3271)
-%{__make}
+%{__make} %{?_smp_mflags}
 
 
 %install
@@ -273,9 +274,12 @@ fi
 
 
 %changelog
+* Fri Jul 31 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-2
+- Add upstream patch to fix parallel build (http://bugs.proftpd.org/3189)
+
 * Mon Jul 27 2009 Paul Howarth <paul at city-fan.org> 1.3.2a-1
 - Update to 1.3.2a
-- Add patch to reinstate support for -DPARAMETER (upstream bug 3221)
+- Add patch to reinstate support for -DPARAMETER (http://bugs.proftpd.org/3221)
 - Retain CAP_AUDIT_WRITE, needed for pam_loginuid (#506735, fixed upstream)
 - Remove ScoreboardFile directive from configuration file - default value
   works better with SELinux (#498375)