pgpool2.git / summary / log / commit / refs
commit 7095e4d686d211018a22eddfad63dca01474ef7d
Author: Yugo Nagata <nagata@sraoss.co.jp>
Commit: Muhammad Usama <m.usama@gmail.com>
Date: Thu Dec 12 09:25:54 2013 +0000
Fix bug that install of pgpool's rpm fails
pgpool.spec | 24 ++++++++++++------------
src/redhat/rpm_installer/getsources.sh | 2 +-
src/redhat/rpm_installer/install.sh | 16 ++++++++++------
3 files changed, 23 insertions(+), 19 deletions(-)
diff --git a/pgpool.spec b/pgpool.spec
index 0ab6e7435..a3e343392 100644
--- a/pgpool.spec
+++ b/pgpool.spec
@@ -1,5 +1,5 @@
# How to build RPM:
-# rpmbuild -ba pgpool.spec --define"pgpool_version 3.3.1" --define="pg_version 93" --define="pghome /usr/pgsql-9.3"
+# rpmbuild -ba pgpool.spec --define="pgpool_version 3.3.2" --define="pg_version 93" --define="pghome /usr/pgsql-9.3"
#
# expecting RPM name are:
# pgpool-II-pg{xx}-{version}.pgdg.{arch}.rpm
@@ -59,18 +59,18 @@ Development headers and libraries for pgpool-II.
%configure --with-pgsql-includedir=%{pghome}/include/ \
--with-pgsql-lib=%{pghome}/lib \
--disable-static --with-pam --disable-rpath \
- --sysconfdir=%{_sysconfdir}/%{name}/
+ --sysconfdir=%{_sysconfdir}/pgpool-II/
make %{?_smp_flags}
%install
rm -rf %{buildroot}
make %{?_smp_flags} DESTDIR=%{buildroot} install
-install -d %{buildroot}%{_datadir}/%{name}
-install -d %{buildroot}%{_sysconfdir}/%{name}
-mv %{buildroot}/%{_sysconfdir}/%{name}/pcp.conf.sample %{buildroot}%{_sysconfdir}/%{name}/pcp.conf
-mv %{buildroot}/%{_sysconfdir}/%{name}/pgpool.conf.sample %{buildroot}%{_sysconfdir}/%{name}/pgpool.conf
-mv %{buildroot}/%{_sysconfdir}/%{name}/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/%{name}/pool_hba.conf
+install -d %{buildroot}%{_datadir}/pgpool-II
+install -d %{buildroot}%{_sysconfdir}/pgpool-II
+mv %{buildroot}/%{_sysconfdir}/pgpool-II/pcp.conf.sample %{buildroot}%{_sysconfdir}/pgpool-II/pcp.conf
+mv %{buildroot}/%{_sysconfdir}/pgpool-II/pgpool.conf.sample %{buildroot}%{_sysconfdir}/pgpool-II/pgpool.conf
+mv %{buildroot}/%{_sysconfdir}/pgpool-II/pool_hba.conf.sample %{buildroot}%{_sysconfdir}/pgpool-II/pool_hba.conf
install -d %{buildroot}%{_initrddir}
install -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/pgpool
install -d %{buildroot}%{_sysconfdir}/sysconfig
@@ -105,7 +105,7 @@ fi
%files
%defattr(-,root,root,-)
-%dir %{_datadir}/%{name}
+%dir %{_datadir}/pgpool-II
%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
%{_bindir}/pgpool
%{_bindir}/pcp_attach_node
@@ -131,14 +131,14 @@ fi
%{pghome}/share/extension/pgpool-regclass.sql
%{pghome}/share/extension/pgpool_regclass--1.0.sql
%{pghome}/share/extension/pgpool_regclass.control
-%{_sysconfdir}/%{name}/pgpool.conf.sample-master-slave
-%{_sysconfdir}/%{name}/pgpool.conf.sample-replication
-%{_sysconfdir}/%{name}/pgpool.conf.sample-stream
+%{_sysconfdir}/pgpool-II/pgpool.conf.sample-master-slave
+%{_sysconfdir}/pgpool-II/pgpool.conf.sample-replication
+%{_sysconfdir}/pgpool-II/pgpool.conf.sample-stream
%{_libdir}/libpcp.so.*
%{pghome}/lib/pgpool-recovery.so
%{pghome}/lib/pgpool-regclass.so
%{_initrddir}/pgpool
-%attr(764,root,root) %config(noreplace) %{_sysconfdir}/%{name}/*.conf
+%attr(764,root,root) %config(noreplace) %{_sysconfdir}/pgpool-II/*.conf
%config(noreplace) %{_sysconfdir}/sysconfig/pgpool
%files devel
diff --git a/src/redhat/rpm_installer/getsources.sh b/src/redhat/rpm_installer/getsources.sh
index 95a863cc7..5fc989283 100644
--- a/src/redhat/rpm_installer/getsources.sh
+++ b/src/redhat/rpm_installer/getsources.sh
@@ -134,7 +134,7 @@ echo "* Setup Finished. See \"work\" directory."
echo
echo "* Next ..."
echo
-echo " - rpmbuild -ba work/pgpool.spec"
+echo " - rpmbuild -ba work/pgpool.spec --define\"pgpool_version 3.3.2\" --define=\"pg_version 93\" --define=\"pghome /usr/pgsql-9.3\""
echo " - rpmbuild -ba work/pgpoolAdmin.spec"
echo " - move ~/rpm/RPMS/../pgpool*.rpm (except for *.src.rpm) to work/installer-pg${pg_version}/"
echo " - create tar ball from work/installer-pg${pg_version}/"
diff --git a/src/redhat/rpm_installer/install.sh b/src/redhat/rpm_installer/install.sh
index 88c2f032a..da003ee31 100644
--- a/src/redhat/rpm_installer/install.sh
+++ b/src/redhat/rpm_installer/install.sh
@@ -9,6 +9,9 @@ DIST=pgdg
# debug mode of this script
SH_DEBUG=0
+# PostgreSQL
+PG_MAJOR_VERSION=9.3
+
# pgpool-II
PGPOOL_SOFTWARE_NAME=pgpool-II
P_VERSION=3.3.0
@@ -23,10 +26,11 @@ ADMIN_DIR=/var/www/html/pgpoolAdmin
APACHE_USER=apache
# packages
+PG_VER=${PG_MAJOR_VERSION/./}
ARCHITECTURE=$(uname -i)
PACKAGE_FILES=(
- $PGPOOL_SOFTWARE_NAME-$P_VERSION-$P_RELEASE.$DIST.$ARCHITECTURE.rpm
- $ADMIN_SOFTWARE_NAME-$A_VERSION-$A_RELEASE.$DIST.noarch.rpm
+ ${PGPOOL_SOFTWARE_NAME}-pg${PG_VER}-${P_VERSION}-${P_RELEASE}.${DIST}.${ARCHITECTURE}.rpm
+ ${ADMIN_SOFTWARE_NAME}-${A_VERSION}-${A_RELEASE}.${DIST}.noarch.rpm
)
# pgpool
@@ -40,7 +44,7 @@ NODE1_HOST="" # This will be editted in script.
NETMASK="255.255.255.0" # This will be editted in script.
# postgres
-PGHOME=/usr/pgsql-9.2
+PGHOME=/usr/pgsql-$PG_MAJOR_VERSION
CONTRIB_DIR=$PGHOME/share/contrib
PG_SUPER_USER=postgres
PG_SUPER_USER_PASSWD=$PG_SUPER_USER
@@ -163,9 +167,9 @@ function checkEnv()
fi
# other
- hasPackage "postgresql92-server" "PostgreSQL (postgresql92-server)"
+ hasPackage "postgresql${PG_VER}-server" "PostgreSQL (postgresql${PG_VER}-server)"
if [ $? -ne 0 ]; then return 1; fi
- hasPackage "postgresql92" "PostgreSQL (postgresql92)"
+ hasPackage "postgresql${PG_VER}" "PostgreSQL (postgresql${PG_VER})"
if [ $? -ne 0 ]; then return 1; fi
hasPackage "httpd" "Apache (httpd)"
if [ $? -ne 0 ]; then return 1; fi
@@ -923,7 +927,7 @@ function doQueries()
# 1. check environment
echo -n "check for installation ..."
-rpm -qa | grep -E "${PGPOOL_SOFTWARE_NAME}|postgresql92|httpd|php|php-mbstring|php-pgsql" > $TEMP_FILE_RPM
+rpm -qa | grep -E "${PGPOOL_SOFTWARE_NAME}|postgresql${PG_VER}|httpd|php|php-mbstring|php-pgsql" > $TEMP_FILE_RPM
checkEnv
if [ $? -ne 0 ]; then
rm -f $TEMP_FILE_RPM
[parent: 6ad5d7307086]