From 3e208b0e4cd69a1fc7f7263afd42b4276cddde29 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Mon, 16 Jan 2023 17:27:50 +0900 Subject: [PATCH] Remove pgpool-II-head.patch from SPEC file. --- src/pgpool.spec | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/pgpool.spec b/src/pgpool.spec index c7c755591..489078bd8 100644 --- a/src/pgpool.spec +++ b/src/pgpool.spec @@ -6,7 +6,7 @@ # # rpmbuild -ba pgpool.spec --define="pgpool_version 3.4.0" --define="pg_version 11" --define="pghome /usr/pgsql-11" --define="dist .rhel7" --define="pgsql_ver 110" # -# expecting RPM name are: +# RPM names are: # pgpool-II-pg{pg_version}-{pgpool_version}-{rel}pgdg.rhel{v}.{arch}.rpm # pgpool-II-pg{pg_version}-devel-{pgpool_version}-{rel}pgdg.rhel{v}.{arch}.rpm # pgpool-II-pg{pg_version}-extensions-{pgpool_version}-{rel}pgdg.rhel{v}.{arch}.rpm @@ -40,12 +40,11 @@ Source3: pgpool.service Source4: pgpool_rhel.sysconfig Source5: pgpool_tmpfiles.d Source6: pgpool_sudoers.d -Patch1: pgpool-II-head.patch %if %{pgsql_ver} >=94 && %{rhel} >= 7 -Patch2: pgpool_socket_dir.patch -Patch3: pcp_unix_domain_path.patch +Patch1: pgpool_socket_dir.patch +Patch2: pcp_unix_domain_path.patch %endif -Patch4: pgpool_log.patch +Patch3: pgpool_log.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: postgresql%{pg_version}-devel pam-devel openssl-devel jade libxslt docbook-dtds docbook-style-xsl docbook-style-dsssl openldap-devel %if %{rhel} >= 9 @@ -103,12 +102,11 @@ PostgreSQL extensions libraries and sql files for pgpool-II. %prep %setup -q -n %{archive_name} -%patch1 -p1 %if %{pgsql_ver} >=94 && %{rhel} >= 7 +%patch1 -p0 %patch2 -p0 -%patch3 -p0 %endif -%patch4 -p0 +%patch3 -p0 %build %configure --with-pgsql=%{pghome} \ -- 2.39.5