diff options
| author | Tom Lane <tgl@fedoraproject.org> | 2008-07-29 01:50:10 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@fedoraproject.org> | 2008-07-29 01:50:10 +0000 |
| commit | b2169aa2ae531c635371b352af8effe0a6bc4f82 (patch) | |
| tree | c118a5f474fdfd65f2f997878decb970cedd4d78 | |
| parent | 09bd3b3257582470a3ad0666b6229f47028ba4f7 (diff) | |
| download | postgresql-setup-b2169aa2ae531c635371b352af8effe0a6bc4f82.tar.gz postgresql-setup-b2169aa2ae531c635371b352af8effe0a6bc4f82.tar.xz postgresql-setup-b2169aa2ae531c635371b352af8effe0a6bc4f82.zip | |
So apparently, %patch -F does not actually *work* in the current Fedorapostgresql-8_3_3-3_fc10
infrastructure. Grumble.
| -rw-r--r-- | postgresql-ac-version.patch | 8 | ||||
| -rwxr-xr-x | postgresql.spec | 6 |
2 files changed, 5 insertions, 9 deletions
diff --git a/postgresql-ac-version.patch b/postgresql-ac-version.patch index decc317..f6bb105 100644 --- a/postgresql-ac-version.patch +++ b/postgresql-ac-version.patch @@ -4,12 +4,12 @@ for PostgreSQL, but it's not very tenable in the Fedora/RHEL world. Dike out the check. -diff -Naur postgresql-8.3RC2.orig/configure.in postgresql-8.3RC2/configure.in ---- postgresql-8.3RC2.orig/configure.in 2008-01-17 23:47:32.000000000 -0500 -+++ postgresql-8.3RC2/configure.in 2008-01-18 11:39:58.000000000 -0500 +diff -Naur postgresql-8.3.3.orig/configure.in postgresql-8.3.3/configure.in +--- postgresql-8.3.3.orig/configure.in 2008-06-08 20:38:40.000000000 -0400 ++++ postgresql-8.3.3/configure.in 2008-07-28 21:45:08.000000000 -0400 @@ -19,10 +19,6 @@ - AC_INIT([PostgreSQL], [8.3RC2], [pgsql-bugs@postgresql.org]) + AC_INIT([PostgreSQL], [8.3.3], [pgsql-bugs@postgresql.org]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.59], [], [m4_fatal([Autoconf version 2.59 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not diff --git a/postgresql.spec b/postgresql.spec index d4dae7b..ad27a82 100755 --- a/postgresql.spec +++ b/postgresql.spec @@ -351,8 +351,7 @@ system, including regression tests and benchmarks. %prep %setup -q %patch1 -p1 -# intentionally allowing fuzz here because of adjacent version number -%patch2 -p1 -F2 +%patch2 -p1 %patch3 -p1 %patch4 -p1 # patch5 is applied later @@ -862,9 +861,6 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jul 28 2008 Tom Lane <tgl@redhat.com> 8.3.3-3 - Fix build failure caused by new default patch fuzz = 0 policy in rawhide. - The only patch that actually broke was postgresql-ac-version.patch, and - for that it seems better to allow fuzz than to have a guaranteed patch - failure on every upstream minor version update. * Fri Jun 20 2008 Tom Lane <tgl@redhat.com> 8.3.3-2 - Install Pgtcl in /usr/lib/tcl$TCL_VERSION, not directly in /usr/lib. |