BR: docbook-style-xsl-nons

[packages/postgresql.git] / postgresql.spec

diff --git a/postgresql.spec b/postgresql.spec
index f69ec4fc60869348670c7965e634343f6ac03e2d..33e2c8ed0d7aef4661487bb4519fe0fd80441352 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -21,7 +21,6 @@
                                        # (disabled by default because it is a security risk)
 #
 
-%define beta %{nil}
 %define mver 14
 
 Summary:       PostgreSQL Data Base Management System
@@ -35,12 +34,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}.3
-Release:       3
+Version:       %{mver}.5
+Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       http://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: c83c28c774dd55b078f7dae0e30163be
+# Source0-md5: 1b319af2ece7fbf836d2d9533e91aa9b
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -65,12 +64,14 @@ BuildRequires:      bison >= 1.875
 %{?with_llvm:BuildRequires:    clang >= 3.9}
 BuildRequires: docbook-dtd42-xml
 BuildRequires: docbook-style-xsl
+BuildRequires: docbook-style-xsl-nons
 BuildRequires: flex >= 2.5.31
 BuildRequires: gettext-tools
 BuildRequires: gnome-doc-tools
 %{?with_kerberos5:BuildRequires:       heimdal-devel}
 %{?with_selinux:BuildRequires: libselinux-devel >= 2.1.10}
 BuildRequires: libtool
+BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel >= 1:2.6.23
 BuildRequires: libxslt-devel
 BuildRequires: libxslt-progs
@@ -78,7 +79,6 @@ BuildRequires:        libxslt-progs
 BuildRequires: ncurses-devel >= 5.0
 %{?with_ldap:BuildRequires:    openldap-devel}
 BuildRequires: openssl-devel >= 0.9.7d
-BuildRequires: ossp-uuid-devel
 BuildRequires: pam-devel
 %if %{with perl}
 BuildRequires: perl-Scalar-List-Utils
@@ -96,13 +96,13 @@ BuildRequires:      rpmbuild(macros) >= 1.671
 %{?with_tcl:BuildRequires:     tcl-devel >= 8.4.3}
 %{?with_tests:BuildRequires:   tzdata}
 BuildRequires: zlib-devel
+Requires(post):        /bin/id
+Requires(post):        /usr/sbin/usermod
 Requires(post,preun):  /sbin/chkconfig
 Requires(pre): /bin/id
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires(postun):      /bin/id
-Requires(postun):      /usr/sbin/usermod
 Requires:      %{name}-clients >= %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      rc-scripts >= 0.4.3.0
@@ -111,10 +111,17 @@ Requires: tzdata
 %if %{with llvm}
 Suggests:      %{name}-module-llvmjit = %{version}-%{release}
 %endif
-Obsoletes:     postgresql-module-plpgsql
-Obsoletes:     postgresql-module-tsearch2
+Obsoletes:     postgresql-data < 6.5
+Obsoletes:     postgresql-ln < 8.3.0
+Obsoletes:     postgresql-module-datetime < 7.1
+Obsoletes:     postgresql-module-plpgsql < 9.0.0-1
+Obsoletes:     postgresql-module-tsearch2 < 8.3.0
+Obsoletes:     postgresql-replicate < 8.3.0
+Obsoletes:     postgresql-replicate-tools < 8.3.0
 Obsoletes:     postgresql-server
 Obsoletes:     postgresql-test
+Obsoletes:     postgresql-upgrade < 9.2.1-1
+Obsoletes:     postgresql-upstart < 9.4.1-2
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pgmoduledir    %{_libdir}/postgresql
@@ -811,7 +818,7 @@ march="-mx32"
 %{__autoconf}
 %{__autoheader}
 %configure \
-       CFLAGS="%{rpmcflags} $march -DNEED_REENTRANT_FUNCS `uuid-config --cflags`" \
+       CFLAGS="%{rpmcflags} $march -DNEED_REENTRANT_FUNCS" \
        CPPFLAGS="%{rpmcppflags} $march" \
        CXXFLAGS="%{rpmcxxflags} $march" \
        --disable-rpath \
@@ -841,7 +848,6 @@ march="-mx32"
 for mod in %{contrib_modules}; do \
        flags="%{rpmcflags} %{rpmcppflags} -DNEED_REENTRANT_FUNCS"
        if [ $mod = "xml2"      ]; then flags="$flags -I/usr/include/libxml2"; fi
-       if [ $mod = "uuid-ossp" ]; then flags="$flags `uuid-config --cflags`"; fi
        %{__make} -C contrib/$mod CFLAGS="$flags"
 done