OpenPKG CVS Repository http://cvs.openpkg.org/ ____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall Root: /v/openpkg/cvs Email: [EMAIL PROTECTED] Module: openpkg-src Date: 24-Aug-2007 20:13:17 Branch: HEAD Handle: 2007082419131700 Modified files: openpkg-src/git git.spec Log: be even more friendly and allow one to disable the GIT addon tools Summary: Revision Changes Path 1.73 +18 -3 openpkg-src/git/git.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/git/git.spec ============================================================================ $ cvs diff -u -r1.72 -r1.73 git.spec --- openpkg-src/git/git.spec 16 Aug 2007 07:32:26 -0000 1.72 +++ openpkg-src/git/git.spec 24 Aug 2007 18:13:17 -0000 1.73 @@ -39,7 +39,12 @@ Group: SCM License: GPL Version: %{V_git} -Release: 20070816 +Release: 20070824 + +# package options +%option with_cogito yes +%option with_stgit yes +%option with_guilt yes # list of sources Source0: http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz @@ -66,8 +71,8 @@ tracking capabilities, not dependent on network access to a central server. - This package contains both the low-level GIT core components and the - high-level GIT frontends Cogito, StGIT and Guilt. + This package contains both the low-level GIT core components and + optionally the high-level GIT frontends Cogito, StGIT and Guilt. %track prog git:git = { @@ -127,17 +132,21 @@ ) || exit $? # build Cogito frontend +%if "%{with_cogito}" == "yes" ( cd cogito-%{V_cogito} %{l_make} %{l_mflags} \ prefix=%{l_prefix} ) || exit $? +%endif # install Guilt add-on +%if "%{with_guilt}" == "yes" ( cd guilt-%{V_guilt} %{l_shtool} subst \ -e 's;/bin/bash;%{l_prefix}/bin/bash;g' \ guilt* ) || exit $? +%endif %install rm -rf $RPM_BUILD_ROOT @@ -174,26 +183,32 @@ $RPM_BUILD_ROOT%{l_prefix}/etc/git/git.bashrc # install Cogito frontend +%if "%{with_cogito}" == "yes" ( cd cogito-%{V_cogito} %{l_make} %{l_mflags} install \ INSTALL="%{l_shtool} install" \ DESTDIR=$RPM_BUILD_ROOT \ prefix=%{l_prefix} ) || exit $? +%endif # install StGIT add-on +%if "%{with_stgit}" == "yes" ( cd stgit-%{V_stgit} %{l_prefix}/bin/python setup.py install \ --root=$RPM_BUILD_ROOT \ --prefix=%{l_prefix} \ --install-lib=%{l_prefix}/lib/git ) || exit $? +%endif # install Guilt add-on +%if "%{with_guilt}" == "yes" ( cd guilt-%{V_guilt} %{l_make} %{l_mflags} install \ PREFIX=$RPM_BUILD_ROOT%{l_prefix} ) || exit $? +%endif # strip down installation strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org