git-*arch* in git-arch rpm

git-*arch* in git-arch rpm

[Gerrit Pape]

Hi, there're two programs in the git-arch rpm that shouldn't be there:

 $ rpm -qlp git-arch-1.4.3.2-1.i386.rpm 
 /usr/bin/git-archimport
 /usr/bin/git-archive
 /usr/bin/git-upload-archive
 /usr/share/doc/git-arch-1.4.3.2
 /usr/share/doc/git-arch-1.4.3.2/git-archimport.html
 /usr/share/doc/git-arch-1.4.3.2/git-archimport.txt
 /usr/share/doc/git-arch-1.4.3.2/git-archive.html
 /usr/share/doc/git-arch-1.4.3.2/git-archive.txt
 /usr/share/doc/git-arch-1.4.3.2/git-upload-archive.html
 /usr/share/doc/git-arch-1.4.3.2/git-upload-archive.txt
 /usr/share/man/man1/git-archimport.1.gz
 /usr/share/man/man1/git-archive.1.gz
 /usr/share/man/man1/git-upload-archive.1.gz
 $ 

Re: git-*arch* in git-arch rpm

[Junio C Hamano]

Gerrit Pape <pape@smarden.org> writes:

> Hi, there're two programs in the git-arch rpm that shouldn't be there:
>
>  $ rpm -qlp git-arch-1.4.3.2-1.i386.rpm 
>  /usr/bin/git-archimport
>  /usr/bin/git-archive
>  /usr/bin/git-upload-archive
>  /usr/share/doc/git-arch-1.4.3.2
>  /usr/share/doc/git-arch-1.4.3.2/git-archimport.html
>  /usr/share/doc/git-arch-1.4.3.2/git-archimport.txt
>  /usr/share/doc/git-arch-1.4.3.2/git-archive.html
>  /usr/share/doc/git-arch-1.4.3.2/git-archive.txt
>  /usr/share/doc/git-arch-1.4.3.2/git-upload-archive.html
>  /usr/share/doc/git-arch-1.4.3.2/git-upload-archive.txt
>  /usr/share/man/man1/git-archimport.1.gz
>  /usr/share/man/man1/git-archive.1.gz
>  /usr/share/man/man1/git-upload-archive.1.gz
>  $ 
>
> Regards, Gerrit.

So we need at least this?

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)

Re: git-*arch* in git-arch rpm

[Gerrit Pape]

On Tue, Oct 24, 2006 at 10:35:38PM -0700, Junio C Hamano wrote:
> Gerrit Pape <pape@smarden.org> 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

Re: git-*arch* in git-arch rpm

[Junio C Hamano]

Gerrit Pape <pape@smarden.org> writes:

> On Tue, Oct 24, 2006 at 10:35:38PM -0700, Junio C Hamano wrote:
>> Gerrit Pape <pape@smarden.org> 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.

Thanks.

I ended up doing something very similar to yours after sending
out the initial patch (my FC box is a notebook resurrected from
boneyard and I need to sneakernet to do any RPM work, so latency
of feedback from that box is rather long X-<).