[packages/postgresql] - rel 1; fix ossp build so back to using ossp-uuid (as before 17ad3dd0e1bb21cf843b6a3fe2e48551d7a11d
arekm
arekm at pld-linux.org
Mon Mar 23 11:04:00 CET 2015
commit 7f05d1f957bc0be47b1106287721c42ae0407da0
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Mon Mar 23 11:03:55 2015 +0100
- rel 1; fix ossp build so back to using ossp-uuid (as before 17ad3dd0e1bb21cf843b6a3fe2e48551d7a11dce)
postgresql-ossp_uuid.patch | 14 ++++++++++++++
postgresql.spec | 5 +++--
2 files changed, 17 insertions(+), 2 deletions(-)
---
diff --git a/postgresql.spec b/postgresql.spec
index 9d15fcf..4edfd7c 100644
--- 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}
diff --git a/postgresql-ossp_uuid.patch b/postgresql-ossp_uuid.patch
index c460f99..b5b2dfa 100644
--- 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>
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/postgresql.git/commitdiff/7f05d1f957bc0be47b1106287721c42ae0407da0
More information about the pld-cvs-commit
mailing list