X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=637739f55430fe5427878db0856a2327f5a0f328;hb=44962adcfeba3528ef6e052440f7f0b91db8448c;hp=2293b1b1b87972833e3cc88f867a69e9b5d8d433;hpb=230376c98dcfe2593cb63bc0ac3ab6474c1ce738;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index 2293b1b..637739f 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -15,7 +15,7 @@
 
 %define beta %{nil}
 %define pgversion 10
-%define pgsuffix 10
+%define pgpriority 100
 
 Summary:	PostgreSQL Data Base Management System
 Summary(de.UTF-8):	PostgreSQL Datenbankverwaltungssystem
@@ -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} \
@@ -788,43 +789,43 @@ fi
 
 %posttrans	clients
 update-alternatives \
-	--install %{_bindir}/clusterdb clusterdb %{pgsqllibdir}/bin/clusterdb %{pgsuffix} \
+	--install %{_bindir}/clusterdb clusterdb %{pgsqllibdir}/bin/clusterdb %{pgpriority} \
 	--slave %{_mandir}/man1/clusterdb.1 clusterdb.1 %{pgsqldatadir}/man/man1/clusterdb.1* || :
 update-alternatives \
-	--install %{_bindir}/createdb createdb %{pgsqllibdir}/bin/createdb %{pgsuffix} \
+	--install %{_bindir}/createdb createdb %{pgsqllibdir}/bin/createdb %{pgpriority} \
 	--slave %{_mandir}/man1/createdb.1 createdb.1 %{pgsqldatadir}/man/man1/createdb.1* || :
 update-alternatives \
-	--install %{_bindir}/createuser createuser %{pgsqllibdir}/bin/createuser %{pgsuffix} \
+	--install %{_bindir}/createuser createuser %{pgsqllibdir}/bin/createuser %{pgpriority} \
 	--slave %{_mandir}/man1/createuser.1 createuser.1 %{pgsqldatadir}/man/man1/createuser.1* || :
 update-alternatives \
-	--install %{_bindir}/dropdb dropdb %{pgsqllibdir}/bin/dropdb %{pgsuffix} \
+	--install %{_bindir}/dropdb dropdb %{pgsqllibdir}/bin/dropdb %{pgpriority} \
 	--slave %{_mandir}/man1/dropdb.1 dropdb.1 %{pgsqldatadir}/man/man1/dropdb.1* || :
 update-alternatives \
-	--install %{_bindir}/dropuser dropuser %{pgsqllibdir}/bin/dropuser %{pgsuffix} \
+	--install %{_bindir}/dropuser dropuser %{pgsqllibdir}/bin/dropuser %{pgpriority} \
 	--slave %{_mandir}/man1/dropuser.1 dropuser.1 %{pgsqldatadir}/man/man1/dropuser.1* || :
 update-alternatives \
-	--install %{_bindir}/pg_archivecleanup pg_archivecleanup %{pgsqllibdir}/bin/pg_archivecleanup %{pgsuffix} \
+	--install %{_bindir}/pg_archivecleanup pg_archivecleanup %{pgsqllibdir}/bin/pg_archivecleanup %{pgpriority} \
 	--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 %{pgsuffix} \
+	--install %{_bindir}/pg_dump pg_dump %{pgsqllibdir}/bin/pg_dump %{pgpriority} \
 	--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 %{pgsuffix} \
+	--install %{_bindir}/pg_dumpall pg_dumpall %{pgsqllibdir}/bin/pg_dumpall %{pgpriority} \
 	--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 %{pgsuffix} \
+	--install %{_bindir}/pg_isready pg_isready %{pgsqllibdir}/bin/pg_isready %{pgpriority} \
 	--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 %{pgsuffix} \
+	--install %{_bindir}/pg_restore pg_restore %{pgsqllibdir}/bin/pg_restore %{pgpriority} \
 	--slave %{_mandir}/man1/pg_restore.1 pg_restore.1 %{pgsqldatadir}/man/man1/pg_restore.1* || :
 update-alternatives \
-	--install %{_bindir}/psql psql %{pgsqllibdir}/bin/psql %{pgsuffix} \
+	--install %{_bindir}/psql psql %{pgsqllibdir}/bin/psql %{pgpriority} \
 	--slave %{_mandir}/man1/psql.1 pgsql.1 %{pgsqldatadir}/man/man1/psql.1* || :
 update-alternatives \
-	--install %{_bindir}/reindexdb reindexdb %{pgsqllibdir}/bin/reindexdb %{pgsuffix} \
+	--install %{_bindir}/reindexdb reindexdb %{pgsqllibdir}/bin/reindexdb %{pgpriority} \
 	--slave %{_mandir}/man1/reindexdb.1 reindexdb.1 %{pgsqldatadir}/man/man1/reindexdb.1* || :
 update-alternatives \
-	--install %{_bindir}/vacuumdb vacuumdb %{pgsqllibdir}/bin/vacuumdb %{pgsuffix} \
+	--install %{_bindir}/vacuumdb vacuumdb %{pgsqllibdir}/bin/vacuumdb %{pgpriority} \
 	--slave %{_mandir}/man1/vacuumdb.1 vacuumdb.1 %{pgsqldatadir}/man/man1/vacuumdb.1* || :
 
 %postun	clients