rpms/rhdb-utils/devel pg_crc.c,1.3,1.4 rhdb-utils.spec,1.19,1.20

[Tom Lane]

Author: tgl

Update of /cvs/pkgs/rpms/rhdb-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25474

Modified Files:
	pg_crc.c rhdb-utils.spec 
Log Message:
Correct License: tag to reflect that pg_crc.c is copied from postgresql


Index: pg_crc.c
===================================================================
RCS file: /cvs/pkgs/rpms/rhdb-utils/devel/pg_crc.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- pg_crc.c	14 Feb 2007 22:26:12 -0000	1.3
+++ pg_crc.c	19 Jan 2010 20:08:12 -0000	1.4
@@ -5,7 +5,7 @@
  *
  * See Ross Williams' excellent introduction
  * A PAINLESS GUIDE TO CRC ERROR DETECTION ALGORITHMS, available from
- * ftp://ftp.rocksoft.com/papers/crc_v3.txt or several other net sites.
+ * http://www.ross.net/crc/download/crc_v3.txt or several other net sites.
  *
  * We use a normal (not "reflected", in Williams' terms) CRC, using initial
  * all-ones register contents and a final bit inversion.
@@ -14,17 +14,18 @@
  * code for possible future use.
  *
  *
- * Portions Copyright (c) 1996-2006, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2009, 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.16 2006/07/14 14:52:25 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/hash/pg_crc.c,v 1.21 2009/01/01 17:23:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
-#include "postgres.h"
 
+/* Use c.h so that this file can be built in either frontend or backend */
+#include "c.h"
 
 
 /*


Index: rhdb-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rhdb-utils/devel/rhdb-utils.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- rhdb-utils.spec	18 Aug 2009 04:46:18 -0000	1.19
+++ rhdb-utils.spec	19 Jan 2010 20:08:12 -0000	1.20
@@ -1,19 +1,24 @@
 # Spec file for rhdb-utils.
-# Author: Liam Stewart <liams at redhat.com>, Andrew Overholt
+# Authors: Liam Stewart <liams at redhat.com>, Andrew Overholt
 # <overholt at redhat.com>, Tom Lane <tgl at redhat.com>
-# Copyright (C) 2002-2009 Red Hat, Inc.
+# Copyright (C) 2002-2010 Red Hat, Inc.
 
 Summary: Miscellaneous utilities for PostgreSQL - Red Hat Edition
 Name: rhdb-utils
 Version: 8.4.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: http://sources.redhat.com/rhdb/
-License: GPLv2+
+# pg_crc.c is copied from postgresql, hence MIT; the rest is GPL
+License: GPLv2+ and MIT
 Group: Applications/Databases
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: postgresql-devel >= 8.4
 
 Source0: http://sources.redhat.com/rhdb/tools/pg_filedump-%{version}.tar
+# 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
 Patch1: pg_filedump-make.patch
 
@@ -24,8 +29,6 @@ PostgreSQL - Red Hat Edition.
 %prep
 %setup -q -n pg_filedump-%{version}
 
-# We keep a copy of pg_crc.c in this SRPM so we don't need to have the
-# full PostgreSQL sources at hand.
 cp %{SOURCE1} pg_crc.c
 
 %patch1 -p1
@@ -50,6 +53,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %doc ChangeLog README.pg_filedump
 
 %changelog
+* Tue Jan 19 2010 Tom Lane <tgl at redhat.com> 8.4.0-2
+- Correct License: tag to reflect that pg_crc.c is copied from postgresql.
+
 * Tue Aug 18 2009 Tom Lane <tgl at redhat.com> 8.4.0-1
 - Update pg_filedump to version 8.4.0, to support PostgreSQL 8.4.