commit 2560f05bd1c3c1ffe4f69608e5010c1b3eec8549
Author: Andrzej Zawadzki <[email protected]>
Date: Sun Feb 12 22:45:18 2017 +0100
- up to 9.4.11
- switch to uuid=e2fs
postgresql-ossp_uuid.patch | 34 ----------------------------------
postgresql.spec | 10 ++++------
2 files changed, 4 insertions(+), 40 deletions(-)
---
diff --git a/postgresql.spec b/postgresql.spec
index 563274b..7b7bb24 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -32,12 +32,12 @@ Summary(tr.UTF-8): Veri Tabanı Yönetim Sistemi
Summary(uk.UTF-8): PostgreSQL - система керування базами даних
Summary(zh_CN.UTF-8): PostgreSQL 客户端程序和库文件
Name: postgresql
-Version: %{mver}.9
+Version: %{mver}.11
Release: 1
License: BSD
Group: Applications/Databases
Source0:
ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: cb2960fb4022d57f9d7cf421a592a7c0
+# Source0-md5: 2fee03f2034034dbfcb3321a0bb0f829
Source1: %{name}.init
Source2: pgsql-Database-HOWTO-html.tar.gz
# Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -51,8 +51,7 @@ Patch2: %{name}-ecpg-includedir.patch
Patch3: %{name}-ac_version.patch
Patch4: %{name}-disable_horology_test.patch
Patch5: %{name}-heimdal.patch
-Patch6: %{name}-ossp_uuid.patch
-Patch7: %{name}-libxml2.patch
+Patch6: %{name}-libxml2.patch
URL: http://www.postgresql.org/
BuildRequires: autoconf
BuildRequires: automake
@@ -770,7 +769,6 @@ Różne moduły dołączone do PostgreSQL-a.
%patch4 -p1
%patch5 -p1
%patch6 -p1
-%patch7 -p1
# force rebuild of bison/flex files
find src -name \*.l -o -name \*.y | xargs touch
@@ -800,7 +798,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=ossp
+ --with-uuid=e2fs
%{__make}
diff --git a/postgresql-ossp_uuid.patch b/postgresql-ossp_uuid.patch
deleted file mode 100644
index b5b2dfa..0000000
--- a/postgresql-ossp_uuid.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- postgresql-9.4.0/configure.in.orig 2015-01-05 23:55:32.000000000 +0100
-+++ postgresql-9.4.0/configure.in 2015-01-06 00:03:58.433386714 +0100
-@@ -1166,13 +1166,13 @@
- [AC_MSG_ERROR([header file <uuid.h> does not match E2FS UUID
library])])],
- [AC_MSG_ERROR([header file <uuid/uuid.h> or <uuid.h> is required for
E2FS UUID])])])
- elif test "$with_uuid" = ossp ; then
-- AC_CHECK_HEADERS(ossp/uuid.h,
-- [AC_EGREP_HEADER([uuid_export], ossp/uuid.h, [],
-- [AC_MSG_ERROR([header file <ossp/uuid.h> does not match OSSP UUID
library])])],
-+ AC_CHECK_HEADERS(ossp-uuid/uuid.h,
-+ [AC_EGREP_HEADER([uuid_export], ossp-uuid/uuid.h, [],
-+ [AC_MSG_ERROR([header file <ossp-uuid/uuid.h> does not match OSSP UUID
library])])],
- [AC_CHECK_HEADERS(uuid.h,
- [AC_EGREP_HEADER([uuid_export], uuid.h, [],
- [AC_MSG_ERROR([header file <uuid.h> does not match OSSP UUID
library])])],
-- [AC_MSG_ERROR([header file <ossp/uuid.h> or <uuid.h> is required for
OSSP UUID])])])
-+ [AC_MSG_ERROR([header file <ossp-uuid/uuid.h> or <uuid.h> is required
for OSSP UUID])])])
- 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/2560f05bd1c3c1ffe4f69608e5010c1b3eec8549
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
