[rhdb-utils] Update pg_filedump to version 9.2.0

[Tom Lane]

commit 483b9b87157d671f498553a0661ec6d80749c17d
Author: Tom Lane <tgl at redhat.com>
Date:   Tue Nov 13 19:29:06 2012 -0500

    Update pg_filedump to version 9.2.0

 .gitignore             |    2 +-
 pg_crc.c               |  515 ------------------------------------------------
 pg_filedump-make.patch |   23 +--
 rhdb-utils.spec        |   21 +--
 sources                |    2 +-
 5 files changed, 21 insertions(+), 542 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index eca798d..33711e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/pg_filedump-9.1.0.tar.gz
+/pg_filedump-9.2.0.tar.gz
diff --git a/pg_filedump-make.patch b/pg_filedump-make.patch
index 4f19bb4..2569013 100644
--- a/pg_filedump-make.patch
+++ b/pg_filedump-make.patch
@@ -1,21 +1,18 @@
-diff -Naur pg_filedump-9.1.0.orig/Makefile pg_filedump-9.1.0/Makefile
---- pg_filedump-9.1.0.orig/Makefile	2011-11-26 17:08:46.000000000 -0500
-+++ pg_filedump-9.1.0/Makefile	2011-11-26 17:32:51.447513394 -0500
-@@ -4,14 +4,11 @@
- FD_VERSION=9.1.0
+diff -Naur pg_filedump-9.2.0.orig/Makefile pg_filedump-9.2.0/Makefile
+--- pg_filedump-9.2.0.orig/Makefile	2012-03-12 12:02:44.000000000 -0400
++++ pg_filedump-9.2.0/Makefile	2012-11-13 19:14:54.665862604 -0500
+@@ -4,12 +4,12 @@
+ FD_VERSION=9.2.0
  
  CC=gcc
 -CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations
 +CFLAGS+=-Wall -Wmissing-prototypes -Wmissing-declarations
  
--# PGSQL MUST POINT TO pgsql SOURCE DIRECTORY
--PGSQL=../../pgsql
-+CRC_SRC_DIR=.
+ # If working with a PG source directory, point PGSQL_INCLUDE_DIR to its
+ # src/include subdirectory.  If working with an installed tree, point to
+ # the server include subdirectory, eg /usr/local/include/postgresql/server
+-PGSQL_INCLUDE_DIR=../../pgsql/src/include
++PGSQL_INCLUDE_DIR=/usr/include/pgsql/server
  
--CRC_SRC_DIR=${PGSQL}/src/backend/utils/hash
--
--INCLUDE_DIR=${PGSQL}/src/include
-+INCLUDE_DIR=/usr/include/pgsql/server
  
  DISTFILES= README.pg_filedump Makefile Makefile.contrib \
- 	pg_filedump.h pg_filedump.c
diff --git a/rhdb-utils.spec b/rhdb-utils.spec
index a284ed8..f72af50 100644
--- a/rhdb-utils.spec
+++ b/rhdb-utils.spec
@@ -1,23 +1,19 @@
 # Spec file for rhdb-utils.
 # Authors: Liam Stewart <liams at redhat.com>, Andrew Overholt
 # <overholt at redhat.com>, Tom Lane <tgl at redhat.com>
-# Copyright (C) 2002-2011 Red Hat, Inc.
+# Copyright (C) 2002-2012 Red Hat, Inc.
 
 Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition
 Name: rhdb-utils
-Version: 9.1.0
-Release: 3%{?dist}
+Version: 9.2.0
+Release: 1%{?dist}
 URL: http://pgfoundry.org/projects/pgfiledump/
-# pg_crc.c is copied from postgresql; the rest is GPL
-License: GPLv2+ and PostgreSQL
+License: GPLv2+
 Group: Applications/Databases
 BuildRequires: postgresql-devel
 
-Source0: http://pgfoundry.org/frs/download.php/3182/pg_filedump-%{version}.tar.gz
-# We keep a copy of pg_crc.c in this SRPM so we don't need to have the
-# full PostgreSQL sources to build.  This should be refreshed periodically
-# from the PostgreSQL sources.
-Source1: pg_crc.c
+Source0: http://pgfoundry.org/frs/download.php/3391/pg_filedump-%{version}.tar.gz
+
 Patch1: pg_filedump-make.patch
 
 %description
@@ -27,8 +23,6 @@ developed for PostgreSQL - Red Hat Edition.
 %prep
 %setup -q -n pg_filedump-%{version}
 
-cp -p %{SOURCE1} pg_crc.c
-
 %patch1 -p1
 
 %build
@@ -46,6 +40,9 @@ install -p -m 755 pg_filedump ${RPM_BUILD_ROOT}%{_bindir}
 %doc README.pg_filedump
 
 %changelog
+* Tue Nov 13 2012 Tom Lane <tgl at redhat.com> 9.2.0-1
+- Update pg_filedump to version 9.2.0, to support PostgreSQL 9.2.
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 9.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 8c819ca..d3e5c8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3e6ea8c62e5dcacbef1b5baff08a0ea0  pg_filedump-9.1.0.tar.gz
+4ab7f0ec961c942c6ae360115d4f4349  pg_filedump-9.2.0.tar.gz