X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=c2321792a923ed64e7dd21f211e7f2e6b7cb52cd;hb=4bca851f304df1dead803ed2e5a1ae9f1839e4b4;hp=c3d930f08ec269aea07420ad46c98a6bd0bcaae4;hpb=816502c06555f626f9ab617caaa7e138cb011e72;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index c3d930f..c232179 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -27,8 +27,8 @@ 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%{pgsuffix}
-Version:	9.6.10
+Name:		postgresql-%{pgversion}
+Version:	%{pgversion}.10
 Release:	1
 License:	BSD
 Group:		Applications/Databases
@@ -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} \
@@ -571,7 +572,7 @@ done
 
 touch $RPM_BUILD_ROOT/var/log/pgsql
 
-sed -e 's,@pgsqlbindir@,%{pgsqllibdir}/bin,g' %{SOURCE1} >$RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql-%{pgversion}
+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}
 
 install -d howto
@@ -613,7 +614,7 @@ cp -p src/pl/plperl/ppport.h $RPM_BUILD_ROOT%{_includedir}/postgresql/%{pgversio
 # 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%{pgsqldatadir}/share/locale/*/LC_MESSAGES/{ecpglib*,libpq*,pg_config*}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/{ecpglib*,libpq*,pg_config*}
 
 %clean
 rm -rf $RPM_BUILD_ROOT