Author: glen Date: Sat Dec 3 12:04:23 2011 GMT Module: packages Tag: HEAD ---- Log message: - build, install and package tools
---- Files affected: packages/subversion: subversion.spec (1.328 -> 1.329) ---- Diffs: ================================================================ Index: packages/subversion/subversion.spec diff -u packages/subversion/subversion.spec:1.328 packages/subversion/subversion.spec:1.329 --- packages/subversion/subversion.spec:1.328 Fri Nov 11 17:06:35 2011 +++ packages/subversion/subversion.spec Sat Dec 3 13:04:18 2011 @@ -54,7 +54,7 @@ Summary(pt_BR.UTF-8): Sistema de versionamento concorrente Name: subversion Version: 1.7.1 -Release: 2 +Release: 3 License: Apache v2.0 Group: Development/Version Control Source0: http://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2 @@ -495,6 +495,8 @@ %{__make} -j1 +%{__make} tools + %if %{with csvn} # Python ctypes bindings %{__make} ctypes-python @@ -548,6 +550,7 @@ $RPM_BUILD_ROOT/home/services/subversion{,/repos} %{__make} install -j1 \ + toolsdir=%{_bindir} \ DESTDIR=$RPM_BUILD_ROOT \ APACHE_LIBEXECDIR="$(%{_sbindir}/apxs -q LIBEXECDIR)" \ %if %{with javahl} @@ -562,6 +565,7 @@ %if %{with csvn} install-ctypes-python \ %endif + install-tools %if %{with ruby} %{__make} install -j1 \ @@ -596,6 +600,12 @@ %if %{without net_client_only} install -p tools/backup/hot-backup.py $RPM_BUILD_ROOT%{_bindir}/svn-hot-backup %endif + +# rename not to conflict with standard packages. (are these needed at all?) +mv $RPM_BUILD_ROOT%{_bindir}/{,svn}diff +mv $RPM_BUILD_ROOT%{_bindir}/{,svn}diff3 +mv $RPM_BUILD_ROOT%{_bindir}/{,svn}diff4 + %if %{with python} || %{with csvn} %py_ocomp $RPM_BUILD_ROOT%{py_sitedir} %py_comp $RPM_BUILD_ROOT%{py_sitedir} @@ -834,8 +844,24 @@ %files tools %defattr(644,root,root,755) +# tools/backup/hot-backup.py %attr(755,root,root) %{_bindir}/svn-hot-backup +# tools/diff +%attr(755,root,root) %{_bindir}/svndiff +%attr(755,root,root) %{_bindir}/svndiff3 +%attr(755,root,root) %{_bindir}/svndiff4 + +# tools/server-side +%attr(755,root,root) %{_bindir}/svn-populate-node-origins-index +%attr(755,root,root) %{_bindir}/svn-rep-sharing-stats +%attr(755,root,root) %{_bindir}/svnauthz-validate + +# tools/client-side/svnmucc +%attr(755,root,root) %{_bindir}/svnmucc +# tools/dev/svnraisetreeconflict +%attr(755,root,root) %{_bindir}/svnraisetreeconflict + %files -n bash-completion-subversion %defattr(644,root,root,755) /etc/bash_completion.d/%{name} @@ -927,6 +953,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.329 2011/12/03 12:04:18 glen +- build, install and package tools + Revision 1.328 2011/11/11 16:06:35 glen - license now Apache v2.0, see https://subversion.apache.org/docs/release-notes/1.7.html#license ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/subversion/subversion.spec?r1=1.328&r2=1.329&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
