public inbox for cygwin-apps@cygwin.com
 help / color / mirror / Atom feed
From: Marco Atzeri <marco.atzeri@gmail.com>
To: cygwin-apps@cygwin.com
Subject: Re: [ITA] Git et al
Date: Fri, 15 Aug 2014 04:46:00 -0000	[thread overview]
Message-ID: <53ED90A3.5060407@gmail.com> (raw)
In-Reply-To: <53ED8B9A.4040409@redhat.com>

On 15/08/2014 06:24, Eric Blake wrote:
> On 08/13/2014 01:37 PM, Eric Blake wrote:
>
> Packaging isn't quite right.  After unpacking the -src tarball, I see a
> file git-2.0.4-1.src.patch, with contents:
>
> Binary files origsrc/git/t/lib-gpg/random_seed and
> src/git/t/lib-gpg/random_seed differ
> Binary files origsrc/git/t/lib-gpg/trustdb.gpg and
> src/git/t/lib-gpg/trustdb.gpg differ
>
> As a result, the prep phase fails with:
> *** ERROR: patch git-2.0.4-1.src.patch will not apply
>
> It's probably possible to patch git.cygport to cause the diff engine to
> ignore these files, and once they are ignored, then the file would not
> be created.

Adam,
just add

DIFF_EXCLUDES="random_seed trustdb.gpg"



> Removing that file lets cygport get further, but you'll need to respin
> the package so that it builds the first time without me having to delete
> the file.

Marco

  reply	other threads:[~2014-08-15  4:46 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-11 20:02 Adam Dinwoodie
2014-01-11 20:04 ` Adam Dinwoodie
2014-01-13  9:25 ` Corinna Vinschen
2014-01-13 21:32 ` Eric Blake
2014-01-13 23:59   ` Adam Dinwoodie
2014-01-15 11:06     ` Adam Dinwoodie
2014-01-17 18:42       ` Balaji Venkataraman
2014-01-17 18:48         ` Christopher Faylor
2014-01-17 22:58           ` Balaji Venkataraman
2014-01-24 14:25       ` Eric Blake
2014-01-29 11:53         ` Adam Dinwoodie
2014-01-29 16:54           ` Yaakov (Cygwin/X)
2014-01-29 17:07             ` Adam Dinwoodie
2014-01-30 10:00               ` Yaakov (Cygwin/X)
2014-01-29 17:45             ` Achim Gratz
2014-01-29 19:33               ` Jan Nijtmans
2014-01-29 19:56                 ` Achim Gratz
2014-06-10 22:00 ` Yaakov Selkowitz
2014-06-10 22:36   ` Adam Dinwoodie
2014-06-11  3:55     ` Achim Gratz
2014-06-11  4:23       ` Achim Gratz
2014-06-11  4:20     ` Yaakov Selkowitz
2014-07-19  7:29       ` Adam Dinwoodie
2014-07-19 13:54         ` Christopher Faylor
2014-07-19 23:47         ` David Rothenberger
2014-07-21  7:46           ` Adam Dinwoodie
2014-08-04 21:41             ` Adam Dinwoodie
2014-08-13 19:12               ` Adam Dinwoodie
2014-08-13 19:37                 ` Eric Blake
2014-08-15  4:25                   ` Eric Blake
2014-08-15  4:46                     ` Marco Atzeri [this message]
2014-08-15  8:25                     ` Adam Dinwoodie
2014-08-15  8:31                       ` Adam Dinwoodie
2014-08-15  7:05                 ` Yaakov Selkowitz
2014-08-20 20:19                   ` Adam Dinwoodie
2014-08-20 22:19                     ` Yaakov Selkowitz
2014-08-18 18:38                 ` Eric Blake
2014-09-21 12:57                   ` Andrew Schulman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=53ED90A3.5060407@gmail.com \
    --to=marco.atzeri@gmail.com \
    --cc=cygwin-apps@cygwin.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).