On Thu, Jan 07, 2010 at 09:28:26AM -0800, Jesse Keating wrote:
> As I proceed to port our make system over into fedpkg, I've ran across a
> couple targets that are giving me pause.
>
> Is anybody out there making use of the following targets?

> patch

I use this quite often to generate patches, but unluckily it only works
if the tarball is extracted into a dir called %{name}-%{version}.
I believe there is also a "rediff" target, which just renegerates a
patch and copies the comment above the patch.

> unused-patches

I use this to easily get a list of patches I can "cvs remove" after I
removed them from the spec.

Regards
Till
--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list

On Thu, Jan 07, 2010 at 07:47:10PM +0100, Enrico Scholz wrote:
> Jonathan Underwood <jonathan.underwood@gmail.com> writes:
>
> > I have used make patch quite a bit when developing patches. I guess
> > it's just a wrapper around gendiff though, so it maybe redundant i.e.
> > in my use case I could have been using gendiff.
>
> fwiw, 'gendiff' does not retain comments in patches and fails when one
> file is touched by multiple patches. I wrote a wrapper around 'quilt'
> which is used like

Iirc there is a rediff target to keep the comments in a spec. gendiff
works with multiple patches if one only wants to modify the last patch
and the patches are applied with the right backup-suffixes in %patch.

>
> | %apply -n23 -p1
>
> This expands to
>
> | quilt import -p 1 %PATCH23
> | quilt push -f
>
> resp.
>
> | %patch23 -p1
>
> on systems without this macro. Refreshing and developing of patches is
> very easy in this way.

Would you please provide more instructions about how to implement it and
how to use it?

Regards
Till
--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list

Till Maas <opensource@till.name> writes:

> Would you please provide more instructions about how to implement it and
> how to use it?

quilt has builtin support for spec files. You only need to run "quilt
setup foo.spec".

Andreas.

--
Andreas Schwab, schwab@redhat.com
GPG Key fingerprint = D4E8 DBE3 3813 BB5D FA84 5EC7 45C6 250E 6F00 984E
"And now for something completely different."

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list

On Thu, 07 Jan 2010 18:28:26 +0100, Jesse Keating wrote:
> Is anybody out there making use of the following targets?

I wanted to use this one:

> unused-fedora-patches

but it does not work, it works only for kernel; fix has been ignored:
https://fedorahosted.org/fedora-infrastructure/ticket/1881


Regards,
Jan

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list

Till Maas <opensource@till.name> writes:

> Iirc there is a rediff target to keep the comments in a spec.

I never got this to work; e.g.

$ LANG=C make rediff SUFFIX=arridx
/bin/sh: line 0: cd: /var/tmp/sessiondir-ensc.1262717944.trKTtL/cvsextras/hunt-1.5/..: No such file or directory


It seems to assume a %name-%version-$SUFFIX.patch naming scheme. Lot of
my patches are from a previous %version so that it does not apply.


>> | %apply -n23 -p1
>
> Would you please provide more instructions about how to implement it and
> how to use it?

Place

| %{!?apply:%global apply(p:n:b %patch%%{-n:%%{-n*}} %%{-p:-p %%{-p*}} %%{-b:-b %%{-b*}}
| %nil}

in every .spec file and replace

| %patchX -pN

by

| %apply -nX -pN

there. In your local ~/.rpmmacros, add

--------
%apply(p:n:b
if test -n "$RPM_NO_DEVEL"; then
%patch%{-n:%{-n*}} %-p %-b
else
quilt import %-p %{!-p:-p 0} %{P:%{-n*}}
quilt push -f;
fi
%nil
--------

Do *not* indent the %patch line; %patchX seems to be implemented very
tricky in rpm and does not work when it does not start on the beginning
of a line.



Enrico

--
fedora-devel-list mailing list
fedora-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/fedora-devel-list