To: pgsql-pkg-yum@postgresql.org
From: Ian Barwick <ian.barwick@2ndquadrant.com>
Subject: Version number usage in new repmgr.spec file?
Message-ID: <720b4965-08bf-7bdf-3ff3-fbb01a9dd9eb@2ndquadrant.com>
Date: Thu, 25 May 2017 13:30:07 +0900
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.1.0
MIME-Version: 1.0
Content-Type: multipart/mixed;
 boundary="------------292463E0C6253B96EFF2BEBD"
Content-Language: en-US
Precedence: bulk
Sender: pgsql-pkg-yum-owner@postgresql.org

This is a multi-part message in MIME format.
--------------292463E0C6253B96EFF2BEBD
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi

I was looking at the new repmgr specfile (rpm/redhat/master/repmgr/master/repmgr.spec),
it looks like %{pgpackageversion} and %{pgmajorversion} have got a bit mixed up
in places; while it works for 10 of course, it looks like 9.6/96 etc. get written
to the wrong places.

Attached patch puts things the way they should be (at least to build a local
RPM with 9.x). Apologies for the noise if that's actually intentional.


Regards

Ian Barwick

-- 
  Ian Barwick                   http://www.2ndQuadrant.com/
  PostgreSQL Development, 24x7 Support, Training & Services

--------------292463E0C6253B96EFF2BEBD
Content-Type: text/x-patch;
 name="repmgr.spec.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
 filename="repmgr.spec.diff"

diff --git a/rpm/redhat/master/repmgr/master/repmgr.spec b/rpm/redhat/master/repmgr/master/repmgr.spec
index 028fcdd..c860a55 100644
--- a/rpm/redhat/master/repmgr/master/repmgr.spec
+++ b/rpm/redhat/master/repmgr/master/repmgr.spec
@@ -1,6 +1,6 @@
 %global pgmajorversion 10
 %global pgpackageversion 10
-%global pginstdir /usr/pgsql-%{pgpackageversion}
+%global pginstdir /usr/pgsql-%{pgmajorversion}
 %global sname repmgr
 %if 0%{?rhel} && 0%{?rhel} <= 6
 %global systemd_enabled 0
@@ -10,7 +10,7 @@
 
 %global _varrundir %{_localstatedir}/run/%{sname}
 
-Name:		%{sname}%{pgmajorversion}
+Name:		%{sname}%{pgpackageversion}
 Version:	3.3.1
 Release:	1%{?dist}
 Summary:	Replication Manager for PostgreSQL Clusters
@@ -41,10 +41,10 @@ Requires(postun):	initscripts
 Group:		Applications/Databases
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %endif
-BuildRequires:	postgresql%{pgmajorversion}, postgresql%{pgmajorversion}-devel
+BuildRequires:	postgresql%{pgpackageversion}, postgresql%{pgpackageversion}-devel
 BuildRequires:	libxslt-devel, pam-devel, openssl-devel, readline-devel
 BuildRequires:	libmemcached-devel libicu-devel
-Requires:	postgresql%{pgmajorversion}-server
+Requires:	postgresql%{pgpackageversion}-server
 
 %description
 repmgr is an open-source tool suite to manage replication and failover in a
@@ -111,7 +111,7 @@ fi
 %post
 /sbin/ldconfig
 %if %{systemd_enabled}
-%systemd_post %{sname}-%{pgmajorversion}.service
+%systemd_post %{sname}-%{pgpackageversion}.service
 %tmpfiles_create
 %else
 # This adds the proper /etc/rc*.d links for the script

--------------292463E0C6253B96EFF2BEBD
Content-Type: text/plain
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0


-- 
Sent via pgsql-pkg-yum mailing list (pgsql-pkg-yum@postgresql.org)
To make changes to your subscription:
http://www.postgresql.org/mailpref/pgsql-pkg-yum

--------------292463E0C6253B96EFF2BEBD--