- locales are versioned, keep them in system datadir

- fix internal deps

diff --git a/postgresql.spec b/postgresql.spec
index f1841ac191ab572273a43dda269c56adcbe864cf..dc291b8b7b7d0f16cb5717d201267a7f85074414 100644 (file)
--- 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
@@ -187,8 +187,8 @@ Wspólne pliki i katalogi dla PostgreSQL %{pgversion}
 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
@@ -209,7 +209,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
@@ -243,8 +243,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
@@ -508,6 +508,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} \