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:   17-Mar-2008 12:53:32
  Branch: HEAD                             Handle: 2008031711533200

  Modified files:
    openpkg-src/git         git.spec

  Log:
    add the Tig CUI

  Summary:
    Revision    Changes     Path
    1.92        +37 -2      openpkg-src/git/git.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/git/git.spec
  ============================================================================
  $ cvs diff -u -r1.91 -r1.92 git.spec
  --- openpkg-src/git/git.spec  9 Mar 2008 17:48:46 -0000       1.91
  +++ openpkg-src/git/git.spec  17 Mar 2008 11:53:32 -0000      1.92
  @@ -26,6 +26,7 @@
   %define       V_cogito    0.18.2
   %define       V_stgit     0.14.1
   %define       V_guilt     0.28
  +%define       V_tig       0.10
   
   #   package information
   Name:         git
  @@ -38,18 +39,20 @@
   Group:        SCM
   License:      GPL
   Version:      %{V_git}
  -Release:      20080309
  +Release:      20080317
   
   #   package options
   %option       with_cogito yes
   %option       with_stgit  yes
   %option       with_guilt  yes
  +%option       with_tig    yes
   
   #   list of sources
   Source0:      http://www.kernel.org/pub/software/scm/git/git-%{V_git}.tar.gz
   Source1:      
http://www.kernel.org/pub/software/scm/cogito/cogito-%{V_cogito}.tar.gz
   Source2:      
http://homepage.ntlworld.com/cmarinas/stgit/stgit-%{V_stgit}.tar.gz
   Source3:      
http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/guilt-%{V_guilt}.tar.gz
  +Source4:      http://jonas.nitro.dk/tig/releases/tig-%{V_tig}.tar.gz
   Patch0:       git.patch
   
   #   build information
  @@ -59,6 +62,10 @@
   PreReq:       OpenPKG, openpkg >= 20040130, bash, python, perl, diffutils, 
rcs
   BuildPreReq:  zlib, openssl, curl, expat, libiconv
   PreReq:       zlib, openssl, curl, expat, libiconv
  +%if "%{with_tig}" == "yes"
  +BuildPreReq:  ncurses
  +PreReq:       ncurses
  +%endif
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -94,12 +101,18 @@
           url       = 
http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/
           regex     = guilt-(__VER__)\.tar\.gz
       }
  +    prog git:tig = {
  +        version   = %{V_tig}
  +        url       = http://jonas.nitro.dk/tig/releases/
  +        regex     = tig-(__VER__)\.tar\.gz
  +    }
   
   %prep
       %setup -q -c
       %setup -q -T -D -a 1
       %setup -q -T -D -a 2
       %setup -q -T -D -a 3
  +    %setup -q -T -D -a 4
       %patch -p0
   
   %build
  @@ -138,7 +151,7 @@
       ) || exit $?
   %endif
   
  -    #   install Guilt add-on
  +    #   build Guilt add-on
   %if "%{with_guilt}" == "yes"
       ( cd guilt-%{V_guilt}
         %{l_shtool} subst \
  @@ -147,6 +160,21 @@
       ) || exit $?
   %endif
   
  +    #   build Tig add-on
  +%if "%{with_guilt}" == "yes"
  +    ( cd tig-%{V_tig}
  +      CC="%{l_cc}" \
  +      CFLAGS="%{l_cflags -O}" \
  +      CPPFLAGS="%{l_cppflags ncurses .}" \
  +      LDFLAGS="%{l_ldflags}" \
  +      ./configure \
  +          --prefix=%{l_prefix} \
  +          --mandir=%{l_prefix}/man \
  +          --with-libiconv=%{l_prefix}
  +      %{l_make} %{l_mflags}
  +    ) || exit $?
  +%endif
  +
   %install
       rm -rf $RPM_BUILD_ROOT
   
  @@ -210,6 +238,13 @@
       ) || exit $?
   %endif
   
  +    #   install Tig add-on
  +%if "%{with_tig}" == "yes"
  +    ( cd tig-%{V_tig}
  +      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
  +    ) || exit $?
  +%endif
  +
       #   strip down installation
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
       rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
  @@ .
______________________________________________________________________
OpenPKG                                             http://openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to