From 0cbb2a25fa3d72388c8f34691f84c24abd7193ea Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Thu, 23 Aug 2018 11:14:21 +0000 Subject: [PATCH] - locales are versioned, keep them in system datadir - fix internal deps --- postgresql.spec | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index 2293b1b..be0c399 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -86,9 +86,9 @@ 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 @@ -208,7 +208,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 @@ -223,8 +223,8 @@ 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 @@ -245,7 +245,7 @@ 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 @@ -281,7 +281,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. @@ -294,8 +294,8 @@ 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 @@ -322,8 +322,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. @@ -339,7 +339,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. @@ -355,7 +355,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. @@ -618,6 +618,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} \ -- 2.44.0