Compare commits

...
Sign in to create a new pull request.

1 commit

Author SHA1 Message Date
Tom Lane
92135107c2 Update pg_filedump to version 9.1.0 2011-11-26 18:09:46 -05:00
5 changed files with 29 additions and 36 deletions

2
.gitignore vendored
View file

@ -1 +1 @@
/pg_filedump-9.0.0.tar
/pg_filedump-9.1.0.tar.gz

View file

@ -14,12 +14,12 @@
* code for possible future use.
*
*
* Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group
* Portions Copyright (c) 1996-2011, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/hash/pg_crc.c,v 1.24 2010/02/26 02:01:13 momjian Exp $
* src/backend/utils/hash/pg_crc.c
*
*-------------------------------------------------------------------------
*/

View file

@ -1,32 +1,21 @@
diff -Naur pg_filedump.orig/Makefile pg_filedump/Makefile
--- pg_filedump.orig/Makefile 2005-11-21 11:29:01.000000000 -0500
+++ pg_filedump/Makefile 2005-11-21 11:36:47.000000000 -0500
@@ -1,16 +1,10 @@
# View README.pg_filedump first
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
CC=gcc
-CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations
+CFLAGS+=-Wall -Wmissing-prototypes -Wmissing-declarations
INCLUDE=/usr/include/pgsql/server
-# PGSQL MUST POINT TO pgsql SOURCE DIRECTORY
-PGSQL=../../../../postgres/pgsql
-PGSQL=../../pgsql
+CRC_SRC_DIR=.
-CRC_SRC_DIR=${PGSQL}/src/backend/utils/hash
-
-CRC_SRC=${PGSQL}/src/backend/utils/hash
-CRC_INCLUDE=${PGSQL}/src
-
all: pg_filedump
-INCLUDE_DIR=${PGSQL}/src/include
+INCLUDE_DIR=/usr/include/pgsql/server
pg_filedump: pg_filedump.o pg_crc.o
@@ -19,8 +13,8 @@
pg_filedump.o: pg_filedump.c
${CC} ${CFLAGS} -I${INCLUDE} pg_filedump.c -c
-pg_crc.o: ${CRC_SRC}/pg_crc.c
- ${CC} ${CFLAGS} -I${CRC_INCLUDE} -I${INCLUDE} ${CRC_SRC}/pg_crc.c -c
+pg_crc.o: pg_crc.c
+ ${CC} ${CFLAGS} -I${INCLUDE} pg_crc.c -c
clean:
rm -rf *.o pg_filedump
DISTFILES= README.pg_filedump Makefile Makefile.contrib \
pg_filedump.h pg_filedump.c

View file

@ -1,19 +1,19 @@
# Spec file for rhdb-utils.
# Authors: Liam Stewart <liams@redhat.com>, Andrew Overholt
# <overholt@redhat.com>, Tom Lane <tgl@redhat.com>
# Copyright (C) 2002-2010 Red Hat, Inc.
# Copyright (C) 2002-2011 Red Hat, Inc.
Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition
Name: rhdb-utils
Version: 9.0.0
Release: 2%{?dist}
URL: http://sources.redhat.com/rhdb/
Version: 9.1.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
Group: Applications/Databases
BuildRequires: postgresql-devel
Source0: http://sources.redhat.com/rhdb/tools/pg_filedump-%{version}.tar
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.
@ -21,8 +21,8 @@ Source1: pg_crc.c
Patch1: pg_filedump-make.patch
%description
This package contains miscellaneous, non-graphical tools developed for
PostgreSQL - Red Hat Edition.
This package contains miscellaneous, non-graphical tools originally
developed for PostgreSQL - Red Hat Edition.
%prep
%setup -q -n pg_filedump-%{version}
@ -43,9 +43,13 @@ install -p -m 755 pg_filedump ${RPM_BUILD_ROOT}%{_bindir}
%files
%defattr(-,root,root,-)
%{_bindir}/pg_filedump
%doc ChangeLog README.pg_filedump
%doc README.pg_filedump
%changelog
* Sat Nov 26 2011 Tom Lane <tgl@redhat.com> 9.1.0-1
- Update pg_filedump to version 9.1.0, to support PostgreSQL 9.1.
- Point to new upstream home at pgfoundry.org.
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 9.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

View file

@ -1 +1 @@
8fa46ed67369e6434b60ac21f6fad67c pg_filedump-9.0.0.tar
3e6ea8c62e5dcacbef1b5baff08a0ea0 pg_filedump-9.1.0.tar.gz