One should be able to include only the git proper in the package, IMHO.

(The guilt add-on does not build for me. Still investigating.)

Please consider the following patch.

--- git.spec    2007/08/23 15:56:27     1.2
+++ git.spec    2007/08/23 15:58:04     1.3
@@ -39,7 +39,12 @@
 Group:        SCM
 License:      GPL
 Version:      %{V_git}
-Release:      20070822
+Release:      20070823
+
+#   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
@@ -130,18 +135,22 @@
       %{l_make} %{l_mflags}
     ) || exit $?

+%if "%{with_cogito}" == "yes"
     #   build Cogito frontend
     ( cd cogito-%{V_cogito}
       %{l_make} %{l_mflags} \
           prefix=%{l_prefix}
     ) || exit $?
+%endif

+%if "%{with_guilt}" == "yes"
     #   install Guilt add-on
     ( 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
@@ -177,6 +186,7 @@
         git-%{V_git}/contrib/completion/git-completion.bash \
         $RPM_BUILD_ROOT%{l_prefix}/etc/git/git.bashrc

+%if "%{with_cogito}" == "yes"
     #   install Cogito frontend
     ( cd cogito-%{V_cogito}
       %{l_make} %{l_mflags} install \
@@ -184,7 +194,9 @@
           DESTDIR=$RPM_BUILD_ROOT \
           prefix=%{l_prefix}
     ) || exit $?
+%endif

+%if "%{with_stgit}" == "yes"
     #   install StGIT add-on
     ( cd stgit-%{V_stgit}
       %{l_prefix}/bin/python setup.py install \
@@ -192,12 +204,15 @@
           --prefix=%{l_prefix} \
           --install-lib=%{l_prefix}/lib/git
     ) || exit $?
+%endif

+%if "%{with_guilt}" == "yes"
     #   install Guilt add-on
     ( 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


-- 
Michael Diers | Software Developer | http://www.elego.de/

______________________________________________________________________
OpenPKG                                             http://openpkg.org
User Communication List                      openpkg-users@openpkg.org

Reply via email to