Attachment 612980 Details for Bug 845394 – Updated with recovery subpackage patch

[patch] Updated with recovery subpackage patch

postgresql-pgpool-II.spec.diff (text/plain), 5.43 KB, created by Dmitry S. Makovey on 2012-09-14 19:51:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry S. Makovey

Created: 2012-09-14 19:51:15 UTC

Size: 5.43 KB

patch

obsolete

>--- postgresql-pgpool-II.spec.orig	2012-08-17 10:34:31.000000000 -0600
>+++ postgresql-pgpool-II.spec	2012-09-14 13:46:12.000000000 -0600
>@@ -1,22 +1,32 @@
> %define short_name	pgpool-II
>+%if 0%{?rhel} && 0%{?rhel} <= 6
>+%define systemd_enabled 0
>+%else
>+%define systemd_enabled 1
>+%endif
>+## %global systemd_present %([ -d /run/lock ] && rpm --quiet -qf /run/lock && echo 1 || echo 0)
> 
> Summary:		Pgpool is a connection pooling/replication server for PostgreSQL
> Name:			postgresql-%{short_name}
> Version:		3.1.2
>-Release:		1%{?dist}
>+Release:		1%{?dist}.4au
> License:		BSD
> Group:			Applications/Databases
> URL:			http://pgpool.projects.PostgreSQL.org
> Source0:		http://pgfoundry.org/frs/download.php/3114/%{short_name}-%{version}.tar.gz
> Source1:        	pgpool.service
> Source2:        	pgpool.sysconfig
>+Source3:        	pgpool.init
> Patch1:			pgpool-3.1-conf.sample.patch
> BuildRequires:		postgresql-devel pam-devel
>+%if %{systemd_enabled}
> BuildRequires:		systemd-units
> Requires(post):		systemd-sysv
> Requires(post):		systemd-units
> Requires(preun):	systemd-units
> Requires(postun):	systemd-units
>+%endif
>+
> Obsoletes:		postgresql-pgpool
> 
> %description
>@@ -45,6 +55,14 @@
> %description devel
> Development headers and libraries for pgpool-II.
> 
>+%package recovery
>+Summary:       PGPool recovery add-on for PostgreSQL
>+Group:			Applications/Databases
>+Requires:	%{name} = %{version}-%{release}
>+
>+%description recovery
>+PGPool recovery add-on
>+
> %prep
> %setup -q -n %{short_name}-%{version}
> %patch1 -p1 -b .samplefix
>@@ -53,9 +71,14 @@
> %configure --with-pgsql-includedir=%{_includedir}/pgsql --with-pgsql-lib=%{_libdir}/pgsql --disable-static --with-pam --disable-rpath --sysconfdir=%{_sysconfdir}/%{short_name}/
> 
> make %{?_smp_flags}
>+( cd sql/pgpool-recovery &&  make %{?_smp_flags} )
>+# ( cd sql/pgpool-walrecrunning &&  make %{?_smp_flags} )
>+
> 
> %install
> make %{?_smp_flags} DESTDIR=%{buildroot} install
>+( cd sql/pgpool-recovery &&  make %{?_smp_flags} DESTDIR=%{buildroot} install )
>+# ( cd sql/pgpool-walrecrunning &&  make %{?_smp_flags} DESTDIR=%{buildroot} install )
> install -d %{buildroot}%{_datadir}/%{short_name}
> install -d %{buildroot}%{_sysconfdir}/%{short_name}
> mv %{buildroot}/%{_sysconfdir}/%{short_name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{short_name}/pcp.conf
>@@ -65,8 +88,14 @@
> mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-replication %{buildroot}%{_datadir}/%{short_name}/
> mv %{buildroot}/%{_sysconfdir}/%{short_name}/pgpool.conf.sample-stream %{buildroot}%{_datadir}/%{short_name}/
> 
>+%if %{systemd_enabled}
> install -d %{buildroot}%{_unitdir}
> install -m 755 %{SOURCE1} %{buildroot}%{_unitdir}/pgpool.service
>+%else
>+install -d %{buildroot}%{_sysconfdir}/init.d
>+install -m 755 %{SOURCE3} %{buildroot}%{_sysconfdir}/init.d/pgpool
>+%endif
>+
> install -d %{buildroot}%{_sysconfdir}/sysconfig
> install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/pgpool
> 
>@@ -75,35 +104,45 @@
> 
> %post 
> /sbin/ldconfig
>+%if %{systemd_enabled}
> if [ $1 -eq 1 ] ; then 
>     # Initial installation 
>     /bin/systemctl daemon-reload >/dev/null 2>&1 || :
> fi
>+%endif
> 
> %preun
> if [ $1 -eq 0 ] ; then
>     # Package removal, not upgrade
>+%if %{systemd_enabled}
>     /bin/systemctl --no-reload disable pgpool.service > /dev/null 2>&1 || :
>     /bin/systemctl stop pgpool.service > /dev/null 2>&1 || :
>+%else
>+    /sbin/service pgpool stop
>+%endif
> fi
> 
> %postun 
> /sbin/ldconfig
>-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+# /bin/systemctl daemon-reload >/dev/null 2>&1 || :
>+%if %{systemd_enabled}
> if [ $1 -ge 1 ] ; then
>     # Package upgrade, not uninstall
>     /bin/systemctl try-restart pgpool.service >/dev/null 2>&1 || :
> fi
>+%endif
> 
> %triggerun -- pgpool < 3.1-1
> # Save the current service runlevel info
> # User must manually run systemd-sysv-convert --apply pgpool
> # to migrate them to systemd targets
>-/usr/bin/systemd-sysv-convert --save pgpool >/dev/null 2>&1 ||:
>+# /usr/bin/systemd-sysv-convert --save pgpool >/dev/null 2>&1 ||:
> 
> # Run these because the SysV package being removed won't do them
> /sbin/chkconfig --del pgpool >/dev/null 2>&1 || :
>+%if %{systemd_enabled}
> /bin/systemctl try-restart pgpool.service >/dev/null 2>&1 || :
>+%endif
> 
> %files
> %doc README README.euc_jp TODO COPYING INSTALL AUTHORS ChangeLog NEWS doc/pgpool-en.html doc/pgpool-ja.html doc/pgpool.css doc/tutorial-en.html doc/tutorial-ja.html
>@@ -129,7 +168,13 @@
> %{_datadir}/%{short_name}/pgpool.conf.sample-stream
> %{_libdir}/libpcp.so.*
> %{_datadir}/%{short_name}/pgpool.pam
>+ 
>+%if %{systemd_enabled}
> %{_unitdir}/pgpool.service
>+%else
>+%{_sysconfdir}/init.d/pgpool
>+%endif
>+
> %attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{short_name}/*.conf
> %config(noreplace) %{_sysconfdir}/sysconfig/pgpool
> 
>@@ -140,8 +185,21 @@
> %{_includedir}/pool_type.h
> %{_libdir}/libpcp.so
> 
>+%files recovery
>+%{_libdir}/pgsql/pgpool-recovery.so
>+%{_datadir}/pgsql/contrib/pgpool-recovery.sql
>+%{_datadir}/pgsql/contrib/uninstall_pgpool-recovery.sql
>+%doc sample
>+
> 
> %changelog
>+* Wed Aug 1 2012 Dmitry S. Makovey <dmakovey@yahoo.com> - 3.1.2-2.el6.4au
>+- added "recovery" subpackage
>+- added "samples" as a documentation to "recovery" subpackage
>+* Wed Aug 1 2012 Dmitry S. Makovey <dmakovey@yahoo.com> - 3.1.2
>+- rebuilt for EL6
>+- removed systemd references
>+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-2
> * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-2
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
>

Actions: View | Diff

Attachments on bug 845394: 602037 | 602038 | 605228 | 605229 | 612980 | 612981