Consolidate file exclude regex
Rather than maintaining the same list if 3 different places, use a single exclude_re variable for the files we want to exclude from the main package file list.
This commit is contained in:
parent
ecb39db941
commit
bea129ccea
7
git.spec
7
git.spec
@ -416,15 +416,16 @@ rm -rf %{buildroot}%{python_sitelib} %{buildroot}%{gitcoredir}/git-remote-testgi
|
||||
# git-archimport is not supported
|
||||
find %{buildroot} Documentation -type f -name 'git-archimport*' -exec rm -f {} ';'
|
||||
|
||||
(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e s@^%{buildroot}@@) > bin-man-doc-files
|
||||
(find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "archimport|p4|svn|cvs|email|gitk|git-gui|git-citool|git-daemon" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files
|
||||
exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|gitk|p4|svn"
|
||||
(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files
|
||||
(find %{buildroot}{%{_bindir},%{_libexecdir}} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files
|
||||
(find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files
|
||||
(find %{buildroot}%{perl_vendorlib} -mindepth 1 -type d | sed -e 's@^%{buildroot}@%dir @') >> perl-git-files
|
||||
# Split out Git::SVN files
|
||||
grep Git/SVN perl-git-files > perl-git-svn-files
|
||||
sed -i "/Git\/SVN/ d" perl-git-files
|
||||
%if %{!?_without_docs:1}0
|
||||
(find %{buildroot}%{_mandir} -type f | grep -vE "archimport|p4|svn|git-cvs|email|gitk|git-gui|git-citool|git-daemon|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files
|
||||
(find %{buildroot}%{_mandir} -type f | grep -vE "$exclude_re|Git" | sed -e s@^%{buildroot}@@ -e 's/$/*/' ) >> bin-man-doc-files
|
||||
%else
|
||||
rm -rf %{buildroot}%{_mandir}
|
||||
%endif
|
||||
|
Loading…
Reference in New Issue
Block a user