From a9c7c4364a6c1e0d95790cf2c8697b5b6ff30b1b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 30 Jan 2010 09:45:11 -0800 Subject: [PATCH] RPM packaging: don't include foreign-scm-helper bits yet The files in /usr/lib/python* are only the support infrastructure for foreign scm interface yet to be written and/or shipped with git. Don't include them in the binary package (this will also free us from Python dependency). When we ship with foreign scm interface, we will need to package these files with it in a separate subpackage, but we are not there yet. Signed-off-by: Junio C Hamano --- git.spec.in | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/git.spec.in b/git.spec.in index ab224f7eae..0a031088da 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: %define 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,9 @@ rm -rf $RPM_BUILD_ROOT # No files for you! %changelog +* Sat Jan 30 2010 Junio C Hamano +- We don't ship Python bits until a real foreign scm interface comes. + * Mon Feb 04 2009 David J. Mellor - fixed broken git help -w after renaming the git-core package to git. -- 2.11.4.GIT