[PATCH] Do not try installing SVNimport on RPM
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:42:10
Subsystem:
kernel build + files below scripts/ (unless maintained elsewhere), the rest · Maintainers:
Nathan Chancellor, Nicolas Schier, Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · Re: [PATCH] Do not try installing SVNimport on RPM · Junio C Hamano <hidden>
HPA reports that svnimport uses perl 5.8.4 and the syntax it
uses to require confuses rpmbuild. So let's try demoting the
problematic script just like we do with send-email.
Somebody should supply tested patches to split the package or
whatever is needed if they want to use these scripts on RPM
based systems.
Signed-off-by: Junio C Hamano <redacted>
---
"H. Peter Anvin" [off-list ref] writes:
> git-svnimport.perl:require v5.8.0; # for shell-safe open("-|",LIST)
>
> ... which RPM thinks means that you need a Perl module called v5.8.0
> which doesn't, of course, exist. This is arguably an rpmbuild bug, but
> it nevertheless breaks at the moment.
>
> I'm afraid I cannot update any of the kernel.org machines to 0.99.9
> until these problems have been cleaned up.
Does this work for you?
Makefile | 10 ++++++++--
debian/changelog | 6 ++++++
debian/rules | 3 ++-
git.sh | 1 +
4 files changed, 17 insertions(+), 3 deletions(-)
applies-to: 5d3fb770835ba710480cbaf0c1b076a3a4affc54
e217a63c79ad93b26cb816eede1baf34e27b1e61diff --git a/Makefile b/Makefile
index 1163dda..c60fb6b 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)
@@ -94,7 +94,7 @@ SCRIPT_SH = \ SCRIPT_PERL = \ git-archimport.perl git-cvsimport.perl git-relink.perl \ git-rename.perl git-shortlog.perl git-fmt-merge-msg.perl \ - git-findtags.perl git-svnimport.perl git-mv.perl + git-findtags.perl git-mv.perl SCRIPT_PYTHON = \ git-merge-recursive.py
@@ -142,6 +142,12 @@ else GIT_LIST_TWEAK += -e '/^send-email$$/d' endif +ifdef WITH_SVNIMPORT + SCRIPT_PERL += git-svnimport.perl +else + GIT_LIST_TWEAK += -e '/^svnimport$$/d' +endif + LIB_FILE=libgit.a LIB_H = \
diff --git a/debian/changelog b/debian/changelog
index 5fd31b7..5c5ba55 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 14:30:03 -0800 + git-core (0.99.9-0) unstable; urgency=low * GIT 0.99.9
diff --git a/debian/rules b/debian/rules
index 568d430..e6b6bad 100755
--- a/debian/rules
+++ b/debian/rules@@ -26,8 +26,9 @@ else endif # We do have the requisite perl modules in the mainline, and -# have no reason to shy away from this script. +# have no reason to shy away from these scripts. export WITH_SEND_EMAIL=YesPlease +export WITH_SVNIMPORT=YesPlease PREFIX := /usr MANDIR := /usr/share/man/
diff --git a/git.sh b/git.sh
index 94940ae..cd800bc 100755
--- a/git.sh
+++ b/git.sh@@ -70,6 +70,7 @@ send-email shortlog show-branch status +svnimport tag verify-tag whatchanged
--- 0.99.9.GIT