MIME-Version: 1.0
References: <20201105190206.4358b61d@firost>
 <CAGRY4nygZarpXPaqVC1sfSWP7Ba=uw_XqCS+6pn+NusEoSNvVw@mail.gmail.com>
 <20201109114034.2cc8aab5@firost>
 <CAGRY4nz+xcczzYXVuNva8=r+ucgp5pYMt0_eM-nBv4iPNCmyKw@mail.gmail.com>
 <20201110145627.07954db0@firost>
 <CAGRY4nxwwyxMCcWaSZMRm+opbd5sVVtzhXaPNqvvTpzEYZE6RQ@mail.gmail.com>
 <20201112113632.627b8749@firost>
In-Reply-To: <20201112113632.627b8749@firost>
From: Craig Ringer <craig.ringer@enterprisedb.com>
Date: Fri, 13 Nov 2020 13:38:05 +0800
Message-ID: 
 <CAGRY4nwhfqJm=fqwhkhqK8u=2FxS+m4h2HNLNtp8bKS=MQ-hyA@mail.gmail.com>
Subject: Re: missing perl test modules in postgresqlXX-devel ?
To: Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
Cc: pgsql-pkg-yum@postgresql.org
Content-Type: multipart/alternative; boundary="00000000000073c4ec05b3f66f6a"
Precedence: bulk

--00000000000073c4ec05b3f66f6a
Content-Type: text/plain; charset="UTF-8"

On Thu, Nov 12, 2020 at 6:36 PM Jehan-Guillaume de Rorthais <jgdr@dalibo.com>
wrote:


> I fired the vagrant generic/rhel7 box and registered it using my dev
> account:
>
>
Thanks.

Note that the package came from rhel-7-server-rpms:
>
>   $ sudo yum history packages-info perl-Test-Simple|grep ^From
>   From repo      : rhel-7-server-rpms
>
> RHEL official documentation confirm the package is available in base
> repository:
>
>
> https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/7/html/package_manifest/package_lists_base_repository
>
>
Based on this, I think it's appropriate to modify the EL-7 spec file for
all Pg versions (example patch is for -10) something like the following.

Note that I removed a duplicate guard for "&& 0%{?suse_version} >= 1315"
where the test for "enabletaptests" already excluded that. And I made sure
that both fedora and rhel require both IPC::Run and Test::More ; I don't
see why that was ever not be the case.


--- a/rpm/redhat/master/non-common/postgresql-10/master/postgresql-10.spec
+++ b/rpm/redhat/master/non-common/postgresql-10/master/postgresql-10.spec
@@ -12,7 +12,7 @@
 %{!?kerbdir:%global kerbdir "/usr"}
 %{!?disablepgfts:%global disablepgfts 0}

-%if 0%{?rhel} || 0%{?suse_version} >= 1315
+%if (0%{?rhel} && 0%{?rhel} <= 6) || 0%{?suse_version} >= 1315
 %{!?enabletaptests:%global enabletaptests 0}
 %else
 %{!?enabletaptests:%global enabletaptests 1}
@@ -367,17 +367,13 @@ Requires: libicu-devel
 %endif

 %if %enabletaptests
-%if 0%{?suse_version} && 0%{?suse_version} >= 1315
+%if 0%{?suse_version}
 Requires:  perl-IPC-Run
 BuildRequires: perl-IPC-Run
 %endif
-%if 0%{?rhel} && 0%{?rhel} <= 7
-Requires:  perl-Test-Simple
-BuildRequires: perl-Test-Simple
-%endif
-%if 0%{?fedora}
-Requires:  perl-IPC-Run
-BuildRequires: perl-IPC-Run
+%if 0%{?rhel} || 0%{?fedora}
+Requires:  perl(Test::More) perl(IPC::Run)
+BuildRequires: perl(Test::More) perl(IPC::Run)
 %endif
 %endif

--00000000000073c4ec05b3f66f6a
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div dir=3D"ltr">On Thu, Nov 12, 2020 at 6:36 PM Jehan-Gui=
llaume de Rorthais &lt;<a href=3D"mailto:jgdr@dalibo.com">jgdr@dalibo.com</=
a>&gt; wrote:<br></div><div class=3D"gmail_quote"><div>=C2=A0</div><blockqu=
ote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px=
 solid rgb(204,204,204);padding-left:1ex">
I fired the vagrant generic/rhel7 box and registered it using my dev accoun=
t:<br>
<br></blockquote><div><br></div><div>Thanks.</div><br><blockquote class=3D"=
gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(20=
4,204,204);padding-left:1ex">
Note that the package came from rhel-7-server-rpms:<br>
<br>
=C2=A0 $ sudo yum history packages-info perl-Test-Simple|grep ^From<br>
=C2=A0 From repo=C2=A0 =C2=A0 =C2=A0 : rhel-7-server-rpms<br>
<br>
RHEL official documentation confirm the package is available in base reposi=
tory:<br>
<br>
=C2=A0 <a href=3D"https://access.redhat.com/documentation/en-us/red_hat_ent=
erprise_linux/7/html/package_manifest/package_lists_base_repository" rel=3D=
"noreferrer" target=3D"_blank">https://access.redhat.com/documentation/en-u=
s/red_hat_enterprise_linux/7/html/package_manifest/package_lists_base_repos=
itory</a><br>
<br></blockquote><div><br></div><div>Based on this, I think it&#39;s approp=
riate to modify the EL-7 spec file for all Pg versions (example patch is fo=
r -10) something like the following.</div><div><br></div><div>Note that I r=
emoved a duplicate guard for &quot;&amp;&amp; 0%{?suse_version} &gt;=3D 131=
5&quot; where the test for &quot;enabletaptests&quot; already excluded that=
. And I made sure that both fedora and rhel require both IPC::Run and Test:=
:More ; I don&#39;t see why that was ever not be the case.<br></div><div><b=
r></div><div><br></div><div>--- a/rpm/redhat/master/non-common/postgresql-1=
0/master/postgresql-10.spec<br>+++ b/rpm/redhat/master/non-common/postgresq=
l-10/master/postgresql-10.spec<br>@@ -12,7 +12,7 @@<br>=C2=A0%{!?kerbdir:%g=
lobal kerbdir &quot;/usr&quot;}<br>=C2=A0%{!?disablepgfts:%global disablepg=
fts 0}<br>=C2=A0<br>-%if 0%{?rhel} || 0%{?suse_version} &gt;=3D 1315<br>+%i=
f (0%{?rhel} &amp;&amp; 0%{?rhel} &lt;=3D 6) || 0%{?suse_version} &gt;=3D 1=
315<br>=C2=A0%{!?enabletaptests:%global enabletaptests 0}<br>=C2=A0%else<br=
>=C2=A0%{!?enabletaptests:%global enabletaptests 1}<br>@@ -367,17 +367,13 @=
@ Requires: libicu-devel<br>=C2=A0%endif<br>=C2=A0<br>=C2=A0%if %enabletapt=
ests<br>-%if 0%{?suse_version} &amp;&amp; 0%{?suse_version} &gt;=3D 1315<br=
>+%if 0%{?suse_version}<br>=C2=A0Requires: =C2=A0perl-IPC-Run<br>=C2=A0Buil=
dRequires: perl-IPC-Run<br>=C2=A0%endif<br>-%if 0%{?rhel} &amp;&amp; 0%{?rh=
el} &lt;=3D 7<br>-Requires: =C2=A0perl-Test-Simple<br>-BuildRequires: perl-=
Test-Simple<br>-%endif<br>-%if 0%{?fedora}<br>-Requires: =C2=A0perl-IPC-Run=
<br>-BuildRequires: perl-IPC-Run<br>+%if 0%{?rhel} || 0%{?fedora}<br>+Requi=
res: =C2=A0perl(Test::More) perl(IPC::Run)<br>+BuildRequires: perl(Test::Mo=
re) perl(IPC::Run)<br>=C2=A0%endif<br>=C2=A0%endif</div><div><br> </div></d=
iv></div>

--00000000000073c4ec05b3f66f6a--