X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=be0c399544eac6255f59a57753adcea079202e8e;hb=0cbb2a25fa3d72388c8f34691f84c24abd7193ea;hp=fb471217376edd420ef8aa1da1de3b80b9c82f46;hpb=b19a7e8f4294c339af9665aee5d786b36d9b26af;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index fb47121..be0c399 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -27,7 +27,7 @@ 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%{pgversion}
+Name:		postgresql-%{pgversion}
 Version:	%{pgversion}.5
 Release:	2
 License:	BSD
@@ -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} \
@@ -660,7 +661,7 @@ 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%{_examplesdir}/%{name}-%{version} \
-	$RPM_BUILD_ROOT%{_mandir}
+	$RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
 
 install src/tutorial/*.sql $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -681,8 +682,8 @@ 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}
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/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
 tar zxf %{SOURCE2} -C howto
@@ -717,6 +718,9 @@ merge_lang psql initdb \
 
 cp -p src/pl/plperl/ppport.h $RPM_BUILD_ROOT%{_includedir}/postgresql/%{pgversion}/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
 
@@ -725,8 +729,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 PG_DB_CLUSTERS=""
-if [ -f /etc/sysconfig/postgresql%{pgversion} ]; then
-	. /etc/sysconfig/postgresql%{pgversion}
+if [ -f /etc/sysconfig/postgresql-%{pgversion} ]; then
+	. /etc/sysconfig/postgresql-%{pgversion}
 	if [ -z "$PG_DB_CLUSTERS" -a -n "$POSTGRES_DATA_DIR" ]; then
 		PG_DB_CLUSTERS="$POSTGRES_DATA_DIR"
 	fi
@@ -770,13 +774,13 @@ echo "files so they reflect your changes."
 echo
 
 %post
-/sbin/chkconfig --add postgresql%{pgversion}
-%service postgresql%{pgversion} restart "postgresql%{pgversion} server"
+/sbin/chkconfig --add postgresql-%{pgversion}
+%service postgresql-%{pgversion} restart "postgresql-%{pgversion} server"
 
 %preun
 if [ "$1" = "0" ]; then
-	%service postgresql%{pgversion} stop
-	/sbin/chkconfig --del postgresql%{pgversion}
+	%service postgresql-%{pgversion} stop
+	/sbin/chkconfig --del postgresql-%{pgversion}
 fi
 
 %pre	-n postgresql-common
@@ -841,15 +845,9 @@ if [ $1 -eq 0 ]; then
 	update-alternatives --remove vacuumdb %{pgsqllibdir}/bin/vacuumdb || :
 fi
 
-%posttrans	-n postgresql-devel
-update-alternatives \
-	--install %{_bindir}/pg_config pg_config %{pgsqllibdir}/bin/pg_config %{pgsuffix} \
-	--slave %{_mandir}/man1/pg_config.1 pg_config.1 %{pgsqldatadir}/man/man1/pg_config.1* || :
-
 %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
 
@@ -859,8 +857,8 @@ update-alternatives \
 %files -f main.lang
 %defattr(644,root,root,755)
 %doc COPYRIGHT README HISTORY doc/{bug.template,KNOWN_BUGS,MISSING_FEATURES,TODO}
-%attr(754,root,root) /etc/rc.d/init.d/postgresql%{pgversion}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql%{pgversion}
+%attr(754,root,root) /etc/rc.d/init.d/postgresql-%{pgversion}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql-%{pgversion}
 
 %attr(755,root,root) %{pgsqllibdir}/bin/initdb
 %attr(755,root,root) %{pgsqllibdir}/bin/pg_basebackup
@@ -983,7 +981,7 @@ update-alternatives \
 
 %files -n postgresql-devel -f pg_config-%{pgversion}.lang
 %defattr(644,root,root,755)
-%attr(755,root,root) %{pgsqllibdir}/bin/pg_config
+%attr(755,root,root) %{_bindir}/pg_config
 %attr(755,root,root) %{_libdir}/libpq.so
 %dir %{_includedir}/postgresql
 %{_includedir}/libpq-events.h
@@ -1002,7 +1000,7 @@ update-alternatives \
 %{_includedir}/postgresql/internal/libpq
 %{_includedir}/libpq
 %{_libdir}/pkgconfig/libpq.pc
-%{pgsqldatadir}/man/man1/pg_config.1*
+%{_mandir}/man1/pg_config.1*
 
 %files backend-devel
 %defattr(644,root,root,755)