X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=88fcc27470f1d87b7a244e7a88e6646702b333db;hb=aba4fe02fe0f29a53769588db99390a691f62d32;hp=308eb165518485e9bda93579e11ad54c1653cdb2;hpb=44fc39a64d161903b6d0f4d380b2eacd54622807;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index 308eb16..88fcc27 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -35,12 +35,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}.0
+Version:	%{mver}.4
 Release:	0.1
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5:	87545416ef021eee8621d31a93fcc899
+# Source0-md5:	80ebbf0e55193b123760e5f8e48c6cff
 Source1:	%{name}.init
 Source2:	pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5:	5b656ddf1db41965761f85204a14398e
@@ -52,7 +52,6 @@ Patch0:		%{name}-conf.patch
 Patch1:		%{name}-absolute_dbpaths.patch
 Patch2:		%{name}-ecpg-includedir.patch
 
-Patch4:		%{name}-disable_horology_test.patch
 Patch5:		%{name}-heimdal.patch
 Patch6:		%{name}-link.patch
 URL:		http://www.postgresql.org/
@@ -79,7 +78,10 @@ BuildRequires:	ncurses-devel >= 5.0
 BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	ossp-uuid-devel
 BuildRequires:	pam-devel
-%{?with_perl:BuildRequires:	perl-devel}
+%if %{with perl}
+BuildRequires:	perl-Scalar-List-Utils
+BuildRequires:	perl-devel
+%endif
 %if %{with python}
 BuildRequires:	python >= 1:2.4
 BuildRequires:	python-devel >= 1:2.4
@@ -97,8 +99,8 @@ Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires(triggerpostun):	/bin/id
-Requires(triggerpostun):	/usr/sbin/usermod
+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
@@ -121,7 +123,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # omitted contribs:
 # spi, test_decoding, worker_spi - examples/tests
 # tsearch2 - old module for compatibility only
-%define	contrib_modules	adminpack auth_delay auto_explain bloom btree_gin btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore %{?with_perl:hstore_plperl} %{?with_python:hstore_plpython} intagg intarray isn lo ltree %{?with_python:ltree_plpython} oid2name pageinspect passwordcheck pg_buffercache pg_freespacemap pg_prewarm pg_standby pg_stat_statements pg_trgm pg_visibility pgcrypto pgrowlocks pgstattuple postgres_fdw seg %{?with_selinux:sepgsql} sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent uuid-ossp vacuumlo xml2
+%define	contrib_modules	adminpack amcheck auth_delay auto_explain bloom btree_gin btree_gist citext cube dblink dict_int dict_xsyn earthdistance file_fdw fuzzystrmatch hstore %{?with_perl:hstore_plperl} %{?with_python:hstore_plpython} intagg intarray isn %{?with_perl:jsonb_plperl} %{?with_python:jsonb_plpython} lo ltree %{?with_python:ltree_plpython} oid2name pageinspect passwordcheck pg_buffercache pg_freespacemap pg_prewarm pg_standby pg_stat_statements pg_trgm pg_visibility pgcrypto pgrowlocks pgstattuple postgres_fdw seg %{?with_selinux:sepgsql} sslinfo tablefunc tcn tsm_system_rows tsm_system_time unaccent uuid-ossp vacuumlo xml2
 
 %description
 PostgreSQL Data Base Management System (formerly known as Postgres,
@@ -788,7 +790,6 @@ Różne moduły dołączone do PostgreSQL-a.
 %{?with_absolute_dbpaths:%patch1 -p1}
 %patch2 -p1
 
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 
@@ -922,7 +923,7 @@ cp -p src/pl/plperl/ppport.h $RPM_BUILD_ROOT%{_includedir}/postgresql/server/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
+%pretrans
 PG_DB_CLUSTERS=""
 if [ -f /etc/sysconfig/postgresql ]; then
 	. /etc/sysconfig/postgresql
@@ -959,6 +960,8 @@ if [ "$foundold" = "1" ]; then
 	echo "http://www.ca.postgresql.org/docs/momjian/upgrade_tips_7.3"
 	exit 1
 fi
+
+%pre
 %groupadd -g 88 -r postgres
 %useradd -M -o -r -u 88 -d /home/services/postgres -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
@@ -1321,6 +1324,7 @@ done
 %attr(755,root,root) %{_bindir}/vacuumlo
 %attr(755,root,root) %{_pgmoduledir}/_int.so
 %attr(755,root,root) %{_pgmoduledir}/adminpack.so
+%attr(755,root,root) %{_pgmoduledir}/amcheck.so
 %attr(755,root,root) %{_pgmoduledir}/auth_delay.so
 %attr(755,root,root) %{_pgmoduledir}/auto_explain.so
 %attr(755,root,root) %{_pgmoduledir}/bloom.so
@@ -1356,6 +1360,8 @@ done
 %{_pgmoduledir}/bitcode/_int.index.bc
 %{_pgmoduledir}/bitcode/adminpack
 %{_pgmoduledir}/bitcode/adminpack.index.bc
+%{_pgmoduledir}/bitcode/amcheck
+%{_pgmoduledir}/bitcode/amcheck.index.bc
 %{_pgmoduledir}/bitcode/auth_delay
 %{_pgmoduledir}/bitcode/auth_delay.index.bc
 %{_pgmoduledir}/bitcode/auto_explain
@@ -1419,6 +1425,8 @@ done
 %endif
 %{_pgsqldir}/adminpack--*.sql
 %{_pgsqldir}/adminpack.control
+%{_pgsqldir}/amcheck--*.sql
+%{_pgsqldir}/amcheck.control
 %{_pgsqldir}/bloom--*.sql
 %{_pgsqldir}/bloom.control
 %{_pgsqldir}/btree_gin--*.sql
@@ -1483,21 +1491,31 @@ done
 %{_pgsqldir}/uuid-ossp.control
 %if %{with perl}
 %attr(755,root,root) %{_pgmoduledir}/hstore_plperl.so
+%attr(755,root,root) %{_pgmoduledir}/jsonb_plperl.so
 %{_pgsqldir}/hstore_plperl--*.sql
 %{_pgsqldir}/hstore_plperl.control
 %{_pgsqldir}/hstore_plperlu--*.sql
 %{_pgsqldir}/hstore_plperlu.control
+%{_pgsqldir}/jsonb_plperl--*.sql
+%{_pgsqldir}/jsonb_plperl.control
+%{_pgsqldir}/jsonb_plperlu--*.sql
+%{_pgsqldir}/jsonb_plperlu.control
 %if %{with llvm}
 %{_pgmoduledir}/bitcode/hstore_plperl
 %{_pgmoduledir}/bitcode/hstore_plperl.index.bc
+%{_pgmoduledir}/bitcode/jsonb_plperl
+%{_pgmoduledir}/bitcode/jsonb_plperl.index.bc
 %endif
 %endif
 %if %{with python}
 %attr(755,root,root) %{_pgmoduledir}/hstore_plpython2.so
+%attr(755,root,root) %{_pgmoduledir}/jsonb_plpython2.so
 %attr(755,root,root) %{_pgmoduledir}/ltree_plpython2.so
 %if %{with llvm}
 %{_pgmoduledir}/bitcode/hstore_plpython2
 %{_pgmoduledir}/bitcode/hstore_plpython2.index.bc
+%{_pgmoduledir}/bitcode/jsonb_plpython2
+%{_pgmoduledir}/bitcode/jsonb_plpython2.index.bc
 %{_pgmoduledir}/bitcode/ltree_plpython2
 %{_pgmoduledir}/bitcode/ltree_plpython2.index.bc
 %endif
@@ -1507,6 +1525,12 @@ done
 %{_pgsqldir}/hstore_plpython2u.control
 %{_pgsqldir}/hstore_plpython3u--*.sql
 %{_pgsqldir}/hstore_plpython3u.control
+%{_pgsqldir}/jsonb_plpythonu--*.sql
+%{_pgsqldir}/jsonb_plpythonu.control
+%{_pgsqldir}/jsonb_plpython2u--*.sql
+%{_pgsqldir}/jsonb_plpython2u.control
+%{_pgsqldir}/jsonb_plpython3u--*.sql
+%{_pgsqldir}/jsonb_plpython3u.control
 %{_pgsqldir}/ltree_plpythonu--*.sql
 %{_pgsqldir}/ltree_plpythonu.control
 %{_pgsqldir}/ltree_plpython2u--*.sql