Skip to content

Commit a9c7c43

Browse files
committed
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 <[email protected]>
1 parent bfac23d commit a9c7c43

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

git.spec.in

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ BuildRequires: perl(Error)
9898
Perl interface to Git
9999

100100
%define path_settings ETC_GITCONFIG=/etc/gitconfig prefix=%{_prefix} mandir=%{_mandir} htmldir=%{_docdir}/%{name}-%{version}
101+
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
101102

102103
%prep
103104
%setup -q
@@ -112,6 +113,7 @@ rm -rf $RPM_BUILD_ROOT
112113
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
113114
%{path_settings} \
114115
INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
116+
test ! -d $RPM_BUILD_ROOT%{python_sitelib} || rm -fr $RPM_BUILD_ROOT%{python_sitelib}
115117
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
116118
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
117119
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
@@ -190,6 +192,9 @@ rm -rf $RPM_BUILD_ROOT
190192
# No files for you!
191193

192194
%changelog
195+
* Sat Jan 30 2010 Junio C Hamano <[email protected]>
196+
- We don't ship Python bits until a real foreign scm interface comes.
197+
193198
* Mon Feb 04 2009 David J. Mellor <[email protected]>
194199
- fixed broken git help -w after renaming the git-core package to git.
195200

0 commit comments

Comments
 (0)