New spec incompatibility between rawhide and epel wrt patches

[Susi Lehtola]

Hi,

it appears rpm has now deprecated the old %patch syntax in rawhide, which means
that any old-style expressions

%patch0 -p1 -b .overflow

must now be written as

%patch 0 -p1 -b .overflow

Unfortunately, all the epel branches, in turn, do not support the new %patch
syntax. This means that one either
- cannot use the same spec file to build in epel or
- must introduce conditionals and duplicate code in the spec files

%if 0%{?epel} < 10
%patch0 -p1 -b .overflow
%else
%patch 0 -p1 -b .overflow
%endif

Is there any hope of fixing this issue, or altenatively, a known workaround that
is compatible in both branches?

Susi

[Neal Gompa]

The alternative syntax that is backward compatible is using “-P 0" instead
of "0".

On Tue, Oct 29, 2024, 10:09 AM Susi Lehtola 
wrote:
> Hi,
>
> it appears rpm has now deprecated the old %patch syntax in rawhide, which
> means
> that any old-style expressions
>
> %patch0 -p1 -b .overflow
>
> must now be written as
>
> %patch 0 -p1 -b .overflow
>
> Unfortunately, all the epel branches, in turn, do not support the new
> %patch
> syntax. This means that one either
> cannot use the same spec file to build in epel or
> must introduce conditionals and duplicate code in the spec files
>
> %if 0%{?epel} < 10
> %patch0 -p1 -b .overflow
> %else
> %patch 0 -p1 -b .overflow
> %endif
>
> Is there any hope of fixing this issue, or altenatively, a known
> workaround that
> is compatible in both branches?
> Susi
>
> Susi Lehtola
> Fedora Project Contributor
> [e-mail]
>
> --
> _______________________________________________
> devel mailing list -- [e-mail]
> To unsubscribe send an email to [e-mail]
> Fedora Code of Conduct:
> https://docs.fedoraproject.org/en-US/project/code-of-conduct/
> List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
> List Archives:
> https://lists.fedoraproject.org/archives/list/[e-mail]
> Do not reply to spam, report it:
> https://pagure.io/fedora-infrastructure/new_issue

[Dan Čermák]

Hi Susi,

Susi Lehtola  writes:
> Hi,
>
> it appears rpm has now deprecated the old %patch syntax in rawhide, which means
> that any old-style expressions
>
> %patch0 -p1 -b .overflow
>
> must now be written as
>
> %patch 0 -p1 -b .overflow
>
> Unfortunately, all the epel branches, in turn, do not support the new %patch
> syntax. This means that one either
> cannot use the same spec file to build in epel or
> must introduce conditionals and duplicate code in the spec files
>
> %if 0%{?epel} < 10
> %patch0 -p1 -b .overflow
> %else
> %patch 0 -p1 -b .overflow
> %endif
>
> Is there any hope of fixing this issue, or altenatively, a known workaround that
> is compatible in both branches?

The following should work on all rpm versions [1]:
%patch -P1

Cheers,

Dan

Footnotes:
[1]  https://rpm-software-management.github.io/rpm/manual/spec.html#patch-1

[Tuomo Soini]

On Tue, 29 Oct 2024 11:08:50 +0200
Susi Lehtola  wrote:
> Unfortunately, all the epel branches, in turn, do not support the new
> %patch syntax. This means that one either
> cannot use the same spec file to build in epel or
> must introduce conditionals and duplicate code in the spec files
>
> %if 0%{?epel} < 10
> %patch0 -p1 -b .overflow
> %else
> %patch 0 -p1 -b .overflow
> %endif

There is another syntax which is compatible with all versions.

%patch -P 0 -p1 -b .overflow

This syntax is supported by all rpm versions in use.