Subject: [PATCH] experimental RPM spec change
"make rpm" with recent 'master' fails with:
RPM build errors:
Installed (but unpackaged) file(s) found:
/usr/lib/python2.6/site-packages/git_remote_helpers-0.1.0-py2.6.egg-info
/usr/lib/python2.6/site-packages/git_remote_helpers/__init__.py
/usr/lib/python2.6/site-packages/git_remote_helpers/__init__.pyc
/usr/lib/python2.6/site-packages/git_remote_helpers/git/__init__.py
/usr/lib/python2.6/site-packages/git_remote_helpers/git/__init__.pyc
/usr/lib/python2.6/site-packages/git_remote_helpers/git/git.py
/usr/lib/python2.6/site-packages/git_remote_helpers/git/git.pyc
/usr/lib/python2.6/site-packages/git_remote_helpers/util.py
/usr/lib/python2.6/site-packages/git_remote_helpers/util.pyc
Here is an attempt to fix it, but help is very appreciated, as I don't
know what the accepted way is to ship Python modules is in the RPM world.
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
git.spec.in | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/git.spec.in b/git.spec.in
index ab224f7..1aeba90 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -121,6 +121,7 @@ find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
%if %{!?_without_docs:1}0
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_libdir}/python* -type f | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%else
rm -rf $RPM_BUILD_ROOT%{_mandir}
%endif
--
1.7.0.rc0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html