annotate.perl triggers rpm bug

annotate.perl triggers rpm bug

[sean]

Hi Ryan

Commit 87475f4 exposes a problem in the creation of rpms (at least
on Fedora boxes).   RPM automatically creates a dependency for any
perl "use" lines, and the above commit fools it into creating a false 
dependecy for the nonexistent perl package "revs" because of this
portion of the diff:

+       -S, --rev-file revs-file
+                       use revs from revs-file instead of calling git-rev-list
                        ^^ fools rpm

Obviously this creates a problem when someone goes to install the git-core
rpm.  Any chance we could get a small change to work around this bug in rpm?

Thanks,
Sean


diff --git a/git-annotate.perl b/git-annotate.perl
index feea0a2..6805b8b 100755
--- a/git-annotate.perl
+++ b/git-annotate.perl
@@ -20,7 +20,7 @@ sub usage() {
        -r, --rename
                        Follow renames (Defaults on).
        -S, --rev-file revs-file
-                       use revs from revs-file instead of calling git-rev-list
+                       uses revs from revs-file instead of calling git-rev-list
        -h, --help
                        This message.
 ';

Re: annotate.perl triggers rpm bug

[Junio C Hamano]

sean <seanlkml@sympatico.ca> writes:

> ....   RPM automatically creates a dependency for any
> perl "use" lines, and the above commit fools it into creating a false 
> dependecy...

Sheesh -- broken packaging.

> diff --git a/git-annotate.perl b/git-annotate.perl
> index feea0a2..6805b8b 100755
> --- a/git-annotate.perl
> +++ b/git-annotate.perl
> @@ -20,7 +20,7 @@ sub usage() {
>         -r, --rename
>                         Follow renames (Defaults on).
>         -S, --rev-file revs-file
> -                       use revs from revs-file instead of calling git-rev-list
> +                       uses revs from revs-file instead of calling git-rev-list
>         -h, --help
>                         This message.
>  ';

How about upcasing the word like other lines?

Re: annotate.perl triggers rpm bug

[sean]

On Fri, 10 Mar 2006 23:11:01 -0800
Junio C Hamano <junkio@cox.net> wrote:

> Sheesh -- broken packaging.

Yeah, not rpm's proudest moment.

> How about upcasing the word like other lines?

That seems to fix the dependency problem too and makes a little
more sense.

Sean


diff --git a/git-annotate.perl b/git-annotate.perl
index feea0a2..9df72a1 100755
--- a/git-annotate.perl
+++ b/git-annotate.perl
@@ -20,7 +20,7 @@ sub usage() {
 	-r, --rename
 			Follow renames (Defaults on).
 	-S, --rev-file revs-file
-			use revs from revs-file instead of calling git-rev-list
+			Use revs from revs-file instead of calling git-rev-list
 	-h, --help
 			This message.
 ';