rpms/pdns/devel .cvsignore, 1.5, 1.6 pdns-fixinit.patch, 1.1, 1.2 pdns.spec, 1.13, 1.14 sources, 1.5, 1.6 pdns-avoid-version.patch, 1.2, NONE pdns-bz461768.patch, 1.1, NONE pdns-gcc43.patch, 1.1, NONE

[Ruben Kerkhof]

Author: ruben

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

Modified Files:
	.cvsignore pdns-fixinit.patch pdns.spec sources 
Removed Files:
	pdns-avoid-version.patch pdns-bz461768.patch pdns-gcc43.patch 
Log Message:
* Wed Dec 03 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-1.rc2
- Upstream releasd new release candidate
- Drop patches which are upstreamed



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2008 07:52:59 -0000	1.5
+++ .cvsignore	3 Dec 2008 12:53:07 -0000	1.6
@@ -1 +1 @@
-pdns-2.9.21.2.tar.gz
+pdns-2.9.22-rc2.tar.gz

pdns-fixinit.patch:

Index: pdns-fixinit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/pdns-fixinit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pdns-fixinit.patch	30 Dec 2006 19:00:30 -0000	1.1
+++ pdns-fixinit.patch	3 Dec 2008 12:53:07 -0000	1.2
@@ -1,6 +1,7 @@
---- pdns-2.9.20/pdns/pdns.in.fixinit	2006-12-17 18:14:14.000000000 +0100
-+++ pdns-2.9.20/pdns/pdns.in	2006-12-17 18:15:42.000000000 +0100
-@@ -47,6 +47,7 @@
+diff -up pdns-2.9.22-rc2/pdns/pdns.in.fixinit pdns-2.9.22-rc2/pdns/pdns.in
+--- pdns-2.9.22-rc2/pdns/pdns.in.fixinit	2008-02-03 13:14:00.000000000 +0100
++++ pdns-2.9.22-rc2/pdns/pdns.in	2008-12-03 04:07:26.000000000 +0100
+@@ -47,6 +47,7 @@ case "$1" in
  		if test "$NOTRUNNING" = "0" 
  		then 
  			doPC quit
@@ -8,7 +9,7 @@
  			echo $ret
  		else
  			echo "not running"
-@@ -57,6 +58,7 @@
+@@ -57,6 +58,7 @@ case "$1" in
  	force-stop)
  		echo -n "Stopping PowerDNS authoritative nameserver: "
  		killall -v -9 pdns_server
@@ -16,7 +17,7 @@
  		echo "killed"
  	;;
  
-@@ -69,6 +71,7 @@
+@@ -69,6 +71,7 @@ case "$1" in
  			$pdns_server --daemon --guardian=yes
  			if test "$?" = "0"
  			then


Index: pdns.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/pdns.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- pdns.spec	17 Nov 2008 07:52:59 -0000	1.13
+++ pdns.spec	3 Dec 2008 12:53:07 -0000	1.14
@@ -1,17 +1,15 @@
+%define alphatag rc2
 Summary:	A modern, advanced and high performance authoritative-only nameserver
 Name:		pdns
-Version:	2.9.21.2
-Release:	1%{?dist}
+Version:	2.9.22
+Release:	1.%{alphatag}%{?dist}
 
 Group:		System Environment/Daemons
 License:	GPLv2
 URL:		http://powerdns.com
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}.tar.gz
+Source0:	http://downloads.powerdns.com/releases/%{name}-%{version}-%{alphatag}.tar.gz
 Patch0:		%{name}-fixinit.patch
-Patch1:		%{name}-avoid-version.patch
-Patch2:		%{name}-gcc43.patch
-Patch3:         %{name}-bz461768.patch
 
 Requires(post):	%{_sbindir}/useradd, /sbin/chkconfig
 Requires(preun):	/sbin/service, /sbin/chkconfig
@@ -81,11 +79,8 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{alphatag}
 %patch0 -p1 -b .fixinit
-%patch1 -p1 -b .avoid-version
-%patch2 -p1
-%patch3 -p3
 
 %build
 export CPPFLAGS="-DLDAP_DEPRECATED %{optflags}"
@@ -185,6 +180,10 @@
 
 
 %changelog
+* Wed Dec 03 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.22-1.rc2
+- Upstream releasd new release candidate
+- Drop patches which are upstreamed
+
 * Mon Nov 17 2008 Ruben Kerkhof <ruben at rubenkerkhof.com> 2.9.21.2-1
 - Upstream released new version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pdns/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2008 07:52:59 -0000	1.5
+++ sources	3 Dec 2008 12:53:07 -0000	1.6
@@ -1 +1 @@
-2aa79c1d120a071298340ed2d4e02165  pdns-2.9.21.2.tar.gz
+f9b834fb313145604f417ceff1506601  pdns-2.9.22-rc2.tar.gz


--- pdns-avoid-version.patch DELETED ---


--- pdns-bz461768.patch DELETED ---


--- pdns-gcc43.patch DELETED ---