Re: Using git for patch management in Fedora

2014-01-29 Thread Pádraig Brady
On 11/19/2013 10:55 AM, Mathieu Bridon wrote: > On Tue, 2013-11-19 at 10:32 +, Richard W.M. Jones wrote: >> On Tue, Nov 19, 2013 at 06:28:47PM +0800, Mathieu Bridon wrote: >>> Or maybe we could start using %autosetup ? >>> >>> http://www.rpm.org/wiki/PackagerDocs/Autosetup >> >> '%autosetup -

Re: Using git for patch management in Fedora

2014-01-28 Thread Andrew Beekhof
On 19 Nov 2013, at 9:51 pm, Daniel P. Berrange wrote: > On Tue, Nov 19, 2013 at 10:22:42AM +, Richard W.M. Jones wrote: >> Several packages are using git for patch management. eg: >> >> http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 >> http://pkgs.fedoraproject.org/cgit

Re: Using git for patch management in Fedora

2013-11-24 Thread Richard W.M. Jones
On Fri, Nov 22, 2013 at 04:25:00PM +0100, Kevin Kofler wrote: > Richard W.M. Jones wrote: > > > Several packages are using git for patch management. eg: > > > > http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 > > http://pkgs.fedoraproject.org/cgit/libguestfs.git/tree/libguestf

Re: Using git for patch management in Fedora

2013-11-22 Thread Kevin Kofler
Richard W.M. Jones wrote: > Several packages are using git for patch management. eg: > > http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 > http://pkgs.fedoraproject.org/cgit/libguestfs.git/tree/libguestfs.spec?h=f20#n22 > http://pkgs.fedoraproject.org/cgit/qemu.git/tree/ > htt

Re: Using git for patch management in Fedora

2013-11-22 Thread Kevin Kofler
Richard W.M. Jones wrote: > This recipe has worked for me for years. The patches are probably > implicitly ordered by their names (ie. 0001-...patch etc) I think they're actually ordered by their patch number in the specfile. Kevin Kofler -- devel mailing list devel@lists.fedoraproject

Re: Using git for patch management in Fedora

2013-11-21 Thread Richard W.M. Jones
On Thu, Nov 21, 2013 at 11:41:34AM +0100, Karel Zak wrote: > On Thu, Nov 21, 2013 at 09:29:35AM +0100, Miroslav Suchý wrote: > > And if you call simply `tito build --rpm` with builder configured as > > `tito.distributionbuilder.DistributionBuilder`. It will create pristine tar > > ball from last up

Re: Using git for patch management in Fedora

2013-11-21 Thread Karel Zak
On Thu, Nov 21, 2013 at 09:29:35AM +0100, Miroslav Suchý wrote: > And if you call simply `tito build --rpm` with builder configured as > `tito.distributionbuilder.DistributionBuilder`. It will create pristine tar > ball from last upstream tag (and that tar have same timestamps as upstream > and the

Re: Using git for patch management in Fedora

2013-11-21 Thread Miroslav Suchý
On 11/19/2013 11:22 AM, Richard W.M. Jones wrote: Some of these packages have invented home-brewed methods to generate the Patch lines in the spec file, eg: FYI: Several projects use Tito [1], which allows you to operate on (unpacked) git tree (usually clonned). Do changes directly in git. An

Re: Using git for patch management in Fedora

2013-11-20 Thread Alek Paunov
On 20.11.2013 11:19, Richard W.M. Jones wrote: On Tue, Nov 19, 2013 at 03:36:54PM -0800, Toshio Kuratomi wrote: One note though, I think that in the past one of the discussion points we've foundered on is whether we want to be mirroring upstream's git repo or (approximately) upstream's releases.

Re: Using git for patch management in Fedora

2013-11-20 Thread Adam Jackson
On Tue, 2013-11-19 at 10:22 +, Richard W.M. Jones wrote: > which would expand to something like: > > git init > git config user.email "%{name}-ow...@fedoraproject.org" > git config user.name "%{name}" > git add . > git commit -a -q -m "%{version} baseline" > git am %{patches} Tri

Re: Using git for patch management in Fedora

2013-11-20 Thread Dridi Boukelmoune
Hi, For github-hosted upstreams, you can suffix some URLs with '.diff' or '.patch'. I have used it for vcsh [1] (which btw is a tool I'd recommend to anyone who keeps dotfiles in sync on several machines). I did that on a pull request, but you can also do that on a commit (for cherry-picking) [2]

Re: Using git for patch management in Fedora

2013-11-20 Thread Daniel P. Berrange
On Wed, Nov 20, 2013 at 09:58:00AM +0100, Karel Zak wrote: > On Tue, Nov 19, 2013 at 02:20:30PM +, Daniel P. Berrange wrote: > > On Tue, Nov 19, 2013 at 01:29:06PM +, Richard W.M. Jones wrote: > > > On Tue, Nov 19, 2013 at 01:39:50PM +0100, Karel Zak wrote: > > > > We have to learn fedpkg t

Re: Using git for patch management in Fedora

2013-11-20 Thread Daniel P. Berrange
On Tue, Nov 19, 2013 at 03:36:54PM -0800, Toshio Kuratomi wrote: > On Tue, Nov 19, 2013 at 05:32:01PM +, Daniel P. Berrange wrote: > > On Tue, Nov 19, 2013 at 07:27:20PM +0200, Alek Paunov wrote: > > > On 19.11.2013 16:20, Daniel P. Berrange wrote: > > > >On Tue, Nov 19, 2013 at 01:29:06PM +000

Re: Using git for patch management in Fedora

2013-11-20 Thread Richard W.M. Jones
On Tue, Nov 19, 2013 at 03:36:54PM -0800, Toshio Kuratomi wrote: > One note though, I think that in the past one of the discussion points we've > foundered on is whether we want to be mirroring upstream's git repo or > (approximately) upstream's releases. I think that's probably where we'd > need

Re: Using git for patch management in Fedora

2013-11-20 Thread Peter Lemenkov
2013/11/20 Karel Zak : > All such information belong to spec file :-) > > Fedora-SCM: > Upstream-SCM: > Exploded-tree-SCM: > > for example upstream SCM URL is already missing in our spec files, > it's more important information than URL to tarball. Love this idea but there is a problem - RP

Re: Using git for patch management in Fedora

2013-11-20 Thread Karel Zak
On Tue, Nov 19, 2013 at 02:20:30PM +, Daniel P. Berrange wrote: > On Tue, Nov 19, 2013 at 01:29:06PM +, Richard W.M. Jones wrote: > > On Tue, Nov 19, 2013 at 01:39:50PM +0100, Karel Zak wrote: > > > We have to learn fedpkg to do all the magic ;-) Something like > > > > > > add remote git t

Re: Using git for patch management in Fedora

2013-11-19 Thread Toshio Kuratomi
On Tue, Nov 19, 2013 at 05:32:01PM +, Daniel P. Berrange wrote: > On Tue, Nov 19, 2013 at 07:27:20PM +0200, Alek Paunov wrote: > > On 19.11.2013 16:20, Daniel P. Berrange wrote: > > >On Tue, Nov 19, 2013 at 01:29:06PM +, Richard W.M. Jones wrote: > > >>On Tue, Nov 19, 2013 at 01:39:50PM +01

Re: Using git for patch management in Fedora

2013-11-19 Thread Richard W.M. Jones
On Tue, Nov 19, 2013 at 07:27:20PM +0200, Alek Paunov wrote: > On 19.11.2013 16:20, Daniel P. Berrange wrote: > >On Tue, Nov 19, 2013 at 01:29:06PM +, Richard W.M. Jones wrote: > >>On Tue, Nov 19, 2013 at 01:39:50PM +0100, Karel Zak wrote: > >>>We have to learn fedpkg to do all the magic ;-) So

Re: Using git for patch management in Fedora

2013-11-19 Thread Alek Paunov
On 19.11.2013 19:32, Daniel P. Berrange wrote: On Tue, Nov 19, 2013 at 07:27:20PM +0200, Alek Paunov wrote: What about intermediate step: optional "fNN-upstream" branch in addition to fNN, containing relevant upstream revision as git submodule (preferably referencing fedorahosted mirror, but ini

Re: Using git for patch management in Fedora

2013-11-19 Thread Daniel P. Berrange
On Tue, Nov 19, 2013 at 07:27:20PM +0200, Alek Paunov wrote: > On 19.11.2013 16:20, Daniel P. Berrange wrote: > >On Tue, Nov 19, 2013 at 01:29:06PM +, Richard W.M. Jones wrote: > >>On Tue, Nov 19, 2013 at 01:39:50PM +0100, Karel Zak wrote: > >>>We have to learn fedpkg to do all the magic ;-) So

Re: Using git for patch management in Fedora

2013-11-19 Thread Alek Paunov
On 19.11.2013 16:20, Daniel P. Berrange wrote: On Tue, Nov 19, 2013 at 01:29:06PM +, Richard W.M. Jones wrote: On Tue, Nov 19, 2013 at 01:39:50PM +0100, Karel Zak wrote: We have to learn fedpkg to do all the magic ;-) Something like add remote git tree with exploded tree: fedpkg explod

Re: Using git for patch management in Fedora

2013-11-19 Thread Daniel P. Berrange
On Tue, Nov 19, 2013 at 01:29:06PM +, Richard W.M. Jones wrote: > On Tue, Nov 19, 2013 at 01:39:50PM +0100, Karel Zak wrote: > > We have to learn fedpkg to do all the magic ;-) Something like > > > > add remote git tree with exploded tree: > > > > fedpkg exploded-tree add ssh://git.fedoraho

Re: Using git for patch management in Fedora

2013-11-19 Thread Pádraig Brady
This is definitely worth formalizing. On 11/19/2013 10:22 AM, Richard W.M. Jones wrote: > Several packages are using git for patch management. eg: > > http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 > http://pkgs.fedoraproject.org/cgit/libguestfs.git/tree/libguestfs.spec?h=f20

Re: Using git for patch management in Fedora

2013-11-19 Thread Richard W.M. Jones
On Tue, Nov 19, 2013 at 01:39:50PM +0100, Karel Zak wrote: > We have to learn fedpkg to do all the magic ;-) Something like > > add remote git tree with exploded tree: > > fedpkg exploded-tree add ssh://git.fedorahosted.org/git/foo.git This is all great, but the problem is that co-maintainers

Re: Using git for patch management in Fedora

2013-11-19 Thread Karel Zak
On Tue, Nov 19, 2013 at 12:14:42PM +, Richard W.M. Jones wrote: > On Tue, Nov 19, 2013 at 12:51:29PM +0100, Karel Zak wrote: > > On Tue, Nov 19, 2013 at 10:51:01AM +, Daniel P. Berrange wrote: > > > Yep, I've done the same thing for all the packages I maintain in Fedora > > > and RHEL too.

Re: Using git for patch management in Fedora

2013-11-19 Thread Richard W.M. Jones
On Tue, Nov 19, 2013 at 12:51:29PM +0100, Karel Zak wrote: > On Tue, Nov 19, 2013 at 10:51:01AM +, Daniel P. Berrange wrote: > > Yep, I've done the same thing for all the packages I maintain in Fedora > > and RHEL too. It makes maintaining RPMs soo much easier, particularly > > when you have lo

Re: Using git for patch management in Fedora

2013-11-19 Thread Karel Zak
On Tue, Nov 19, 2013 at 10:51:01AM +, Daniel P. Berrange wrote: > Yep, I've done the same thing for all the packages I maintain in Fedora > and RHEL too. It makes maintaining RPMs soo much easier, particularly > when you have lots of patches to manage. The script I use is > > > http://pkgs

Re: Using git for patch management in Fedora

2013-11-19 Thread Richard W.M. Jones
On Tue, Nov 19, 2013 at 11:46:46AM +0100, Nikola Pajkovsky wrote: > "Richard W.M. Jones" writes: > > git init > > git config user.email "%{name}-ow...@fedoraproject.org" > > git config user.name "%{name}" > > git add . > > git commit -a -q -m "%{version} baseline" > > git am %{patches}

Re: Using git for patch management in Fedora

2013-11-19 Thread Richard W.M. Jones
On Tue, Nov 19, 2013 at 02:42:00PM +0400, Peter Lemenkov wrote: > 2013/11/19 Peter Lemenkov : > > 2013/11/19 Richard W.M. Jones : > > > >> Peter, is the comment in the spec file wrong? It refers to two github > >> repos: > >> > >> http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46

Re: Using git for patch management in Fedora

2013-11-19 Thread Mathieu Bridon
On Tue, 2013-11-19 at 10:32 +, Richard W.M. Jones wrote: > On Tue, Nov 19, 2013 at 06:28:47PM +0800, Mathieu Bridon wrote: > > Or maybe we could start using %autosetup ? > > > > http://www.rpm.org/wiki/PackagerDocs/Autosetup > > '%autosetup -S git' for sure, not plain %autosetup. > > Git c

Re: Using git for patch management in Fedora

2013-11-19 Thread Daniel P. Berrange
On Tue, Nov 19, 2013 at 10:22:42AM +, Richard W.M. Jones wrote: > Several packages are using git for patch management. eg: > > http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 > http://pkgs.fedoraproject.org/cgit/libguestfs.git/tree/libguestfs.spec?h=f20#n22 > http://pkgs.fe

Re: Using git for patch management in Fedora

2013-11-19 Thread Nikola Pajkovsky
"Richard W.M. Jones" writes: > Several packages are using git for patch management. eg: > > http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 > http://pkgs.fedoraproject.org/cgit/libguestfs.git/tree/libguestfs.spec?h=f20#n22 > http://pkgs.fedoraproject.org/cgit/qemu.git/tree/ >

Re: Using git for patch management in Fedora

2013-11-19 Thread Peter Lemenkov
2013/11/19 Peter Lemenkov : > 2013/11/19 Richard W.M. Jones : > >> Peter, is the comment in the spec file wrong? It refers to two github >> repos: >> >> http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 > > Oops, thanks for pointing me on this. Yes, that's just leftover and > shou

Re: Using git for patch management in Fedora

2013-11-19 Thread Peter Lemenkov
2013/11/19 Richard W.M. Jones : > Peter, is the comment in the spec file wrong? It refers to two github > repos: > > http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 Oops, thanks for pointing me on this. Yes, that's just leftover and should be removed. And the entire patch gene

Re: Using git for patch management in Fedora

2013-11-19 Thread Richard W.M. Jones
On Tue, Nov 19, 2013 at 02:32:58PM +0400, Peter Lemenkov wrote: > 2013/11/19 Richard W.M. Jones : > > Several packages are using git for patch management. eg: > > > > http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 > > http://pkgs.fedoraproject.org/cgit/libguestfs.git/tree/libgu

Re: Using git for patch management in Fedora

2013-11-19 Thread Richard W.M. Jones
On Tue, Nov 19, 2013 at 06:28:47PM +0800, Mathieu Bridon wrote: > On Tue, 2013-11-19 at 10:22 +, Richard W.M. Jones wrote: > > For (2) I would suggest a lightweight technique where git-managed > > patches are marked in the spec file using: > > > > ### GIT-MANAGED-PATCHES ### > > ### END-GI

Re: Using git for patch management in Fedora

2013-11-19 Thread Peter Lemenkov
2013/11/19 Richard W.M. Jones : > Several packages are using git for patch management. eg: > > http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 > http://pkgs.fedoraproject.org/cgit/libguestfs.git/tree/libguestfs.spec?h=f20#n22 > http://pkgs.fedoraproject.org/cgit/qemu.git/tree/ >

Re: Using git for patch management in Fedora

2013-11-19 Thread Mathieu Bridon
On Tue, 2013-11-19 at 10:22 +, Richard W.M. Jones wrote: > For (2) I would suggest a lightweight technique where git-managed > patches are marked in the spec file using: > > ### GIT-MANAGED-PATCHES ### > ### END-GIT-MANGED-PATCHES ### > > and a simple script that replaces everything betwe

Using git for patch management in Fedora

2013-11-19 Thread Richard W.M. Jones
Several packages are using git for patch management. eg: http://pkgs.fedoraproject.org/cgit/erlang.git/tree/erlang.spec#n46 http://pkgs.fedoraproject.org/cgit/libguestfs.git/tree/libguestfs.spec?h=f20#n22 http://pkgs.fedoraproject.org/cgit/qemu.git/tree/ http://pkgs.fedoraproject.org/cgit/ocaml.g