This is based on Ryan's suggestion. Running 'rpm --requires' on the resulting RPM seems to want these -- which I cannot judge if this would be something that satisfies you. I'd push it out if it is OK with you. Also I do not see "use v5.8.0" you mentioned in a separate message anywhere in the tree, so I am hoping that should be OK. junio@hera:~/git(0)$ R=~/rpms/RPMS/i386/git-core-0.99.9a-1.i386.rpm junio@hera:~/git(0)$ rpm -q -i -p $R --requires | grep 'perl ' /usr/bin/perl perl >= 0:5.006 perl >= 0:5.008 junio@hera:~/git(0)$ exit ------------ [PATCH] Work around an RPM build problem. The require statement at the top of git-svnimport seems to confuse rpmbuild dependency generation. It uses the newer notation "v5.8.0", and rpm ends up requiring "perl(v5.8.0)", while we would want it to say something like "perl >= 0:5.008". Ryan suggests old-style "require 5.008" might fix this problem, so here it is. Signed-off-by: Junio C Hamano <junkio@cox.net> --- git-svnimport.perl | 2 +- Makefile | 2 +- debian/changelog | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) applies-to: 5d3fb770835ba710480cbaf0c1b076a3a4affc54 c846e15ee31b7226a715646f633fc1fdd2e14cd9 diff --git a/git-svnimport.perl b/git-svnimport.perl index 20a8572..45b6a19 100755 --- a/git-svnimport.perl +++ b/git-svnimport.perl @@ -10,7 +10,7 @@ # The head revision is on branch "origin" by default. # You can change that with the '-o' option. -require v5.8.0; # for shell-safe open("-|",LIST) +require 5.008; # for shell-safe open("-|",LIST) use strict; use warnings; use Getopt::Std; diff --git a/Makefile b/Makefile index 1163dda..5bb5108 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ # DEFINES += -DUSE_STDEV -GIT_VERSION = 0.99.9.GIT +GIT_VERSION = 0.99.9a CFLAGS = -g -O2 -Wall ALL_CFLAGS = $(CFLAGS) $(PLATFORM_DEFINES) $(DEFINES) diff --git a/debian/changelog b/debian/changelog index 5fd31b7..7d18483 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +git-core (0.99.9a-0) unstable; urgency=low + + * GIT 0.99.9a + + -- Junio C Hamano <junkio@cox.net> Sun, 30 Oct 2005 15:03:32 -0800 + git-core (0.99.9-0) unstable; urgency=low * GIT 0.99.9 --- 0.99.9.GIT - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Mon Oct 31 10:40:21 2005
This archive was generated by hypermail 2.1.8 : 2005-10-31 10:40:25 EST