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

  Server: cvs.openpkg.org                  Name:   Michael Schloh
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src openpkg-web          Date:   05-Dec-2003 12:56:28
  Branch: HEAD                             Handle: 2003120511562601

  Modified files:
    openpkg-src/ripe-dbase  ripe-dbase.spec
    openpkg-web             news.txt

  Log:
    require glib::with_threads and correct Makefile's wrong install
    command path

  Summary:
    Revision    Changes     Path
    1.2         +6  -7      openpkg-src/ripe-dbase/ripe-dbase.spec
    1.7676      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/ripe-dbase/ripe-dbase.spec
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 ripe-dbase.spec
  --- openpkg-src/ripe-dbase/ripe-dbase.spec    27 Nov 2003 19:53:56 -0000      1.1
  +++ openpkg-src/ripe-dbase/ripe-dbase.spec    5 Dec 2003 11:56:27 -0000       1.2
  @@ -38,7 +38,7 @@
   Group:        Database
   License:      RIPE NCC
   Version:      3.2.0
  -Release:      20031127
  +Release:      20031205
   
   #   list of sources
   Source0:      ftp://ftp.ripe.net/ripe/dbase/software/ripe-dbase-%{version}.tar.gz
  @@ -49,8 +49,10 @@
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20030103, make, gcc
   PreReq:       OpenPKG, openpkg >= 20030103
  -BuildPreReq:  gnupg, glib, mysql, libxml, libxslt, imap, zlib, openssl
  -PreReq:       gnupg, glib, mysql, libxml, libxslt, imap, zlib, openssl
  +BuildPreReq:  gnupg, glib, glib::with_threads = yes, mysql
  +BuildPreReq:  libxml, libxslt, imap, zlib, openssl
  +PreReq:       gnupg, glib, glib::with_threads = yes, mysql
  +PreReq:       libxml, libxslt, imap, zlib, openssl
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -62,15 +64,12 @@
       %patch -p0
   
   %build
  -    ( echo "ac_cv_path_install='shtool install -c'"
  -    ) >config.cache
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       CPPFLAGS="%{l_cppflags}" \
       LDFLAGS="%{l_ldflags}" \
       LIBS="-lssl -lcrypto" \
       ./configure \
  -        --cache-file=./config.cache \
           --prefix=%{l_prefix} \
           --with-glibconfig=%{l_prefix}/bin/glib-config \
           --with-mysql=%{l_prefix} \
  @@ -89,7 +88,7 @@
       %{l_shtool} subst \
           -e "s;^\\([^=]* *= *\\)%{l_prefix};\\1$RPM_BUILD_ROOT%{l_prefix};" \
           Makefile
  -    %{l_make} %{l_mflags} install
  +    %{l_make} %{l_mflags} install INSTALL="%{l_shtool} install -c"
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.7675 -r1.7676 news.txt
  --- openpkg-web/news.txt      5 Dec 2003 09:31:31 -0000       1.7675
  +++ openpkg-web/news.txt      5 Dec 2003 11:56:26 -0000       1.7676
  @@ -1,3 +1,4 @@
  +05-Dec-2003: Upgraded package: P<ripe-dbase-3.2.0-20031205>
   05-Dec-2003: Upgraded package: P<db-4.2.52.0-20031205>
   05-Dec-2003: Upgraded package: P<perl-gtk-20031205-20031205>
   04-Dec-2003: Upgraded package: P<perl-util-20031204-20031204>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to