rpms/Pound/FC-6 pound-remove-owner.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 Pound.spec, 1.5, 1.6 sources, 1.5, 1.6

[Ruben Kerkhof (ruben)]

Author: ruben

Update of /cvs/extras/rpms/Pound/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11813

Modified Files:
	.cvsignore Pound.spec sources 
Added Files:
	pound-remove-owner.patch 
Log Message:
Update to 2.3

pound-remove-owner.patch:

--- NEW FILE pound-remove-owner.patch ---
--- Pound-2.2.3/Makefile.in.remove-owner	2007-01-21 01:45:44.000000000 +0100
+++ Pound-2.2.3/Makefile.in	2007-01-21 01:46:59.000000000 +0100
@@ -50,11 +50,11 @@
 
 install:	all
 		@INSTALL@ -d ${DESTDIR}@sbindir@
-		@INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 pound ${DESTDIR}@sbindir@/pound
-		@INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 poundctl ${DESTDIR}@sbindir@/poundctl
+		@INSTALL@ -p -m 755 pound ${DESTDIR}@sbindir@/pound
+		@INSTALL@ -p -m 755 poundctl ${DESTDIR}@sbindir@/poundctl
 		@INSTALL@ -d ${DESTDIR}@mandir@/man8
-		@INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8
-		@INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8
+		@INSTALL@ -p -m 644 pound.8 ${DESTDIR}@mandir@/man8/pound.8
+		@INSTALL@ -p -m 644 poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8
 
 clean:
 		rm -f pound $(OBJS) poundctl poundctl.o


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Pound/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Dec 2006 13:51:24 -0000	1.5
+++ .cvsignore	11 Apr 2007 21:48:31 -0000	1.6
@@ -1 +1 @@
-Pound-2.2.tgz
+Pound-2.3.tgz


Index: Pound.spec
===================================================================
RCS file: /cvs/extras/rpms/Pound/FC-6/Pound.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Pound.spec	17 Dec 2006 15:15:36 -0000	1.5
+++ Pound.spec	11 Apr 2007 21:48:31 -0000	1.6
@@ -3,25 +3,26 @@
 %define pound_home	%{_localstatedir}/lib/pound
 
 Name:		Pound          
-Version:	2.2
-Release:	2%{?dist}
+Version:	2.3
+Release:	1%{?dist}
 Summary:	Reverse proxy and load balancer        
 
 Group:		System Environment/Daemons
 License:	GPL        
 URL:		http://apsis.ch/pound
-           
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openssl-devel, pcre-devel
 
-Requires(pre):    %{_sbindir}/useradd
-Requires(post):   /sbin/chkconfig
-Requires(preun):  /sbin/chkconfig, /sbin/service
-Requires(postun): /sbin/service
+Requires(pre):		%{_sbindir}/useradd
+Requires(post):		/sbin/chkconfig
+Requires(preun):	/sbin/chkconfig, /sbin/service
+Requires(postun):	/sbin/service
 
 Source0:	http://apsis.ch/pound/%{name}-%{version}.tgz       
 Source1:	pound.init
 Source2:	pound.cfg
+Patch0:		pound-remove-owner.patch
 
 %description
 The Pound program is a reverse proxy, load balancer and
@@ -34,6 +35,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .remove-owner
 
 %build
 %configure
@@ -41,13 +43,11 @@
 
 %install
 rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
 %{__install} -d %{buildroot}%{pound_home}
-%{__install} -p -D -m 0755 pound %{buildroot}%{_sbindir}/pound
-%{__install} -p -D -m 0755 poundctl %{buildroot}%{_sbindir}/poundctl
-%{__install} -p -D -m 0644 pound.8 %{buildroot}%{_mandir}/man8/pound.8
-%{__install} -p -D -m 0644 poundctl.8 %{buildroot}%{_mandir}/man8/poundctl.8
-%{__install} -p -D -m 0755 %{SOURCE1} %{buildroot}%{_initrddir}/pound
-%{__install} -p -D -m 0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pound.cfg 
+%{__install} -p -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pound
+%{__install} -p -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/pound.cfg 
 
 mkdir -p %{buildroot}%{_sysconfdir}/pki/tls/certs
 touch %{buildroot}%{_sysconfdir}/pki/tls/certs/pound.pem
@@ -57,7 +57,7 @@
 
 %pre
 %{_sbindir}/useradd -c "Pound user" -s /bin/false -r -d %{pound_home} \
-    %{pound_user} 2>/dev/null || :
+	%{pound_user} 2>/dev/null || :
 
 %post
 /sbin/chkconfig --add pound
@@ -90,7 +90,7 @@
 
 %postun
 if [ $1 -ge 1 ] ; then
-        /sbin/service pound condrestart > /dev/null 2>&1 || :
+	/sbin/service pound condrestart > /dev/null 2>&1 || :
 fi
 
 %files
@@ -106,6 +106,8 @@
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
+* Wed Apr 11 2007 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.3-1
+- Update to 2.3
 * Sun Dec 17 2006 <ruben at rubenkerkhof.com> 2.2-2
 - Fixed empty debuginfo rpm
 * Sat Dec 16 2006 <ruben at rubenkerkhof.com> 2.2-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Pound/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Dec 2006 13:51:24 -0000	1.5
+++ sources	11 Apr 2007 21:48:31 -0000	1.6
@@ -1 +1 @@
-a94e781ced1b2f3a7f8b8051f4d95713  Pound-2.2.tgz
+94251bfc0d38e7aa4d50bff971ddc72e  Pound-2.3.tgz