Merge pull request #1706 from degano/revert_git_75X

Revert "Remove patch for symlink and force them through makefile opti…

git-1.8.3.1-no-symlink.patch

@@ -0,0 +1,53 @@
+diff --git a/Makefile b/Makefile
+index 0f931a2..db0d69e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1705,8 +1705,6 @@ version.sp version.s version.o: EXTRA_CPPFLAGS = \
+
+ $(BUILT_INS): git$X
+ 	$(QUIET_BUILT_IN)$(RM) $@ && \
+-	ln git$X $@ 2>/dev/null || \
+-	ln -s git$X $@ 2>/dev/null || \
+ 	cp git$X $@
+
+ common-cmds.h: ./generate-cmdlist.sh command-list.txt
+@@ -2026,8 +2024,6 @@ git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
+
+ $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
+ 	$(QUIET_LNCP)$(RM) $@ && \
+-	ln $< $@ 2>/dev/null || \
+-	ln -s $< $@ 2>/dev/null || \
+ 	cp $< $@
+
+ $(REMOTE_CURL_PRIMARY): remote-curl.o http.o http-walker.o GIT-LDFLAGS $(GITLIBS)
+@@ -2326,30 +2322,23 @@ endif
+ 	  for p in git$X $(filter $(install_bindir_programs),$(ALL_PROGRAMS)); do \
+ 		$(RM) "$$execdir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)$(NO_CROSS_DIRECTORY_HARDLINKS)" && \
+-		ln "$$bindir/$$p" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$bindir/$$p" "$$execdir/$$p" || exit; \
+ 	  done; \
+ 	} && \
+ 	for p in $(filter $(install_bindir_programs),$(BUILT_INS)); do \
+ 		$(RM) "$$bindir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)" && \
+-		ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
+-		ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
+ 		cp "$$bindir/git$X" "$$bindir/$$p" || exit; \
+ 	done && \
+ 	for p in $(BUILT_INS); do \
+ 		$(RM) "$$execdir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)" && \
+-		ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
+-		ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
+ 	done && \
+ 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
+ 	for p in $$remote_curl_aliases; do \
+ 		$(RM) "$$execdir/$$p" && \
+ 		test -z "$(NO_INSTALL_HARDLINKS)" && \
+-		ln "$$execdir/git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+-		ln -s "git-remote-http$X" "$$execdir/$$p" 2>/dev/null || \
+ 		cp "$$execdir/git-remote-http$X" "$$execdir/$$p" || exit; \
+ 	done && \
+ 	./check_bindir "z$$bindir" "z$$execdir" "$$bindir/git-add$X"

git.spec

@@ -5,13 +5,13 @@
 ## INITENV SET GIT_SSL_CAINFO %{i}/share/ssl/certs/ca-bundle.crt
 ## INITENV SET GIT_EXEC_PATH %{i}/libexec/git-core
 
-
 %define isDarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac)
 %define isNotDarwin %(case %{cmsos} in (osx*) echo 0 ;; (*) echo 1 ;; esac)
 %define isSlc %(case %{cmsos} in (slc*) echo 1 ;; (*) echo 0 ;; esac)
 
 Source0: https://github.com/git/git/archive/v%{realversion}.tar.gz
-Patch0: git-1.8.3.1-runtime
+Patch1: git-1.8.3.1-no-symlink
+Patch2: git-1.8.3.1-runtime
 
 %define curl_tag curl-7_31_0
 Source1: https://raw.github.com/bagder/curl/%{curl_tag}/lib/mk-ca-bundle.pl
@@ -36,7 +36,8 @@ Provides: perl(Time::HiRes)
 
 %prep
 %setup -b 0 -n %{n}-%{realversion}
-%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 make prefix=%{i} \
@@ -85,8 +86,6 @@ make prefix=%{i} \
      NO_PYTHON=1 \
      RUNTIME_PREFIX=1 \
      V=1 \
-     NO_CROSS_DIRECTORY_HARDLINKS=1 \
-     NO_INSTALL_HARDLINKS=1 \
      %{makeprocesses} \
      install