X-Git-Url: https://git.tld-linux.org/?p=packages%2Fpostgresql.git;a=blobdiff_plain;f=postgresql.spec;h=3107fa035ecf2bf2599ca5a2a48d868fbc3bed90;hp=6cc0fe87ffd4bddb9fb95c4afbf9ffb2c0552d70;hb=e59fb889675baa9f18d7f2a1e276e9f5517bddb5;hpb=e5cd810d1003fb9edafc2ec6fd59e4348fa14f21 diff --git a/postgresql.spec b/postgresql.spec index 6cc0fe8..3107fa0 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -14,8 +14,8 @@ # %define beta %{nil} -%define pgver 10 -%define pgminver 5 +%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%{pgver} -Version: %{pgver}.%{pgminver} -Release: 1.1 +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 @@ -45,6 +45,7 @@ Patch3: per-version-dirs.patch Patch4: postgresql-disable_horology_test.patch Patch5: postgresql-heimdal.patch Patch6: postgresql-link.patch +Patch7: socket-dir-fixes.patch URL: http://www.postgresql.org/ BuildRequires: autoconf >= 2.69 BuildRequires: automake @@ -85,19 +86,20 @@ Requires(pre): /bin/id Requires(pre): /usr/bin/getgid Requires(triggerpostun): /bin/id Requires(triggerpostun): /usr/sbin/usermod -Requires: %{name}-clients >= %{version}-%{release} +Requires: %{name}-clients = %{version}-%{release} Requires: %{name}-dirs = %{version}-%{release} -Requires: postgresql-libs = %{version}-%{release} +Requires: postgresql-libs >= %{version}-%{release} Requires: rc-scripts >= 0.4.3.0 Requires: tzdata +Obsoletes: postgresql Obsoletes: postgresql-module-plpgsql Obsoletes: postgresql-module-tsearch2 Obsoletes: postgresql-server Obsoletes: postgresql-test BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define pgsqldatadir %{_datadir}/postgresql/%{pgver} -%define pgsqllibdir %{_libdir}/postgresql/%{pgver} +%define pgsqldatadir %{_datadir}/postgresql/%{pgsqlversion} +%define pgsqllibdir %{_libdir}/postgresql/%{pgsqlversion} %define moduledir %{pgsqllibdir}/lib %define extensiondir %{pgsqldatadir}/extension @@ -106,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, @@ -184,15 +186,16 @@ Common PostgreSQL files and directories. PostgreSQL - wspólne pliki i katalogi. %package dirs -Summary: Common directories for PostgresSQL %{pgver} -Summary(pl.UTF-8): Wspólne pliki i katalogi dla PostgreSQL %{pgver} +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 %{pgver} +Common directories for PostgresSQL %{pgsqlversion} %description dirs -l pl.UTF-8 -Wspólne pliki i katalogi dla PostgreSQL %{pgver} +Wspólne pliki i katalogi dla PostgreSQL %{pgsqlversion} %package -n postgresql-devel Summary: PostgreSQL development header files and libraries @@ -206,7 +209,7 @@ Summary(tr.UTF-8): PostgreSQL başlık dosyaları ve kitaplıklar Summary(uk.UTF-8): PostgreSQL - хедери та бібліотеки програміста Group: Development/Libraries Requires: alternatives -Requires: postgresql-libs = %{version}-%{release} +Requires: postgresql-libs >= %{version}-%{release} %description -n postgresql-devel This package contains header files and libraries required to compile @@ -221,8 +224,9 @@ aplikacji łączących się bezpośrednio z serwerem PostgreSQL. Summary: PostgreSQL backend development header files Summary(pl.UTF-8): PostgreSQL - pliki nagłówkowe dla backendu Group: Development/Libraries -Requires: postgresql-devel = %{version}-%{release} -Requires: postgresql-libs = %{version}-%{release} +Requires: postgresql-devel >= %{version}-%{release} +Requires: postgresql-libs >= %{version}-%{release} +Obsoletes: postgresql-backend-devel %description backend-devel This package contains header files required to compile functions that @@ -242,7 +246,8 @@ Summary(uk.UTF-8): Клієнтські програми, необхідні д Group: Applications/Databases Requires: alternatives Requires: %{name}-dirs = %{version}-%{release} -Requires: postgresql-libs = %{version}-%{release} +Requires: postgresql-libs >= %{version}-%{release} +Obsoletes: postgresql-clients %description clients This package includes only the clients needed to access an PostgreSQL @@ -260,6 +265,7 @@ poleceń. Serwer znajduje się w głównym pakiecie. Summary: Documentation for PostgreSQL Summary(pl.UTF-8): Dodatkowa dokumantacja dla PostgreSQL Group: Applications/Databases +Obsoletes: postgresql-doc %description doc This package includes documentation and HOWTO for programmer, admin @@ -276,7 +282,7 @@ Summary(pl.UTF-8): Biblioteki dzielone programu PostgreSQL Summary(pt_BR.UTF-8): Biblioteca compartilhada do PostgreSQL Summary(zh_CN.UTF-8): PostgreSQL 客户所需要的共享库 Group: Libraries -Requires: postgresql-common = %{version}-%{release} +Requires: postgresql-common >= %{version}-%{release} %description -n postgresql-libs PostgreSQL shared libraries. @@ -289,8 +295,9 @@ Summary: Embedded SQL in C interface Summary(pl.UTF-8): Interfejs wbudowanego SQL-a w język C Group: Libraries Requires: %{name}-dirs = %{version}-%{release} -Requires: postgresql-libs = %{version}-%{release} -Requires: postgresql-ecpg-libs = %{version}-%{release} +Requires: postgresql-libs >= %{version}-%{release} +Requires: postgresql-ecpg-libs >= %{version}-%{release} +Obsoletes: postgresql-ecpg %description ecpg Embedded SQL in C interface. @@ -316,8 +323,8 @@ Biblioteki dzielone programu PostgreSQL. Summary: Embedded SQL in C interface files Summary(pl.UTF-8): Pliki programistyczne interfejsu wbudowanego SQL-a w język C Group: Development/Libraries -Requires: postgresql-devel = %{version}-%{release} -Requires: postgresql-ecpg-devel = %{version}-%{release} +Requires: postgresql-devel >= %{version}-%{release} +Requires: postgresql-ecpg-devel >= %{version}-%{release} %description -n postgresql-ecpg-devel Embedded SQL in C interface files. @@ -333,7 +340,7 @@ Summary(pt_BR.UTF-8): Bibliotecas estáticas PostgreSQL Summary(ru.UTF-8): Статические библиотеки для программирования с PostgreSQL Summary(uk.UTF-8): Статичні бібліотеки для програмування з PostgreSQL Group: Development/Libraries -Requires: postgresql-devel = %{version}-%{release} +Requires: postgresql-devel >= %{version}-%{release} %description -n postgresql-ecpg-static PostgreSQL static libraries. @@ -349,7 +356,7 @@ Summary(pt_BR.UTF-8): Bibliotecas estáticas PostgreSQL Summary(ru.UTF-8): Статические библиотеки для программирования с PostgreSQL Summary(uk.UTF-8): Статичні бібліотеки для програмування з PostgreSQL Group: Development/Libraries -Requires: postgresql-devel = %{version}-%{release} +Requires: postgresql-devel >= %{version}-%{release} %description -n postgresql-static PostgreSQL static libraries. @@ -362,6 +369,7 @@ Summary: PL/perl - PostgreSQL procedural language Summary(pl.UTF-8): PL/perl - język proceduralny bazy danych PostgreSQL Group: Applications/Databases Requires: %{name} = %{version}-%{release} +Obsoletes: postgresql-module-plperl %description module-plperl From PostgreSQL documentation: @@ -397,6 +405,7 @@ Summary(pl.UTF-8): PL/Python - język proceduralny bazy danych PostgreSQL Group: Applications/Databases Requires: %{name} = %{version}-%{release} %pyrequires_eq python +Obsoletes: postgresql-module-plpython %description module-plpython From PostgreSQL documentation: @@ -432,6 +441,7 @@ Summary(pl.UTF-8): PL/Tcl - język proceduralny bazy danych PostgreSQL Group: Applications/Databases Requires: %{name} = %{version}-%{release} Requires: tcl(Pgtcl) +Obsoletes: postgresql-module-pltcl %description module-pltcl From PostgreSQL documentation: @@ -466,6 +476,7 @@ Summary: dblink module for PostgreSQL Summary(pl.UTF-8): Moduł dblink dla PostgreSQL-a Group: Applications/Databases Requires: %{name} = %{version}-%{release} +Obsoletes: postgresql-module-dblink %description module-dblink dblink module for PostgreSQL provides functions returning results from @@ -480,6 +491,7 @@ Summary: Large Objects module for PostgreSQL Summary(pl.UTF-8): Moduł Large Objects dla PostgreSQL-a Group: Applications/Databases Requires: %{name} = %{version}-%{release} +Obsoletes: postgresql-module-lo %description module-lo Large Objects module for PostgreSQL adds a new data type 'lo', some @@ -495,6 +507,7 @@ Summary: Trigram matching for PostgreSQL Summary(pl.UTF-8): Dopasowanie trigramowe dla PostgreSQL-a Group: Applications/Databases Requires: %{name} = %{version}-%{release} +Obsoletes: postgresql-module-pg_trgm %description module-pg_trgm This module provides functions and index classes for determining the @@ -509,6 +522,7 @@ Summary: Cryptographic functions for PostgreSQL Summary(pl.UTF-8): Funkcje kryptograficzne dla PostgreSQL-a Group: Applications/Databases Requires: %{name} = %{version}-%{release} +Obsoletes: postgresql-module-pgcrypto %description module-pgcrypto Cryptographic functions for PostgreSQL. @@ -522,6 +536,7 @@ Summary(pl.UTF-8): Zewnętrzny moduł bezpieczeństwa PostgreSQL-a wykorzystują Group: Applications/Databases Requires: %{name} = %{version}-%{release} Requires: libselinux >= 2.1.10 +Obsoletes: postgresql-module-sepgsql %description module-sepgsql PostgreSQL external security provider using SELinux. @@ -534,6 +549,7 @@ Summary: crosstab functions for PostgreSQL Summary(pl.UTF-8): Funkcje crosstab dla PostgreSQL-a Group: Applications/Databases Requires: %{name} = %{version}-%{release} +Obsoletes: postgresql-module-tablefunc %description module-tablefunc crosstab functions for PostgreSQL. @@ -547,6 +563,7 @@ Summary(pl.UTF-8): Funkcje do obsługi XML-a dla PostgreSQL-a Group: Applications/Databases Requires: %{name} = %{version}-%{release} Requires: libxml2 >= 1:2.6.23 +Obsoletes: postgresql-module-xml2 %description module-xml2 Module with XML functions provides both XPath querying and XSLT @@ -563,6 +580,7 @@ Summary: Miscellaneous PostgreSQL contrib modules Summary(pl.UTF-8): Różne moduły dołączone do PostgreSQL-a Group: Applications/Databases Requires: %{name} = %{version}-%{release} +Obsoletes: postgresql-contrib %description contrib Miscellaneous PostgreSQL contrib modules. @@ -579,6 +597,7 @@ 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 @@ -600,6 +619,7 @@ find src -name \*.l -o -name \*.y | xargs touch --datadir=%{pgsqldatadir} \ --libdir=%{_libdir} \ --docdir=%{pgsqldatadir}/doc \ + --localedir=%{_datadir}/locale \ --disable-rpath \ --enable-depend \ %{?with_systemtap:--enable-dtrace} \ @@ -640,10 +660,9 @@ 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} \ + $RPM_BUILD_ROOT/var/{lib/postgresql/%{pgsqlversion},log,run/postgresql} \ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ - $RPM_BUILD_ROOT%{_mandir} \ - $RPM_BUILD_ROOT/home/services/postgres + $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} install src/tutorial/*.sql $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} @@ -664,8 +683,8 @@ done touch $RPM_BUILD_ROOT/var/log/pgsql -sed -e 's,@pgsqlbindir@,%{pgsqllibdir}/bin,g' %{SOURCE1} >$RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql10 -install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/postgresql10 +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 @@ -679,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-%{pgver} + %find_lang $f-%{pgsqlversion} done # merge locales merge_lang() { - cat $(for f in $@; do echo ${f}-%{pgver}.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 @@ -691,14 +710,17 @@ merge_lang psql initdb \ pg_archivecleanup pg_ctl pg_dump > clients.lang %if %{with tcl} -%find_lang pltcl-%{pgver} +%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/%{pgver}/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 # package it...? nah, why bother. %{__rm} -r $RPM_BUILD_ROOT%{pgsqldatadir}/doc/html @@ -708,8 +730,8 @@ rm -rf $RPM_BUILD_ROOT %pre PG_DB_CLUSTERS="" -if [ -f /etc/sysconfig/postgresql10 ]; then - . /etc/sysconfig/postgresql10 +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 @@ -717,7 +739,7 @@ fi foundold=0 for pgdir in $PG_DB_CLUSTERS; do if [ -f $pgdir/PG_VERSION ]; then - if [ $(cat $pgdir/PG_VERSION) != '%{pgver}' ]; then + if [ $(cat $pgdir/PG_VERSION) != '%{pgsqlversion}' ]; then echo "Found database(s) in older, incompatible format in cluster $pgdir." foundold=1 fi @@ -736,64 +758,75 @@ if [ "$foundold" = "1" ]; then exit 1 fi -%triggerpostun -- %{name} < 7.2-2 +%triggerpostun -- postgresql < 10.5-2 if [ -n "`/bin/id -u postgres 2>/dev/null`" ]; then - /usr/sbin/usermod -d /home/services/postgres 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/postgresql//" +echo +echo "where 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*" +echo "files so they reflect your changes." +echo %post -/sbin/chkconfig --add postgresql10 -%service postgresql10 restart "postgresql10 server" +/sbin/chkconfig --add postgresql-%{pgsqlversion} +%service postgresql-%{pgsqlversion} restart "postgresql-%{pgsqlversion} server" %preun if [ "$1" = "0" ]; then - %service postgresql10 stop - /sbin/chkconfig --del postgresql10 + %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 /home/services/postgres -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 -%post clients +%posttrans clients update-alternatives \ - --install %{_bindir}/clusterdb clusterdb %{pgsqllibdir}/bin/clusterdb %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --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 %{pgver}%{pgminver} \ + --install %{_bindir}/vacuumdb vacuumdb %{pgsqllibdir}/bin/vacuumdb %{pgsqlpriority} \ --slave %{_mandir}/man1/vacuumdb.1 vacuumdb.1 %{pgsqldatadir}/man/man1/vacuumdb.1* || : %postun clients @@ -813,15 +846,9 @@ if [ $1 -eq 0 ]; then update-alternatives --remove vacuumdb %{pgsqllibdir}/bin/vacuumdb || : fi -%post -n postgresql-devel -update-alternatives \ - --install %{_bindir}/pg_config pg_config %{pgsqllibdir}/bin/pg_config %{pgver}%{pgminver} \ - --slave %{_mandir}/man1/pg_config.1 pg_config.1 %{pgsqldatadir}/man/man1/pg_config.1* || : - %postun -n postgresql-devel update-alternatives --remove pg_config %{pgsqllibdir}/bin/pg_config || : - %post -n postgresql-libs -p /sbin/ldconfig %postun -n postgresql-libs -p /sbin/ldconfig @@ -831,8 +858,8 @@ update-alternatives \ %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/postgresql10 -%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql10 +%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 @@ -845,6 +872,7 @@ update-alternatives \ %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 @@ -878,8 +906,6 @@ update-alternatives \ %dir %{pgsqldatadir}/contrib -%attr(700,postgres,postgres) /home/services/postgres -%attr(700,postgres,postgres) %dir /var/lib/pgsql %attr(640,postgres,postgres) %config(noreplace) %verify(not md5 mtime size) /var/log/pgsql %{pgsqldatadir}/man/man1/initdb.1* @@ -894,6 +920,7 @@ update-alternatives \ %{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* @@ -902,6 +929,8 @@ update-alternatives \ %defattr(644,root,root,755) %dir %{_libdir}/postgresql %dir %{_datadir}/postgresql +%attr(700,postgres,postgres) %dir /var/lib/postgresql +%attr(700,postgres,postgres) %dir /var/run/postgresql %files dirs %defattr(644,root,root,755) @@ -913,23 +942,24 @@ update-alternatives \ %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-%{pgver}.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-%{pgver}.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-%{pgver}.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.*.* @@ -953,9 +983,9 @@ update-alternatives \ %{_libdir}/libecpg_compat.a %{_libdir}/libpgtypes.a -%files -n postgresql-devel -f pg_config-%{pgver}.lang +%files -n postgresql-devel -f pg_config-%{pgsqlversion}.lang %defattr(644,root,root,755) -%attr(755,root,root) %{pgsqllibdir}/bin/pg_config +%attr(755,root,root) %{_bindir}/pg_config %attr(755,root,root) %{_libdir}/libpq.so %dir %{_includedir}/postgresql %{_includedir}/libpq-events.h @@ -974,12 +1004,12 @@ update-alternatives \ %{_includedir}/postgresql/internal/libpq %{_includedir}/libpq %{_libdir}/pkgconfig/libpq.pc -%{pgsqldatadir}/man/man1/pg_config.1* +%{_mandir}/man1/pg_config.1* %files backend-devel %defattr(644,root,root,755) -%dir %{_includedir}/postgresql/%{pgver} -%{_includedir}/postgresql/%{pgver}/server +%dir %{_includedir}/postgresql/%{pgsqlversion} +%{_includedir}/postgresql/%{pgsqlversion}/server %dir %{moduledir}/pgxs %attr(755,root,root) %{moduledir}/pgxs/config %{moduledir}/pgxs/src @@ -1024,7 +1054,7 @@ update-alternatives \ %{pgsqldatadir}/man/man7/*.7* %if %{with perl} -%files module-plperl -f plperl-%{pgver}.lang +%files module-plperl -f plperl-%{pgsqlversion}.lang %defattr(644,root,root,755) %attr(755,root,root) %{moduledir}/plperl.so %{extensiondir}/plperl--*.sql @@ -1034,7 +1064,7 @@ update-alternatives \ %endif %if %{with python} -%files module-plpython -f plpython-%{pgver}.lang +%files module-plpython -f plpython-%{pgsqlversion}.lang %defattr(644,root,root,755) %attr(755,root,root) %{moduledir}/plpython2.so %{extensiondir}/plpython*--*.sql @@ -1042,7 +1072,7 @@ update-alternatives \ %endif %if %{with tcl} -%files module-pltcl -f pltcl-%{pgver}.lang +%files module-pltcl -f pltcl-%{pgsqlversion}.lang %defattr(644,root,root,755) %attr(755,root,root) %{moduledir}/pltcl.so %{extensiondir}/pltcl*--*.sql @@ -1106,7 +1136,6 @@ update-alternatives \ %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 @@ -1140,8 +1169,6 @@ update-alternatives \ %{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