Skip to content

Commit

Permalink
Merge pull request cms-sw#1607 from degano/git_nocpy_74XStable
Browse files Browse the repository at this point in the history
Remove patch for symlink and force them through makefile options instead
  • Loading branch information
aledegano committed Jun 5, 2015
2 parents d4d02b8 + 7a7c291 commit 9b717cb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 57 deletions.
53 changes: 0 additions & 53 deletions git-1.8.3.1-no-symlink.patch

This file was deleted.

9 changes: 5 additions & 4 deletions git.spec
Expand Up @@ -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
Patch1: git-1.8.3.1-no-symlink
Patch2: git-1.8.3.1-runtime
Patch0: 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
Expand All @@ -36,8 +36,7 @@ Provides: perl(Time::HiRes)

%prep
%setup -b 0 -n %{n}-%{realversion}
%patch1 -p1
%patch2 -p1
%patch0 -p1

%build
make prefix=%{i} \
Expand Down Expand Up @@ -86,6 +85,8 @@ make prefix=%{i} \
NO_PYTHON=1 \
RUNTIME_PREFIX=1 \
V=1 \
NO_CROSS_DIRECTORY_HARDLINKS=1 \
NO_INSTALL_HARDLINKS=1 \
%{makeprocesses} \
install

Expand Down

0 comments on commit 9b717cb

Please sign in to comment.