Author: arekm Date: Wed Aug 19 07:05:22 2009 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; cvs and svn support separated (require too many ext deps)
---- Files affected: packages/git-core: git-core.spec (1.165 -> 1.166) ---- Diffs: ================================================================ Index: packages/git-core/git-core.spec diff -u packages/git-core/git-core.spec:1.165 packages/git-core/git-core.spec:1.166 --- packages/git-core/git-core.spec:1.165 Wed Jul 29 13:48:23 2009 +++ packages/git-core/git-core.spec Wed Aug 19 09:05:17 2009 @@ -9,7 +9,7 @@ Summary(pl.UTF-8): Prymitywne narzędzie do śledzenia treści Name: git-core Version: 1.6.4 -Release: 1 +Release: 2 License: GPL v2 Group: Development/Tools Source0: http://www.kernel.org/pub/software/scm/git/git-%{version}.tar.bz2 @@ -39,18 +39,16 @@ %endif %if %{with tests} # tests failed sometimes when using nserver/cvsnt client so enforce pure cvs here -BuildRequires: cvs-gnu-client >= 1.12 BuildRequires: cvs-gnu-client < 1.13 +BuildRequires: cvs-gnu-client >= 1.12 BuildRequires: pdksh >= 5.2.14-46 %endif Requires: coreutils -Requires: cvsps >= 2.1-2 Requires: diffutils Requires: findutils Requires: grep Requires: openssh-clients Requires: perl-Error -Requires: rcs Requires: sed BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -227,6 +225,32 @@ osobnym repozytorium, ale z czasem został włączony do głównego repozytorium gita. +%package svn +Summary: Subversion support for Git +Summary(pl.UTF-8): Obsługa Subversion dla Git +Group: Development/Tools +Requires: %{name} = %{version}-%{release} + +%description svn +Subversion support for Git. + +%description svn -l pl.UTF-8 +Obsługa Subversion dla Git. + +%package cvs +Summary: CVS support for Git +Summary(pl.UTF-8): Obsługa CVS dla Git +Group: Development/Tools +Requires: %{name} = %{version}-%{release} +Requires: cvsps >= 2.1-2 +Requires: rcs + +%description cvs +CVS support for Git. + +%description cvs -l pl.UTF-8 +Obsługa CVS dla Git. + %package -n bash-completion-git Summary: bash-completion for git Summary(pl.UTF-8): bashowe uzupełnianie nazw dla gita @@ -351,7 +375,7 @@ install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon # paths cleanup -sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon +sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/rc.d/init.d/git-daemon sed -e 's,@libdir@,%{_libdir},g' -i $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/git-daemon # remove unneeded files @@ -400,6 +424,8 @@ %doc Documentation/RelNotes* %doc Documentation/*.html Documentation/howto Documentation/technical %{_mandir}/man1/git-*.1* +%exclude %{_mandir}/man1/git-svn.1* +%exclude %{_mandir}/man1/git-cvs*.1* %{_mandir}/man1/git.1* %{_mandir}/man5/gitattributes.5* %{_mandir}/man5/githooks.5* @@ -408,7 +434,6 @@ %{_mandir}/man5/gitrepository-layout.5* %{_mandir}/man7/gitcli.7* %{_mandir}/man7/gitcore-tutorial.7* -%{_mandir}/man7/gitcvs-migration.7* %{_mandir}/man7/gitdiffcore.7* %{_mandir}/man7/gitglossary.7* %{_mandir}/man7/gittutorial-2.7* @@ -421,6 +446,8 @@ %attr(755,root,root) %{_libdir}/%{name}/*-* %attr(755,root,root) %{_libdir}/%{name}/git %exclude %{_libdir}/%{name}/git-gui +%exclude %{_libdir}/%{name}/git-svn +%exclude %{_libdir}/%{name}/git-cvs* %{_datadir}/%{name} %{_localstatedir}/lib/git @@ -489,6 +516,21 @@ %lang(sv) %{_datadir}/git-gui/lib/msgs/sv.msg %lang(zh_cn) %{_datadir}/git-gui/lib/msgs/zh_cn.msg +%files svn +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/git-svn +%if %{with doc} +%{_mandir}/man1/git-svn.1* +%endif + +%files cvs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/%{name}/git-cvs* +%if %{with doc} +%{_mandir}/man1/git-cvs*.1* +%{_mandir}/man7/gitcvs-migration.7* +%endif + %files -n bash-completion-git %defattr(644,root,root,755) %{_sysconfdir}/bash_completion.d/* @@ -509,6 +551,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.166 2009/08/19 07:05:17 arekm +- rel 2; cvs and svn support separated (require too many ext deps) + Revision 1.165 2009/07/29 11:48:23 arekm - up to 1.6.4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/git-core/git-core.spec?r1=1.165&r2=1.166&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
