rpms/Pound/devel 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)
fedora-extras-commits at redhat.com
Wed Jan 3 20:22:04 UTC 2007
Author: ruben
Update of /cvs/extras/rpms/Pound/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2854
Modified Files:
.cvsignore Pound.spec sources
Added Files:
pound-remove-owner.patch
Log Message:
Sync with new upstream version
pound-remove-owner.patch:
--- NEW FILE pound-remove-owner.patch ---
--- Pound-2.2.1/Makefile.in.remove-owner 2007-01-03 20:43:57.000000000 +0100
+++ Pound-2.2.1/Makefile.in 2007-01-03 20:45:36.000000000 +0100
@@ -49,10 +49,10 @@
$(OBJS): pound.h
install: all
- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 -D pound ${DESTDIR}@sbindir@/pound
- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 555 -D poundctl ${DESTDIR}@sbindir@/poundctl
- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 -D pound.8 ${DESTDIR}@mandir@/man8/pound.8
- @INSTALL@ -o @I_OWNER@ -g @I_GRP@ -m 644 -D poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8
+ @INSTALL@ -p -m 755 -D pound ${DESTDIR}@sbindir@/pound
+ @INSTALL@ -p -m 755 -D poundctl ${DESTDIR}@sbindir@/poundctl
+ @INSTALL@ -p -m 644 -D pound.8 ${DESTDIR}@mandir@/man8/pound.8
+ @INSTALL@ -p -m 644 -D poundctl.8 ${DESTDIR}@mandir@/man8/poundctl.8
clean:
rm -f pound $(OBJS) poundctl poundctl.o
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Pound/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 16 Dec 2006 13:25:41 -0000 1.5
+++ .cvsignore 3 Jan 2007 20:21:34 -0000 1.6
@@ -1 +1 @@
-Pound-2.2.tgz
+Pound-2.2.1.tgz
Index: Pound.spec
===================================================================
RCS file: /cvs/extras/rpms/Pound/devel/Pound.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Pound.spec 17 Dec 2006 14:26:43 -0000 1.5
+++ Pound.spec 3 Jan 2007 20:21:34 -0000 1.6
@@ -3,25 +3,26 @@
%define pound_home %{_localstatedir}/lib/pound
Name: Pound
-Version: 2.2
-Release: 2%{?dist}
+Version: 2.2.1
+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 Jan 03 2007 <ruben at rubenkerkhof.com> 2.2.1-1
+- Sync with new beta release from upstream
* Sun Dec 17 2006 <ruben at rubenkerkhof.com> 2.2-2
- Fixed empty debuginfo rpm (bz 219942)
* Sat Dec 16 2006 <ruben at rubenkerkhof.com> 2.2-1
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Pound/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 16 Dec 2006 13:25:41 -0000 1.5
+++ sources 3 Jan 2007 20:21:34 -0000 1.6
@@ -1 +1 @@
-a94e781ced1b2f3a7f8b8051f4d95713 Pound-2.2.tgz
+d3500ec034287ce5bf547b022b7e25ee Pound-2.2.1.tgz
More information about the scm-commits
mailing list