[pdns/f15] Rediff patch
Ruben Kerkhof
ruben at fedoraproject.org
Mon Jan 9 14:05:35 UTC 2012
commit 3a53cac3a9c2df270ccb23c1e4a82ed29f3264aa
Author: Ruben <ruben at rubenkerkhof.com>
Date: Mon Jan 9 15:05:19 2012 +0100
Rediff patch
pdns-fix-postgres-detection.patch | 13 +++++++------
pdns.spec | 2 +-
2 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/pdns-fix-postgres-detection.patch b/pdns-fix-postgres-detection.patch
index 2a21872..3c8cc45 100644
--- a/pdns-fix-postgres-detection.patch
+++ b/pdns-fix-postgres-detection.patch
@@ -1,7 +1,8 @@
-diff -up pdns-2.9.22/configure.orig pdns-2.9.22/configure
---- pdns-2.9.22/configure.orig 2010-01-14 20:40:16.000000000 +0100
-+++ pdns-2.9.22/configure 2010-01-14 20:41:13.000000000 +0100
-@@ -23298,7 +23298,7 @@ if test "${with_pgsql+set}" = set; then
+diff --git a/configure b/configure
+index 60df456..8bf578d 100755
+--- a/configure
++++ b/configure
+@@ -16644,7 +16644,7 @@ if test "${with_pgsql+set}" = set; then :
withval=$with_pgsql; PGSQL_lib_check="$withval/lib/pgsql $with_pgsql/lib"
PGSQL_inc_check="$withval/include/pgsql"
else
@@ -10,8 +11,8 @@ diff -up pdns-2.9.22/configure.orig pdns-2.9.22/configure
PGSQL_inc_check="/usr/local/pgsql/include/pgsql /usr/include /usr/local/include/postgresql/ /usr/local/include /opt/pgsql/include/pgsql /opt/pgsql/include /usr/include/pgsql/ /usr/include/postgresql"
fi
-@@ -23318,8 +23318,7 @@ fi
- echo $ECHO_N "checking for PgSQL library directory... $ECHO_C" >&6; }
+@@ -16664,8 +16664,7 @@ fi
+ $as_echo_n "checking for PgSQL library directory... " >&6; }
PGSQL_libdir=
for m in $PGSQL_lib_check; do
- if test -d "$m" && \
diff --git a/pdns.spec b/pdns.spec
index 93e11ff..1ad279c 100644
--- a/pdns.spec
+++ b/pdns.spec
@@ -82,7 +82,7 @@ This package contains the SQLite backend for %{name}
%prep
%setup -q
%patch0 -p1 -b .fixinit
-%patch1 -p1 -b .postgres
+# %patch1 -p1 -b .postgres
%patch2 -p1 -b .sigstop
%build
More information about the scm-commits
mailing list