On Tue, Oct 24, 2006 at 10:35:38PM -0700, Junio C Hamano wrote:
> Gerrit Pape <pape@xxxxxxxxxxx> writes:
> > Hi, there're two programs in the git-arch rpm that shouldn't be there:
> So we need at least this?
And this I think, but can't test it.
diff --git a/git.spec.in b/git.spec.in
index 9b1217a..0dbee39 100644
--- a/git.spec.in
+++ b/git.spec.in
@@ -96,10 +96,10 @@ find $RPM_BUILD_ROOT -type f -name .pack
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "git-archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(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 "arch|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
+(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "git-archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
%else
rm -rf $RPM_BUILD_ROOT%{_mandir}
%endif
> diff --git a/git.spec.in b/git.spec.in
> index 9b1217a..b61a338 100644
> --- a/git.spec.in
> +++ b/git.spec.in
> @@ -126,10 +126,10 @@ # These are no files in the root package
>
> %files arch
> %defattr(-,root,root)
> -%doc Documentation/*arch*.txt
> -%{_bindir}/*arch*
> -%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
> -%{!?_without_docs: %doc Documentation/*arch*.html }
> +%doc Documentation/git-archimport.txt
> +%{_bindir}/git-archimport
> +%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
> +%{!?_without_docs: %doc Documentation/git-archimport.html }
>
> %files email
> %defattr(-,root,root)
-
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