X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=ddc3de01e202bdd400263c0071065c0bebd8d67b;hb=refs%2Fheads%2FPGSQL_10;hp=5163b5e110ea4b46b4a632342330b467ee3f9991;hpb=a6aaf40a53ea1e550e99c787c07a60a0255149cd;p=packages%2Fpostgresql.git diff --git a/postgresql.spec b/postgresql.spec index 5163b5e..ddc3de0 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}.5 -Release: 2 +Version: %{pgsqlversion}.23 +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: 9dee14aaa9843206d20a952be465e01e Source1: postgresql.init Source2: pgsql-Database-HOWTO-html.tar.gz # Source2-md5: 5b656ddf1db41965761f85204a14398e @@ -42,10 +42,12 @@ Patch0: postgresql-conf.patch Patch1: postgresql-absolute_dbpaths.patch Patch2: postgresql-ecpg-includedir.patch Patch3: per-version-dirs.patch -Patch4: postgresql-disable_horology_test.patch +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} @@ -172,23 +174,11 @@ PostgreSQL. PostgreSQL może być uruchomiony pod następującymi systemami: Solaris, SunOS, HPUX, AIX, Linux, Irix, FreeBSD i innymi systemami uniksowymi. -%package -n postgresql-common -Summary: Common PostgreSQL files and directories -Summary(pl.UTF-8): PostgreSQL - wspólne pliki i katalogi -Group: Applicataion/Databases -Requires(pre): /usr/sbin/groupadd -Requires(pre): /usr/sbin/useradd - -%description -n postgresql-common -Common PostgreSQL files and directories. - -%description -n postgresql-common -l pl.UTF-8 -PostgreSQL - wspólne pliki i katalogi. - %package dirs 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 %{pgsqlversion} @@ -196,29 +186,6 @@ Common directories for PostgresSQL %{pgsqlversion} %description dirs -l pl.UTF-8 Wspólne pliki i katalogi dla PostgreSQL %{pgsqlversion} -%package -n postgresql-devel -Summary: PostgreSQL development header files and libraries -Summary(de.UTF-8): PostgreSQL-Entwicklungs-Header-Dateien und Libraries -Summary(es.UTF-8): Archivos de inclusión y bibliotecas PostgreSQL -Summary(fr.UTF-8): En-têtes et bibliothèques de développement PostgreSQL -Summary(pl.UTF-8): PostgreSQL - pliki nagłówkowe i biblioteki -Summary(pt_BR.UTF-8): Arquivos de inclusão e bibliotecas para desenvolvimento com o PostgreSQL -Summary(ru.UTF-8): PostgreSQL - хедеры и библиотеки разработчика -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} - -%description -n postgresql-devel -This package contains header files and libraries required to compile -applications that are talking directly to the PostgreSQL backend -server. - -%description -n postgresql-devel -l pl.UTF-8 -Pakiet zawiera nagłówki oraz biblioteki wymagane do kompilacji -aplikacji łączących się bezpośrednio z serwerem PostgreSQL. - %package backend-devel Summary: PostgreSQL backend development header files Summary(pl.UTF-8): PostgreSQL - pliki nagłówkowe dla backendu @@ -274,21 +241,6 @@ etc., in HTML format. Pakiet ten zawiera dokumentację oraz HOWTO m.in. dla programistów, administratorów w formacie HTML. -%package -n postgresql-libs -Summary: PostgreSQL libraries -Summary(es.UTF-8): Biblioteca compartida del PostgreSQL -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} - -%description -n postgresql-libs -PostgreSQL shared libraries. - -%description -n postgresql-libs -l pl.UTF-8 -Biblioteki dzielone programu PostgreSQL. - %package ecpg Summary: Embedded SQL in C interface Summary(pl.UTF-8): Interfejs wbudowanego SQL-a w język C @@ -304,65 +256,6 @@ Embedded SQL in C interface. %description ecpg -l pl.UTF-8 Interfejs wbudowanego SQL-a w język C. -%package -n postgresql-ecpg-libs -Summary: PostgreSQL libraries -Summary(es.UTF-8): Biblioteca compartida del PostgreSQL -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 - -%description -n postgresql-ecpg-libs -PostgreSQL shared libraries. - -%description -n postgresql-ecpg-libs -l pl.UTF-8 -Biblioteki dzielone programu PostgreSQL. - -%package -n postgresql-ecpg-devel -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} - -%description -n postgresql-ecpg-devel -Embedded SQL in C interface files. - -%description -n postgresql-ecpg-devel -l pl.UTF-8 -Pliki programistyczne interfejsu wbudowanego SQL-a w język C. - -%package -n postgresql-ecpg-static -Summary: PostgreSQL static libraries -Summary(es.UTF-8): Bibliotecas estaticas PostgreSQL -Summary(pl.UTF-8): Biblioteki statyczne programu PostgreSQL -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} - -%description -n postgresql-ecpg-static -PostgreSQL static libraries. - -%description -n postgresql-ecpg-static -l pl.UTF-8 -Biblioteki statyczne programu PostgreSQL. - -%package -n postgresql-static -Summary: PostgreSQL static libraries -Summary(es.UTF-8): Bibliotecas estaticas PostgreSQL -Summary(pl.UTF-8): Biblioteki statyczne programu PostgreSQL -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} - -%description -n postgresql-static -PostgreSQL static libraries. - -%description -n postgresql-static -l pl.UTF-8 -Biblioteki statyczne programu PostgreSQL. - %package module-plperl Summary: PL/perl - PostgreSQL procedural language Summary(pl.UTF-8): PL/perl - język proceduralny bazy danych PostgreSQL @@ -403,7 +296,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 @@ -597,6 +490,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 @@ -659,7 +554,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/{archive,}/postgresql,run/postgresql} \ $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \ $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1} @@ -680,8 +575,6 @@ for mod in %{contrib_modules}; do \ DESTDIR=$RPM_BUILD_ROOT done -touch $RPM_BUILD_ROOT/var/log/pgsql - 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} @@ -689,8 +582,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 @@ -718,12 +611,14 @@ merge_lang psql initdb \ 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 +# remove common files provided by PostgreSQL from master branch +%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/{ecpg*,libpq*,pg_config*,postgres_ext.h,postgresql/internal} +%{__rm} -r $RPM_BUILD_ROOT{%{_libdir}/{libecpg*,libpg*,libpq*,pkgconfig},%{pgsqllibdir}/bin/pg_config,%{pgsqldatadir}/man/man1/pg_config.1*} +%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/{ecpglib*,libpq*,pg_config*} + %clean rm -rf $RPM_BUILD_ROOT @@ -759,14 +654,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//" +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*" @@ -783,10 +678,6 @@ if [ "$1" = "0" ]; then /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 - %posttrans clients update-alternatives \ --install %{_bindir}/clusterdb clusterdb %{pgsqllibdir}/bin/clusterdb %{pgsqlpriority} \ @@ -845,15 +736,6 @@ if [ $1 -eq 0 ]; then update-alternatives --remove vacuumdb %{pgsqllibdir}/bin/vacuumdb || : fi -%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 - -%post -n postgresql-ecpg-libs -p /sbin/ldconfig -%postun -n postgresql-ecpg-libs -p /sbin/ldconfig - %files -f main.lang %defattr(644,root,root,755) %doc COPYRIGHT README HISTORY doc/{bug.template,KNOWN_BUGS,MISSING_FEATURES,TODO} @@ -904,8 +786,6 @@ fi %dir %{pgsqldatadir}/contrib -%attr(640,postgres,postgres) %config(noreplace) %verify(not md5 mtime size) /var/log/pgsql - %{pgsqldatadir}/man/man1/initdb.1* %{pgsqldatadir}/man/man1/pg_basebackup.1* %{pgsqldatadir}/man/man1/pg_controldata.1* @@ -922,13 +802,6 @@ fi %{pgsqldatadir}/man/man1/postgres.1* %{pgsqldatadir}/man/man1/postmaster.1* -%files -n postgresql-common -%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/run/postgresql - %files dirs %defattr(644,root,root,755) %dir %{pgsqllibdir} @@ -939,69 +812,18 @@ 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-%{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-%{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-%{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.*.* -%attr(755,root,root) %ghost %{_libdir}/libecpg_compat.so.3 -%attr(755,root,root) %{_libdir}/libpgtypes.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libpgtypes.so.3 - -%files -n postgresql-ecpg-devel -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libecpg.so -%attr(755,root,root) %{_libdir}/libecpg_compat.so -%attr(755,root,root) %{_libdir}/libpgtypes.so -%{_includedir}/ecpg* -%{_libdir}/pkgconfig/libecpg.pc -%{_libdir}/pkgconfig/libecpg_compat.pc -%{_libdir}/pkgconfig/libpgtypes.pc - -%files -n postgresql-ecpg-static -%defattr(644,root,root,755) -%{_libdir}/libecpg.a -%{_libdir}/libecpg_compat.a -%{_libdir}/libpgtypes.a - -%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 -%dir %{_includedir}/postgresql -%{_includedir}/libpq-events.h -%{_includedir}/libpq-fe.h -%{_includedir}/pg_config.h -%{_includedir}/pg_config_ext.h -%{_includedir}/pg_config_manual.h -%{_includedir}/pg_config_os.h -%{_includedir}/postgres_ext.h -%dir %{_includedir}/postgresql/internal -%{_includedir}/postgresql/internal/c.h -%{_includedir}/postgresql/internal/libpq-int.h -%{_includedir}/postgresql/internal/port.h -%{_includedir}/postgresql/internal/postgres_fe.h -%{_includedir}/postgresql/internal/pqexpbuffer.h -%{_includedir}/postgresql/internal/libpq -%{_includedir}/libpq -%{_libdir}/pkgconfig/libpq.pc -%{_mandir}/man1/pg_config.1* - %files backend-devel %defattr(644,root,root,755) %dir %{_includedir}/postgresql/%{pgsqlversion} @@ -1011,13 +833,6 @@ fi %{moduledir}/pgxs/src %{pgsqldatadir}/man/man3/SPI_*.3* -%files -n postgresql-static -%defattr(644,root,root,755) -%{_libdir}/libpq.a -%{_libdir}/libpgcommon.a -%{_libdir}/libpgfeutils.a -%{_libdir}/libpgport.a - %files clients -f clients.lang %defattr(644,root,root,755) %attr(755,root,root) %{pgsqllibdir}/bin/clusterdb @@ -1062,7 +877,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 @@ -1232,8 +1047,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