OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-re           Date:   08-Nov-2003 09:22:43
  Branch: HEAD                             Handle: 2003110808224201

  Modified files:
    openpkg-re/vcheck       vc.abiword
    openpkg-src/abiword     abiword.spec

  Log:
    freetype2 subdir just has to be removed

  Summary:
    Revision    Changes     Path
    1.2         +4  -1      openpkg-re/vcheck/vc.abiword
    1.3         +1  -2      openpkg-src/abiword/abiword.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-re/vcheck/vc.abiword
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 vc.abiword
  --- openpkg-re/vcheck/vc.abiword      7 Nov 2003 22:25:32 -0000       1.1
  +++ openpkg-re/vcheck/vc.abiword      8 Nov 2003 08:22:42 -0000       1.2
  @@ -1,9 +1,12 @@
   config = {
  +  lastcheck = "2003-11-08 09:20"
   }
   
   prog abiword = {
     version   = 2.0.1-2
  +  errors    = 1
  +  lastcheck = "2003-11-08 09:20"
     url       = http://download.sourceforge.net/sourceforge/abiword/
  -  regex     = abiword-(__VER__)\.tar\.gz
  +  regex     = abiword-(\d+\.\d+\.\d+(-\d+)?)\.tar\.gz
   }
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/abiword/abiword.spec
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 abiword.spec
  --- openpkg-src/abiword/abiword.spec  8 Nov 2003 07:50:25 -0000       1.2
  +++ openpkg-src/abiword/abiword.spec  8 Nov 2003 08:22:43 -0000       1.3
  @@ -25,7 +25,6 @@
   
   #   FIXME: ms: Junk because a modern X11 server with Xft is required,
   #   FIXME:     and is generally bad mannered with build configuration
  -#   FIXME: ms: update freetype2 paths!!!
   
   #   package version
   %define       V_opkg 2.0.1.2
  @@ -220,7 +219,7 @@
       CXX="%{l_cxx}" \
       CFLAGS="%{l_cflags -O}" \
       CXXFLAGS="%{l_cxxflags -O}" \
  -    CPPFLAGS="%{l_cppflags atk pango gtk2 freetype2} -I%{l_prefix}/lib/gtk2/include 
-I$l_x11_incdir" \
  +    CPPFLAGS="%{l_cppflags atk pango gtk2} -I%{l_prefix}/lib/gtk2/include 
-I$l_x11_incdir" \
       LDFLAGS="%{l_ldflags}" \
       ABI_XML_CONFIG="%{l_prefix}/bin/xml2-config" \
       PKG_CONFIG_PATH=%{l_prefix}/lib/pkgconfig:$l_x11_pkgdir \
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to