- updated to 9.4.4

[packages/postgresql.git] / postgresql.spec

diff --git a/postgresql.spec b/postgresql.spec
index cdf435394b8e0db3df9fe0a6f7df59fd79877335..326a561ab62ef803d7a21eafbef625df0a595039 100644 (file)
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -15,8 +15,6 @@
 %bcond_without ldap                    # disable LDAP support
 %bcond_without selinux                 # sepgsql contrib module
 %bcond_with    absolute_dbpaths        # enable absolute paths to create database
-                                       # (disabled by default because it is a security risk)
-#
 
 %define beta %{nil}
 %define mver 9.4
@@ -32,19 +30,16 @@ Summary(tr.UTF-8):  Veri Tabanı Yönetim Sistemi
 Summary(uk.UTF-8):     PostgreSQL - система керування базами даних
 Summary(zh_CN.UTF-8):  PostgreSQL 客户端程序和库文件
 Name:          postgresql
-Version:       %{mver}.1
-Release:       2
+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: 2cf30f50099ff1109d0aa517408f8eff
+# Source0-md5: 1fe952c44ed26d7e6a335cf991a9c1c6
 Source1:       %{name}.init
 Source2:       pgsql-Database-HOWTO-html.tar.gz
 # Source2-md5: 5b656ddf1db41965761f85204a14398e
 Source3:       %{name}.sysconfig
-Source4:       %{name}@.service
-Source5:       %{name}.service
-Source6:       %{name}.target
 Patch0:                %{name}-conf.patch
 Patch1:                %{name}-absolute_dbpaths.patch
 Patch2:                %{name}-ecpg-includedir.patch
@@ -95,7 +90,6 @@ Requires(triggerpostun):      /usr/sbin/usermod
 Requires:      %{name}-clients >= %{version}-%{release}
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      rc-scripts >= 0.4.3.0
-Requires:      systemd-units >= 38
 Requires:      tzdata
 Obsoletes:     postgresql-module-plpgsql
 Obsoletes:     postgresql-module-tsearch2
@@ -822,7 +816,6 @@ 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} \
-       $RPM_BUILD_ROOT{%{systemdunitdir},/etc/systemd/system/%{name}.target.requires} \
        $RPM_BUILD_ROOT/home/services/postgres
 
 install src/tutorial/*.sql $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
@@ -847,10 +840,6 @@ touch $RPM_BUILD_ROOT/var/log/pgsql
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/postgresql
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/postgresql
 
-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 -d howto
 tar zxf %{SOURCE2} -C howto
 
@@ -941,43 +930,12 @@ fi
 %post
 /sbin/chkconfig --add postgresql
 %service postgresql restart "postgresql server"
-if [ "$1" -eq "1" ]; then
-       PG_DB_CLUSTERS=""
-       [ -f /etc/sysconfig/postgresql ] && . /etc/sysconfig/postgresql
-       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog
-       for pgdir in $PG_DB_CLUSTERS; do
-               instance="$(echo "$pgdir" | sed -e 's/^\///;s/-/\\x2d/g;s/@/\\x40/g;s/\//-/g')"
-               /bin/systemctl --quiet enable "postgresql@$instance.service" || :
-       done
-fi
-%systemd_post postgresql.service
 
 %preun
 if [ "$1" = "0" ]; then
        %service postgresql stop
        /sbin/chkconfig --del postgresql
-
-       PG_DB_CLUSTERS=""
-       [ -f /etc/sysconfig/postgresql ] && . /etc/sysconfig/postgresql
-       export SYSTEMD_LOG_LEVEL=warning SYSTEMD_LOG_TARGET=syslog
-       for pgdir in $PG_DB_CLUSTERS; do
-               instance="$(echo "$pgdir" | sed -e 's/^\///;s/-/\\x2d/g;s/@/\\x40/g;s/\//-/g')"
-               /bin/systemctl --quiet disable "postgresql@$instance.service" || :
-       done
 fi
-%systemd_preun postgresql.service
-
-%postun
-%systemd_reload
-
-%triggerpostun -- %{name} < 9.3.3-2
-PG_DB_CLUSTERS=""
-[ -f /etc/sysconfig/postgresql ] && . /etc/sysconfig/postgresql
-for pgdir in $PG_DB_CLUSTERS; do
-       instance="$(echo "$pgdir" | sed -e 's/^\///;s/-/\\x2d/g;s/@/\\x40/g;s/\//-/g')"
-       /bin/systemctl --quiet enable "postgresql@$instance.service" || :
-done
-%systemd_trigger postgresql.service
 
 %post  libs -p /sbin/ldconfig
 %postun        libs -p /sbin/ldconfig
@@ -990,10 +948,6 @@ done
 %doc COPYRIGHT README HISTORY doc/{bug.template,KNOWN_BUGS,MISSING_FEATURES,TODO}
 %attr(754,root,root) /etc/rc.d/init.d/postgresql
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/postgresql
-%{systemdunitdir}/%{name}.service
-%{systemdunitdir}/%{name}@.service
-%{systemdunitdir}/%{name}.target
-%dir /etc/systemd/system/%{name}.target.requires
 
 %attr(755,root,root) %{_bindir}/initdb
 %attr(755,root,root) %{_bindir}/pg_basebackup