X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpostgresql.git;a=blobdiff_plain;f=postgresql.spec;h=3107fa035ecf2bf2599ca5a2a48d868fbc3bed90;hp=be0c399544eac6255f59a57753adcea079202e8e;hb=e59fb889675baa9f18d7f2a1e276e9f5517bddb5;hpb=0cbb2a25fa3d72388c8f34691f84c24abd7193ea

diff --git a/postgresql.spec b/postgresql.spec
index be0c399..3107fa0 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -14,8 +14,8 @@
 #
 
 %define beta %{nil}
-%define pgversion 10
-%define pgsuffix 10
+%define pgsqlversion 11
+%define pgsqlpriority 110
 
 Summary:	PostgreSQL Data Base Management System
 Summary(de.UTF-8):	PostgreSQL Datenbankverwaltungssystem
@@ -27,13 +27,13 @@ Summary(ru.UTF-8):	PostgreSQL - система управления базами
 Summary(tr.UTF-8):	Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):	PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
-Name:		postgresql-%{pgversion}
-Version:	%{pgversion}.5
-Release:	2
+Name:		postgresql-%{pgsqlversion}
+Version:	%{pgsqlversion}.0
+Release:	1
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
-# Source0-md5:	a5fe5fdff2d6c28f65601398be0950df
+# Source0-md5:	338ede84c0443db02ff6e8c4c8cbc5e9
 Source1:	postgresql.init
 Source2:	pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5:	5b656ddf1db41965761f85204a14398e
@@ -98,8 +98,8 @@ Obsoletes:	postgresql-server
 Obsoletes:	postgresql-test
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		pgsqldatadir	%{_datadir}/postgresql/%{pgversion}
-%define		pgsqllibdir	%{_libdir}/postgresql/%{pgversion}
+%define		pgsqldatadir	%{_datadir}/postgresql/%{pgsqlversion}
+%define		pgsqllibdir	%{_libdir}/postgresql/%{pgsqlversion}
 %define		moduledir	%{pgsqllibdir}/lib
 %define		extensiondir	%{pgsqldatadir}/extension
 
@@ -108,7 +108,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 chkpass 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 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
 
 %description
 PostgreSQL Data Base Management System (formerly known as Postgres,
@@ -186,15 +186,16 @@ Common PostgreSQL files and directories.
 PostgreSQL - wspólne pliki i katalogi.
 
 %package dirs
-Summary:	Common directories for PostgresSQL %{pgversion}
-Summary(pl.UTF-8):	Wspólne pliki i katalogi dla PostgreSQL %{pgversion}
+Summary:	Common directories for PostgresSQL %{pgsqlversion}
+Summary(pl.UTF-8):	Wspólne pliki i katalogi dla PostgreSQL %{pgsqlversion}
 Group:		Applicataion/Databases
+Requires:	postgresql-common >= %{version}-%{release}
 
 %description dirs
-Common directories for PostgresSQL %{pgversion}
+Common directories for PostgresSQL %{pgsqlversion}
 
 %description dirs -l pl.UTF-8
-Wspólne pliki i katalogi dla PostgreSQL %{pgversion}
+Wspólne pliki i katalogi dla PostgreSQL %{pgsqlversion}
 
 %package -n postgresql-devel
 Summary:	PostgreSQL development header files and libraries
@@ -659,7 +660,7 @@ done
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
-	$RPM_BUILD_ROOT/var/{lib/pgsql,log,run/postgresql} \
+	$RPM_BUILD_ROOT/var/{lib/postgresql/%{pgsqlversion},log,run/postgresql} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
@@ -682,8 +683,8 @@ done
 
 touch $RPM_BUILD_ROOT/var/log/pgsql
 
-sed -e 's,@pgsqlbindir@,%{pgsqllibdir}/bin,g; s,@pgsqlversion@,%{pgversion},g;' %{SOURCE1} >$RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql-%{pgversion}
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/postgresql-%{pgversion}
+sed -e 's,@pgsqlbindir@,%{pgsqllibdir}/bin,g; s,@pgsqlversion@,%{pgsqlversion},g;' %{SOURCE1} >$RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql-%{pgsqlversion}
+sed -e 's,@pgsqlversion@,%{pgsqlversion},g;' %{SOURCE3} >$RPM_BUILD_ROOT/etc/sysconfig/postgresql-%{pgsqlversion}
 
 install -d howto
 tar zxf %{SOURCE2} -C howto
@@ -697,11 +698,11 @@ tar zxf %{SOURCE2} -C howto
 for f in libpq5 pgscripts postgres psql initdb ecpg ecpglib6 \
 	plpgsql %{?with_perl:plperl} %{?with_python:plpython} \
 	pg_archivecleanup pg_basebackup pg_config pg_controldata pg_ctl pg_dump pg_resetwal pg_rewind pg_test_fsync pg_test_timing pg_upgrade pg_waldump; do
-	%find_lang $f-%{pgversion}
+	%find_lang $f-%{pgsqlversion}
 done
 # merge locales
 merge_lang() {
-	cat $(for f in $@; do echo ${f}-%{pgversion}.lang ; done)
+	cat $(for f in $@; do echo ${f}-%{pgsqlversion}.lang ; done)
 }
 merge_lang pgscripts postgres plpgsql \
 	pg_basebackup pg_controldata pg_resetwal pg_rewind pg_upgrade pg_test_fsync pg_test_timing pg_waldump > main.lang
@@ -709,14 +710,14 @@ merge_lang psql initdb \
 	pg_archivecleanup pg_ctl pg_dump > clients.lang
 
 %if %{with tcl}
-%find_lang pltcl-%{pgversion}
+%find_lang pltcl-%{pgsqlversion}
 %endif
 
 %if %{with selinux}
 %{__mv} $RPM_BUILD_ROOT{%{pgsqldatadir}/contrib,%{extensiondir}}/sepgsql.sql
 %endif
 
-cp -p src/pl/plperl/ppport.h $RPM_BUILD_ROOT%{_includedir}/postgresql/%{pgversion}/server/
+cp -p src/pl/plperl/ppport.h $RPM_BUILD_ROOT%{_includedir}/postgresql/%{pgsqlversion}/server/
 
 %{__mv} $RPM_BUILD_ROOT{%{pgsqllibdir}/bin,%{_bindir}}/pg_config
 %{__mv} $RPM_BUILD_ROOT{%{pgsqldatadir}/man,%{_mandir}}/man1/pg_config.1
@@ -729,8 +730,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 PG_DB_CLUSTERS=""
-if [ -f /etc/sysconfig/postgresql-%{pgversion} ]; then
-	. /etc/sysconfig/postgresql-%{pgversion}
+if [ -f /etc/sysconfig/postgresql-%{pgsqlversion} ]; then
+	. /etc/sysconfig/postgresql-%{pgsqlversion}
 	if [ -z "$PG_DB_CLUSTERS" -a -n "$POSTGRES_DATA_DIR" ]; then
 		PG_DB_CLUSTERS="$POSTGRES_DATA_DIR"
 	fi
@@ -738,7 +739,7 @@ fi
 foundold=0
 for pgdir in $PG_DB_CLUSTERS; do
 	if [ -f $pgdir/PG_VERSION ]; then
-		if [ $(cat $pgdir/PG_VERSION) != '%{pgversion}' ]; then
+		if [ $(cat $pgdir/PG_VERSION) != '%{pgsqlversion}' ]; then
 			echo "Found database(s) in older, incompatible format in cluster $pgdir."
 			foundold=1
 		fi
@@ -759,14 +760,14 @@ fi
 
 %triggerpostun -- postgresql < 10.5-2
 if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then
-	/usr/sbin/usermod -d /var/lib/pgsql postgres
+	/usr/sbin/usermod -d /var/lib/postgresql postgres
 fi
 echo
 echo "This version of PostgreSQL uses new default location for database clusters."
 echo "Please move your existing clusters before starting PostgreSQL so they follow"
 echo "below scheme:"
 echo
-echo "/var/lib/pgsql/<version>/<name>"
+echo "/var/lib/postgresql/<version>/<name>"
 echo
 echo "where <version> means PostgreSQL version like 9.6 or 10 and name is cluster"
 echo "name of your choice. When done, be sure to update /etc/sysconfig/postgresql*"
@@ -774,58 +775,58 @@ echo "files so they reflect your changes."
 echo
 
 %post
-/sbin/chkconfig --add postgresql-%{pgversion}
-%service postgresql-%{pgversion} restart "postgresql-%{pgversion} server"
+/sbin/chkconfig --add postgresql-%{pgsqlversion}
+%service postgresql-%{pgsqlversion} restart "postgresql-%{pgsqlversion} server"
 
 %preun
 if [ "$1" = "0" ]; then
-	%service postgresql-%{pgversion} stop
-	/sbin/chkconfig --del postgresql-%{pgversion}
+	%service postgresql-%{pgsqlversion} stop
+	/sbin/chkconfig --del postgresql-%{pgsqlversion}
 fi
 
 %pre	-n postgresql-common
 %groupadd -g 88 -r postgres
-%useradd -M -o -r -u 88 -d /var/lib/pgsql -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
+%useradd -M -o -r -u 88 -d /var/lib/postgresql -s /bin/sh -g postgres -c "PostgreSQL Server" postgres
 
 %posttrans	clients
 update-alternatives \
-	--install %{_bindir}/clusterdb clusterdb %{pgsqllibdir}/bin/clusterdb %{pgsuffix} \
+	--install %{_bindir}/clusterdb clusterdb %{pgsqllibdir}/bin/clusterdb %{pgsqlpriority} \
 	--slave %{_mandir}/man1/clusterdb.1 clusterdb.1 %{pgsqldatadir}/man/man1/clusterdb.1* || :
 update-alternatives \
-	--install %{_bindir}/createdb createdb %{pgsqllibdir}/bin/createdb %{pgsuffix} \
+	--install %{_bindir}/createdb createdb %{pgsqllibdir}/bin/createdb %{pgsqlpriority} \
 	--slave %{_mandir}/man1/createdb.1 createdb.1 %{pgsqldatadir}/man/man1/createdb.1* || :
 update-alternatives \
-	--install %{_bindir}/createuser createuser %{pgsqllibdir}/bin/createuser %{pgsuffix} \
+	--install %{_bindir}/createuser createuser %{pgsqllibdir}/bin/createuser %{pgsqlpriority} \
 	--slave %{_mandir}/man1/createuser.1 createuser.1 %{pgsqldatadir}/man/man1/createuser.1* || :
 update-alternatives \
-	--install %{_bindir}/dropdb dropdb %{pgsqllibdir}/bin/dropdb %{pgsuffix} \
+	--install %{_bindir}/dropdb dropdb %{pgsqllibdir}/bin/dropdb %{pgsqlpriority} \
 	--slave %{_mandir}/man1/dropdb.1 dropdb.1 %{pgsqldatadir}/man/man1/dropdb.1* || :
 update-alternatives \
-	--install %{_bindir}/dropuser dropuser %{pgsqllibdir}/bin/dropuser %{pgsuffix} \
+	--install %{_bindir}/dropuser dropuser %{pgsqllibdir}/bin/dropuser %{pgsqlpriority} \
 	--slave %{_mandir}/man1/dropuser.1 dropuser.1 %{pgsqldatadir}/man/man1/dropuser.1* || :
 update-alternatives \
-	--install %{_bindir}/pg_archivecleanup pg_archivecleanup %{pgsqllibdir}/bin/pg_archivecleanup %{pgsuffix} \
+	--install %{_bindir}/pg_archivecleanup pg_archivecleanup %{pgsqllibdir}/bin/pg_archivecleanup %{pgsqlpriority} \
 	--slave %{_mandir}/man1/pg_archivecleanup.1 pg_archivecleanup.1 %{pgsqldatadir}/man/man1/pg_archivecleanup.1* || :
 update-alternatives \
-	--install %{_bindir}/pg_dump pg_dump %{pgsqllibdir}/bin/pg_dump %{pgsuffix} \
+	--install %{_bindir}/pg_dump pg_dump %{pgsqllibdir}/bin/pg_dump %{pgsqlpriority} \
 	--slave %{_mandir}/man1/pg_dump.1 pg_dump.1 %{pgsqldatadir}/man/man1/pg_dump.1* || :
 update-alternatives \
-	--install %{_bindir}/pg_dumpall pg_dumpall %{pgsqllibdir}/bin/pg_dumpall %{pgsuffix} \
+	--install %{_bindir}/pg_dumpall pg_dumpall %{pgsqllibdir}/bin/pg_dumpall %{pgsqlpriority} \
 	--slave %{_mandir}/man1/pg_dumpall.1 pg_dumpall.1 %{pgsqldatadir}/man/man1/pg_dumpall.1* || :
 update-alternatives \
-	--install %{_bindir}/pg_isready pg_isready %{pgsqllibdir}/bin/pg_isready %{pgsuffix} \
+	--install %{_bindir}/pg_isready pg_isready %{pgsqllibdir}/bin/pg_isready %{pgsqlpriority} \
 	--slave %{_mandir}/man1/pg_isready.1 pg_isready.1 %{pgsqldatadir}/man/man1/pg_isready.1* || :
 update-alternatives \
-	--install %{_bindir}/pg_restore pg_restore %{pgsqllibdir}/bin/pg_restore %{pgsuffix} \
+	--install %{_bindir}/pg_restore pg_restore %{pgsqllibdir}/bin/pg_restore %{pgsqlpriority} \
 	--slave %{_mandir}/man1/pg_restore.1 pg_restore.1 %{pgsqldatadir}/man/man1/pg_restore.1* || :
 update-alternatives \
-	--install %{_bindir}/psql psql %{pgsqllibdir}/bin/psql %{pgsuffix} \
+	--install %{_bindir}/psql psql %{pgsqllibdir}/bin/psql %{pgsqlpriority} \
 	--slave %{_mandir}/man1/psql.1 pgsql.1 %{pgsqldatadir}/man/man1/psql.1* || :
 update-alternatives \
-	--install %{_bindir}/reindexdb reindexdb %{pgsqllibdir}/bin/reindexdb %{pgsuffix} \
+	--install %{_bindir}/reindexdb reindexdb %{pgsqllibdir}/bin/reindexdb %{pgsqlpriority} \
 	--slave %{_mandir}/man1/reindexdb.1 reindexdb.1 %{pgsqldatadir}/man/man1/reindexdb.1* || :
 update-alternatives \
-	--install %{_bindir}/vacuumdb vacuumdb %{pgsqllibdir}/bin/vacuumdb %{pgsuffix} \
+	--install %{_bindir}/vacuumdb vacuumdb %{pgsqllibdir}/bin/vacuumdb %{pgsqlpriority} \
 	--slave %{_mandir}/man1/vacuumdb.1 vacuumdb.1 %{pgsqldatadir}/man/man1/vacuumdb.1* || :
 
 %postun	clients
@@ -857,8 +858,8 @@ fi
 %files -f main.lang
 %defattr(644,root,root,755)
 %doc COPYRIGHT README HISTORY doc/{bug.template,KNOWN_BUGS,MISSING_FEATURES,TODO}
-%attr(754,root,root) /etc/rc.d/init.d/postgresql-%{pgversion}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql-%{pgversion}
+%attr(754,root,root) /etc/rc.d/init.d/postgresql-%{pgsqlversion}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql-%{pgsqlversion}
 
 %attr(755,root,root) %{pgsqllibdir}/bin/initdb
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_basebackup
@@ -871,6 +872,7 @@ fi
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_test_fsync
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_test_timing
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_upgrade
+%attr(755,root,root) %{pgsqllibdir}/bin/pg_verify_checksums
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_waldump
 %attr(755,root,root) %{pgsqllibdir}/bin/pgbench
 %attr(755,root,root) %{pgsqllibdir}/bin/postgres
@@ -918,6 +920,7 @@ fi
 %{pgsqldatadir}/man/man1/pg_test_fsync.1*
 %{pgsqldatadir}/man/man1/pg_test_timing.1*
 %{pgsqldatadir}/man/man1/pg_upgrade.1*
+%{pgsqldatadir}/man/man1/pg_verify_checksums.1*
 %{pgsqldatadir}/man/man1/pgbench.1*
 %{pgsqldatadir}/man/man1/postgres.1*
 %{pgsqldatadir}/man/man1/postmaster.1*
@@ -926,7 +929,7 @@ fi
 %defattr(644,root,root,755)
 %dir %{_libdir}/postgresql
 %dir %{_datadir}/postgresql
-%attr(700,postgres,postgres) %dir /var/lib/pgsql
+%attr(700,postgres,postgres) %dir /var/lib/postgresql
 %attr(700,postgres,postgres) %dir /var/run/postgresql
 
 %files dirs
@@ -939,23 +942,24 @@ fi
 %dir %{pgsqldatadir}/man/man1
 %dir %{pgsqldatadir}/man/man3
 %dir %{pgsqldatadir}/man/man7
+%attr(700,postgres,postgres) %dir /var/lib/postgresql/%{pgsqlversion}
 
 %files doc
 %defattr(644,root,root,755)
 %doc doc/src/sgml/html howto
 %{_examplesdir}/%{name}-%{version}
 
-%files -n postgresql-libs -f libpq5-%{pgversion}.lang
+%files -n postgresql-libs -f libpq5-%{pgsqlversion}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libpq.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libpq.so.5
 
-%files ecpg -f ecpg-%{pgversion}.lang
+%files ecpg -f ecpg-%{pgsqlversion}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{pgsqllibdir}/bin/ecpg
 %{pgsqldatadir}/man/man1/ecpg.1*
 
-%files -n postgresql-ecpg-libs -f ecpglib6-%{pgversion}.lang
+%files -n postgresql-ecpg-libs -f ecpglib6-%{pgsqlversion}.lang
 %attr(755,root,root) %{_libdir}/libecpg.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libecpg.so.6
 %attr(755,root,root) %{_libdir}/libecpg_compat.so.*.*
@@ -979,7 +983,7 @@ fi
 %{_libdir}/libecpg_compat.a
 %{_libdir}/libpgtypes.a
 
-%files -n postgresql-devel -f pg_config-%{pgversion}.lang
+%files -n postgresql-devel -f pg_config-%{pgsqlversion}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pg_config
 %attr(755,root,root) %{_libdir}/libpq.so
@@ -1004,8 +1008,8 @@ fi
 
 %files backend-devel
 %defattr(644,root,root,755)
-%dir %{_includedir}/postgresql/%{pgversion}
-%{_includedir}/postgresql/%{pgversion}/server
+%dir %{_includedir}/postgresql/%{pgsqlversion}
+%{_includedir}/postgresql/%{pgsqlversion}/server
 %dir %{moduledir}/pgxs
 %attr(755,root,root) %{moduledir}/pgxs/config
 %{moduledir}/pgxs/src
@@ -1050,7 +1054,7 @@ fi
 %{pgsqldatadir}/man/man7/*.7*
 
 %if %{with perl}
-%files module-plperl -f plperl-%{pgversion}.lang
+%files module-plperl -f plperl-%{pgsqlversion}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{moduledir}/plperl.so
 %{extensiondir}/plperl--*.sql
@@ -1060,7 +1064,7 @@ fi
 %endif
 
 %if %{with python}
-%files module-plpython -f plpython-%{pgversion}.lang
+%files module-plpython -f plpython-%{pgsqlversion}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{moduledir}/plpython2.so
 %{extensiondir}/plpython*--*.sql
@@ -1068,7 +1072,7 @@ fi
 %endif
 
 %if %{with tcl}
-%files module-pltcl -f pltcl-%{pgversion}.lang
+%files module-pltcl -f pltcl-%{pgsqlversion}.lang
 %defattr(644,root,root,755)
 %attr(755,root,root) %{moduledir}/pltcl.so
 %{extensiondir}/pltcl*--*.sql
@@ -1132,7 +1136,6 @@ fi
 %attr(755,root,root) %{moduledir}/bloom.so
 %attr(755,root,root) %{moduledir}/btree_gin.so
 %attr(755,root,root) %{moduledir}/btree_gist.so
-%attr(755,root,root) %{moduledir}/chkpass.so
 %attr(755,root,root) %{moduledir}/citext.so
 %attr(755,root,root) %{moduledir}/cube.so
 %attr(755,root,root) %{moduledir}/earthdistance.so
@@ -1166,8 +1169,6 @@ fi
 %{extensiondir}/btree_gin.control
 %{extensiondir}/btree_gist--*.sql
 %{extensiondir}/btree_gist.control
-%{extensiondir}/chkpass--*.sql
-%{extensiondir}/chkpass.control
 %{extensiondir}/citext--*.sql
 %{extensiondir}/citext.control
 %{extensiondir}/cube--*.sql