rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove git-remote-testsvn, make git-svn noarch

Browse Source 
A future release of git will likely remove contrib/svn-fe and
git-remote-testsvn¹.  The git-remote-testsvn binary is the only noarch
file in the git-svn package.  Seeing that it's utility is very
questionable, remove it so git-svn can return to a noarch package.

¹ https://public-inbox.org/git/20180817190310.GA5360@sigill.intra.peff.net/
This commit is contained in:
Todd Zullinger 2018-08-20 18:57:52 -04:00
parent 98b3cc5061
commit 8f1e2b63b0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git.spec
View File

@ -83,7 +83,7 @@
Name: git Name: git
Version: 2.18.0 Version: 2.18.0
Release: 2%{?rcrev}%{?dist}.4 Release: 2%{?rcrev}%{?dist}.5
Summary: Fast Version Control System Summary: Fast Version Control System
License: GPLv2 License: GPLv2
URL: https://git-scm.com/ URL: https://git-scm.com/
@ -386,6 +386,7 @@ history.
%package svn %package svn
Summary: Git tools for interacting with Subversion repositories Summary: Git tools for interacting with Subversion repositories
BuildArch: noarch
Requires: git = %{version}-%{release} Requires: git = %{version}-%{release}
Requires: perl(Digest::MD5) Requires: perl(Digest::MD5)
%if ! %{defined perl_bootstrap} %if ! %{defined perl_bootstrap}
@ -568,7 +569,10 @@ find %{buildroot}{%{_bindir},%{gitexecdir}} \( -type f -o -type l \) -name 'git-
find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name '*p4*' -exec rm -f {} ';' find %{buildroot}{%{_bindir},%{gitexecdir}} -type f -name '*p4*' -exec rm -f {} ';'
%endif %endif
exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|(remote-test)?svn)|gitk|p4merge" # Remove unneeded git-remote-testsvn so git-svn can be noarch
rm -f %{buildroot}%{gitexecdir}/git-remote-testsvn
exclude_re="archimport|email|git-(citool|cvs|daemon|gui|p4|subtree|svn)|gitk|p4merge"
(find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files (find %{buildroot}{%{_bindir},%{_libexecdir}} -type f -o -type l | 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}{%{_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} -type f | sed -e s@^%{buildroot}@@) > perl-git-files
@ -857,13 +861,15 @@ make test || ./print-failed-test-output
%{?with_docs:%{_pkgdocdir}/git-subtree.html} %{?with_docs:%{_pkgdocdir}/git-subtree.html}
%files svn %files svn
%{gitexecdir}/git-remote-testsvn
%{gitexecdir}/git-svn %{gitexecdir}/git-svn
%{_pkgdocdir}/git-svn.txt %{_pkgdocdir}/git-svn.txt
%{?with_docs:%{_mandir}/man1/git-svn.1*} %{?with_docs:%{_mandir}/man1/git-svn.1*}
%{?with_docs:%{_pkgdocdir}/git-svn.html} %{?with_docs:%{_pkgdocdir}/git-svn.html}
%changelog %changelog
* Mon Aug 20 2018 Todd Zullinger <tmz@pobox.com> - 2.18.0-2.5
- Remove git-remote-testsvn, make git-svn noarch
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.0-2.4 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.0-2.4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild