X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=e99b87ae60c6dba81ee03e702f5deec40382d7ec;hb=refs%2Fheads%2FPGSQL_11;hp=cb34129116b8290b31b7bbb4a01fe26bbcd05105;hpb=555a41ee0fc41eda18815d625989f6067c8d92a4;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index cb34129..e99b87a 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -28,12 +28,12 @@ Summary(tr.UTF-8):	Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):	PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql-%{pgsqlversion}
-Version:	%{pgsqlversion}.14
+Version:	%{pgsqlversion}.20
 Release:	1
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
-# Source0-md5:	53e02a579932a3f1c38f79685ecd36be
+# Source0-md5:	05666c76d6c2e0fd6cc3b8e604f9c06d
 Source1:	postgresql.init
 Source2:	pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5:	5b656ddf1db41965761f85204a14398e
@@ -46,6 +46,8 @@ Patch4:		postgresql-tests.patch
 Patch5:		postgresql-heimdal.patch
 Patch6:		postgresql-link.patch
 Patch7:		socket-dir-fixes.patch
+Patch8:		postgresql-autoconf.patch
+Patch9:		postgresql-python3.patch
 URL:		http://www.postgresql.org/
 BuildRequires:	autoconf >= 2.69
 BuildRequires:	automake
@@ -71,9 +73,9 @@ BuildRequires:	ossp-uuid-devel
 BuildRequires:	pam-devel
 %{?with_perl:BuildRequires:	perl-devel}
 %if %{with python}
-BuildRequires:	python >= 1:2.3
-BuildRequires:	python-devel >= 1:2.3
-BuildRequires:	python-modules >= 1:2.3
+BuildRequires:	python3
+BuildRequires:	python3-devel
+BuildRequires:	python3-modules
 %endif
 BuildRequires:	readline-devel >= 4.2
 BuildRequires:	rpmbuild(macros) >= 1.671
@@ -84,8 +86,8 @@ BuildRequires:	zlib-devel
 Requires(post,preun):	/sbin/chkconfig
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
-Requires(triggerpostun):	/bin/id
-Requires(triggerpostun):	/usr/sbin/usermod
+Requires(post):	/bin/id
+Requires(post):	/usr/sbin/usermod
 Requires:	%{name}-clients = %{version}-%{release}
 Requires:	%{name}-dirs = %{version}-%{release}
 Requires:	postgresql-libs >= %{version}-%{release}
@@ -307,7 +309,7 @@ Summary:	PL/Python - PostgreSQL procedural language
 Summary(pl.UTF-8):	PL/Python - język proceduralny bazy danych PostgreSQL
 Group:		Applications/Databases
 Requires:	%{name} = %{version}-%{release}
-%pyrequires_eq	python
+%pyrequires_eq	python3
 Obsoletes:	postgresql-module-plpython
 
 %description module-plpython
@@ -501,6 +503,8 @@ Różne moduły dołączone do PostgreSQL-a.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
 
 # force rebuild of bison/flex files
 find src -name \*.l -o -name \*.y | xargs touch
@@ -591,8 +595,8 @@ install -d howto
 tar zxf %{SOURCE2} -C howto
 
 %if %{with python}
-%py_comp $RPM_BUILD_ROOT%{py_libdir}
-%py_ocomp $RPM_BUILD_ROOT%{py_libdir}
+%py3_comp $RPM_BUILD_ROOT%{py3_libdir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_libdir}
 %endif
 
 # find locales
@@ -888,7 +892,7 @@ fi
 %if %{with python}
 %files module-plpython -f plpython-%{pgsqlversion}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{moduledir}/plpython2.so
+%attr(755,root,root) %{moduledir}/plpython3.so
 %{extensiondir}/plpython*--*.sql
 %{extensiondir}/plpython*.control
 %endif
@@ -1055,8 +1059,8 @@ fi
 %{extensiondir}/hstore_plperlu.control
 %endif
 %if %{with python}
-%attr(755,root,root) %{moduledir}/hstore_plpython2.so
-%attr(755,root,root) %{moduledir}/ltree_plpython2.so
+%attr(755,root,root) %{moduledir}/hstore_plpython3.so
+%attr(755,root,root) %{moduledir}/ltree_plpython3.so
 %{extensiondir}/hstore_plpythonu--*.sql
 %{extensiondir}/hstore_plpythonu.control
 %{extensiondir}/hstore_plpython2u--*.sql