- rel 1; fix ossp build so back to using ossp-uuid (as before 17ad3dd0e1bb21cf843b6a3...

diff --git a/postgresql-ossp_uuid.patch b/postgresql-ossp_uuid.patch
index c460f99274720063e84c44d91d76cf0f1733d5b1..b5b2dfa5477626b92c86e6d606cdc48d7eb655ca 100644 (file)
--- a/postgresql-ossp_uuid.patch
+++ b/postgresql-ossp_uuid.patch
@@ -18,3 +18,17 @@
  fi
  
  if test "$PORTNAME" = "win32" ; then
+--- postgresql-9.4.1/contrib/uuid-ossp/uuid-ossp.c.org 2015-03-23 10:41:24.000000000 +0100
++++ postgresql-9.4.1/contrib/uuid-ossp/uuid-ossp.c     2015-03-23 10:54:29.403373571 +0100
+@@ -29,8 +29,8 @@
+ #ifdef HAVE_UUID_H
+ #include <uuid.h>
+ #endif
+-#ifdef HAVE_OSSP_UUID_H
+-#include <ossp/uuid.h>
++#ifdef HAVE_OSSP_UUID_UUID_H
++#include <ossp-uuid/uuid.h>
+ #endif
+ #ifdef HAVE_UUID_UUID_H
+ #include <uuid/uuid.h>
+

diff --git a/postgresql.spec b/postgresql.spec
index 9d15fcf21a7c7f71cb44b60738adaf43cbca5eb8..4edfd7c24f8358e5c7336331d2b3ba9d36ee7716 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -33,7 +33,7 @@ Summary(uk.UTF-8):    PostgreSQL - система керування базами 
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
 Version:       %{mver}.1
-Release:       0.1
+Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
@@ -795,6 +795,7 @@ find src -name \*.l -o -name \*.y | xargs touch
 %build
 %{__aclocal} -I config
 %{__autoconf}
+%{__autoheader}
 %configure \
        CFLAGS="%{rpmcflags} -DNEED_REENTRANT_FUNCS `uuid-config --cflags`" \
        --disable-rpath \
@@ -813,7 +814,7 @@ find src -name \*.l -o -name \*.y | xargs touch
        %{?with_python:--with-python} \
        %{?with_selinux:--with-selinux} \
        %{?with_tcl:--with-tcl --with-tclconfig=%{_ulibdir}} \
-       --with-uuid=e2fs \
+       --with-uuid=ossp
 
 %{__make}