X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;f=postgresql.spec;h=7d8db3a55bfb139ed1483ef7f42c95beeb166529;hb=refs%2Fheads%2FPGSQL_9_5;hp=012658617e083d680a6f56b406d77ba4e82a5c2c;hpb=2cbb14a6401097c7135a30b1758d029d129e364b;p=packages%2Fpostgresql.git

diff --git a/postgresql.spec b/postgresql.spec
index 0126586..7d8db3a 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -28,12 +28,12 @@ Summary(tr.UTF-8):	Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):	PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):	PostgreSQL 客户端程序和库文件
 Name:		postgresql-%{pgsqlversion}
-Version:	%{pgsqlversion}.14
+Version:	%{pgsqlversion}.24
 Release:	1
 License:	BSD
 Group:		Applications/Databases
 Source0:	http://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{version}.tar.bz2
-# Source0-md5:	36c51ae03c2cd7606e22b8ba228df304
+# Source0-md5:	3e86e1016baefe6581b6d136367589a4
 Source1:	postgresql.init
 Source2:	pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5:	5b656ddf1db41965761f85204a14398e
@@ -42,7 +42,7 @@ Patch0:		postgresql-conf.patch
 Patch1:		postgresql-absolute_dbpaths.patch
 Patch2:		postgresql-ecpg-includedir.patch
 Patch3:		per-version-dirs.patch
-Patch4:		postgresql-disable_horology_test.patch
+Patch4:		postgresql-tests.patch
 Patch5:		postgresql-heimdal.patch
 Patch6:		postgresql-link.patch
 Patch7:		socket-dir-fixes.patch
@@ -176,6 +176,7 @@ SunOS, HPUX, AIX, Linux, Irix, FreeBSD i innymi systemami uniksowymi.
 Summary:	Common directories for PostgresSQL %{pgsqlversion}
 Summary(pl.UTF-8):	Wspólne pliki i katalogi dla PostgreSQL %{pgsqlversion}
 Group:		Applicataion/Databases
+Requires:	postgresql-common >= %{version}-%{release}
 
 %description dirs
 Common directories for PostgresSQL %{pgsqlversion}
@@ -526,7 +527,6 @@ find src -name \*.l -o -name \*.y | xargs touch
 	%{?with_python:--with-python} \
 	%{?with_selinux:--with-selinux} \
 	--with-system-tzdata=%{_datadir}/zoneinfo \
-	--without-systemd \
 	%{?with_tcl:--with-tcl --with-tclconfig=%{_ulibdir}} \
 	--with-uuid=e2fs
 
@@ -549,7 +549,7 @@ done
 %install
 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/var/{lib/postgresql/%{pgsqlversion},log/{archive,}/postgresql,run/postgresql} \
 	$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT%{_mandir}
 
@@ -570,8 +570,6 @@ for mod in %{contrib_modules}; do \
 		DESTDIR=$RPM_BUILD_ROOT
 done
 
-touch $RPM_BUILD_ROOT/var/log/pgsql
-
 sed -e 's,@pgsqlbindir@,%{pgsqllibdir}/bin,g; s,@pgsqlversion@,%{pgsqlversion},g;' %{SOURCE1} >$RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql-%{pgsqlversion}
 sed -e 's,@pgsqlversion@,%{pgsqlversion},g;' %{SOURCE3} >$RPM_BUILD_ROOT/etc/sysconfig/postgresql-%{pgsqlversion}
 
@@ -766,8 +764,6 @@ fi
 
 %dir %{pgsqldatadir}/contrib
 
-%attr(640,postgres,postgres) %config(noreplace) %verify(not md5 mtime size) /var/log/pgsql
-
 %{pgsqldatadir}/man/man1/initdb.1*
 %{pgsqldatadir}/man/man1/pg_basebackup.1*
 %{pgsqldatadir}/man/man1/pg_controldata.1*
@@ -794,6 +790,7 @@ fi
 %dir %{pgsqldatadir}/man/man1
 %dir %{pgsqldatadir}/man/man3
 %dir %{pgsqldatadir}/man/man7
+%attr(700,postgres,postgres) %dir /var/lib/postgresql/%{pgsqlversion}
 
 %files doc
 %defattr(644,root,root,755)