-up to 9.4.4

[packages/postgresql.git] / postgresql.spec

diff --git a/postgresql.spec b/postgresql.spec
index c8dab0d0029777b29c1247e32e700c2139a1be1c..772cc635edcd4535e376890885635288cbf0fc88 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -32,12 +32,12 @@ Summary(tr.UTF-8):  Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):     PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
-Version:       %{mver}.0
-Release:       0.1
+Version:       %{mver}.4
+Release:       1
 License:       BSD
 Group:         Applications/Databases
 Source0:       ftp://ftp.postgresql.org/pub/source/v%{version}/%{name}-%{version}.tar.bz2
-# Source0-md5: 8cd6e33e1f8d4d2362c8c08bd0e8802b
+# Source0-md5: 1fe952c44ed26d7e6a335cf991a9c1c6
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
@@ -45,8 +45,6 @@ Source3:      %{name}.sysconfig
 Source4:       %{name}@.service
 Source5:       %{name}.service
 Source6:       %{name}.target
-Source7:       %{name}.upstart
-Source8:       %{name}-instance.upstart
 Patch0:                %{name}-conf.patch
 Patch1:                %{name}-absolute_dbpaths.patch
 Patch2:                %{name}-ecpg-includedir.patch
@@ -337,20 +335,6 @@ California, Berkeley.
 PostgreSQL працює на Solaris, SunOS, HPUX, AIX, Linux, Irix, FreeBSD
 та більшості інших різновидів Unix.
 
-%package upstart
-Summary:       Upstart job description for PostgreSQL server
-Summary(pl.UTF-8):     Opis zadania Upstart dla serwera PostgreSQL
-Group:         Daemons
-Requires:      %{name} = %{version}-%{release}
-Requires:      upstart >= 0.6
-Conflicts:     syslog-ng < 3.2.4-1
-
-%description upstart
-Upstart job description for PostgreSQL.
-
-%description upstart -l pl.UTF-8
-Opis zadania Upstart dla PostgreSQL.
-
 %package devel
 Summary:       PostgreSQL development header files and libraries
 Summary(de.UTF-8):     PostgreSQL-Entwicklungs-Header-Dateien und Libraries
@@ -795,6 +779,7 @@ find src -name \*.l -o -name \*.y | xargs touch
 %build
 %{__aclocal} -I config
 %{__autoconf}
+%{__autoheader}
 %configure \
        CFLAGS="%{rpmcflags} -DNEED_REENTRANT_FUNCS `uuid-config --cflags`" \
        --disable-rpath \
@@ -813,7 +798,7 @@ find src -name \*.l -o -name \*.y | xargs touch
        %{?with_python:--with-python} \
        %{?with_selinux:--with-selinux} \
        %{?with_tcl:--with-tcl --with-tclconfig=%{_ulibdir}} \
-       --with-uuid=e2fs \
+       --with-uuid=ossp
 
 %{__make}
 
@@ -833,7 +818,7 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig,init/%{name}}} \
+install -d $RPM_BUILD_ROOT{%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}} \
        $RPM_BUILD_ROOT{/var/{lib/pgsql,log},%{_pgsqldir}} \
        $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
        $RPM_BUILD_ROOT%{_mandir} \
@@ -866,9 +851,6 @@ install %{SOURCE4} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}@.service
 install %{SOURCE5} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.service
 install %{SOURCE6} $RPM_BUILD_ROOT%{systemdunitdir}/%{name}.target
 
-install %{SOURCE7} $RPM_BUILD_ROOT/etc/init/%{name}.conf
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/init/%{name}/instance.conf
-
 install -d howto
 tar zxf %{SOURCE2} -C howto
 
@@ -997,12 +979,6 @@ for pgdir in $PG_DB_CLUSTERS; do
 done
 %systemd_trigger postgresql.service
 
-%post upstart
-%upstart_post postgresql
-
-%postun upstart
-%upstart_postun postgresql
-
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
 
@@ -1073,14 +1049,6 @@ done
 %{_mandir}/man1/postgres.1*
 %{_mandir}/man1/postmaster.1*
 
-%if "%{pld_release}" != "ti"
-%files upstart
-%defattr(644,root,root,755)
-%config(noreplace) %verify(not md5 mtime size) /etc/init/postgresql.conf
-%dir /etc/init/postgresql
-%config(noreplace) %verify(not md5 mtime size) /etc/init/postgresql/instance.conf
-%endif
-
 %files doc
 %defattr(644,root,root,755)
 %doc doc/src/sgml/html howto