diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-10 09:10:51 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-10 09:10:51 -0800 |
| commit | c444c16589f95ac22d8e3ffe603cd7f0613512ce (patch) | |
| tree | 31d2e0c2a77344201af6f3ee5427f47218dec9bb /git.spec.in | |
| parent | 77f143bf3e218857ec8e5244d7e862e8e0c1a041 (diff) | |
| parent | 81b50f3ce40bfdd66e5d967bf82be001039a9a98 (diff) | |
| download | git-c444c16589f95ac22d8e3ffe603cd7f0613512ce.tar.gz | |
Merge "Move 'builtin-*' into a 'builtin/' subdirectory"ly/mktree-using-strbuf
Diffstat (limited to 'git.spec.in')
| -rw-r--r-- | git.spec.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/git.spec.in b/git.spec.in index 4be0834f0b..ee74a5eed7 100644 --- a/git.spec.in +++ b/git.spec.in @@ -98,6 +98,7 @@ BuildRequires: perl(Error) Perl interface to Git %define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-%{version} +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %prep %setup -q @@ -112,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \ %{path_settings} \ INSTALLDIRS=vendor install %{!?_without_docs: install-doc} +test ! -d $RPM_BUILD_ROOT%{python_sitelib} || rm -fr $RPM_BUILD_ROOT%{python_sitelib} find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';' @@ -190,6 +192,12 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sun Jan 31 2010 Junio C Hamano <gitster@pobox.com> +- Do not use %define inside %{!?...} construct. + +* Sat Jan 30 2010 Junio C Hamano <gitster@pobox.com> +- We don't ship Python bits until a real foreign scm interface comes. + * Mon Feb 04 2009 David J. Mellor <dmellor@whistlingcat.com> - fixed broken git help -w after renaming the git-core package to git. @@ -233,7 +241,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Mar 27 2007 Eygene Ryabinkin <rea-git@codelabs.ru> - Added the git-p4 package: Perforce import stuff. -* Mon Feb 13 2007 Nicolas Pitre <nico@cam.org> +* Mon Feb 13 2007 Nicolas Pitre <nico@fluxnic.net> - Update core package description (Git isn't as stupid as it used to be) * Mon Feb 12 2007 Junio C Hamano <junkio@cox.net> |