[Pound] - Upstream released new version - Drop upstreamed OpenSSL patch

Ruben Kerkhof ruben at fedoraproject.org
Wed Feb 9 12:43:34 UTC 2011


commit 822a89bcb500db0c56332d1b2206af773cd000e5
Author: Ruben <ruben at rubenkerkhof.com>
Date:   Wed Feb 9 13:43:28 2011 +0100

    - Upstream released new version
    - Drop upstreamed OpenSSL patch

 .gitignore              |    1 +
 Pound.spec              |   23 ++--
 pound-2.5-openssl.patch |  290 -----------------------------------------------
 sources                 |    2 +-
 4 files changed, 15 insertions(+), 301 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 098b0a0..b7b52e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 Pound-2.5.tgz
+/Pound-2.6c.tgz
diff --git a/Pound.spec b/Pound.spec
index f6002a3..b0bb8a0 100644
--- a/Pound.spec
+++ b/Pound.spec
@@ -1,16 +1,17 @@
-%define pound_user   pound
-%define pound_group  pound
-%define pound_home   %{_localstatedir}/lib/pound
+%global alphatag c
+
+%global pound_user   pound
+%global pound_group  pound
+%global pound_home   %{_localstatedir}/lib/pound
 
 Name:        Pound
-Version:     2.5
-Release:     2%{?dist}
+Version:     2.6
+Release:     0.1%{?dist}.%{alphatag}
 Summary:     Reverse proxy and load balancer
 
 Group:       System Environment/Daemons
 License:     GPLv3
 URL:         http://www.apsis.ch/pound
-BuildRoot:   %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 BuildRequires: openssl-devel, pcre-devel
@@ -27,11 +28,10 @@ Requires(post):   /sbin/chkconfig
 Requires(preun):  /sbin/chkconfig, /sbin/service
 Requires(postun): /sbin/service
 
-Source0:  http://www.apsis.ch/pound/%{name}-%{version}.tgz
+Source0:  http://www.apsis.ch/pound/%{name}-%{version}%{alphatag}.tgz
 Source1:  pound.init
 Source2:  pound.cfg
 Patch0:   pound-remove-owner.patch
-Patch1:   pound-2.5-openssl.patch
 
 %description
 The Pound program is a reverse proxy, load balancer and
@@ -43,9 +43,8 @@ under the GPL - no warranty, it's free to use, copy and
 give away
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{alphatag}
 %patch0 -p1 -b .remove-owner
-%patch1 -p1 -b .openssl
 
 %build
 %configure
@@ -118,6 +117,10 @@ fi
 %attr(-,%{pound_user},%{pound_group}) %dir %{pound_home}
 
 %changelog
+* Wed Feb 09 2011 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.6-0.1.c
+- Upstream released new version
+- Drop upstreamed OpenSSL patch
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index a6b7ab8..773352d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8a39f5902094619afcda7d12d9d8342c  Pound-2.5.tgz
+b2c5a9467c885b5960bfbe78074e2745  Pound-2.6c.tgz


More information about the scm-commits mailing list