Skip to content

Commit a4e3bdd

Browse files
Junio C HamanoJunio C Hamano
authored andcommitted
RPM package re-classification.
Grabbing anything that had *arch* in its name into git-arch package was a wrong idea and we lost git-archive from git-core by mistake. Signed-off-by: Junio C Hamano <junkio@cox.net>
1 parent 04d2445 commit a4e3bdd

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

git.spec.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,10 +96,10 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
9696
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
9797
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
9898

99-
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
99+
(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
100100
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
101101
%if %{!?_without_docs:1}0
102-
(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
102+
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
103103
%else
104104
rm -rf $RPM_BUILD_ROOT%{_mandir}
105105
%endif
@@ -126,10 +126,10 @@ rm -rf $RPM_BUILD_ROOT
126126

127127
%files arch
128128
%defattr(-,root,root)
129-
%doc Documentation/*arch*.txt
130-
%{_bindir}/*arch*
131-
%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
132-
%{!?_without_docs: %doc Documentation/*arch*.html }
129+
%doc Documentation/git-archimport.txt
130+
%{_bindir}/git-archimport
131+
%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
132+
%{!?_without_docs: %doc Documentation/git-archimport.html }
133133

134134
%files email
135135
%defattr(-,root,root)

0 commit comments

Comments
 (0)