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                      Date:   08-May-2004 23:58:59
  Branch: HEAD                             Handle: 2004050822585800

  Modified files:
    openpkg-src/whoson      whoson.patch whoson.spec

  Log:
    cleanup and fix Perl building

  Summary:
    Revision    Changes     Path
    1.2         +15 -0      openpkg-src/whoson/whoson.patch
    1.28        +6  -4      openpkg-src/whoson/whoson.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/whoson/whoson.patch
  ============================================================================
  $ cvs diff -u -r1.1 -r1.2 whoson.patch
  --- openpkg-src/whoson/whoson.patch   15 Apr 2003 14:57:28 -0000      1.1
  +++ openpkg-src/whoson/whoson.patch   8 May 2004 21:58:58 -0000       1.2
  @@ -1,3 +1,4 @@
  +Index: Makefile.in
   --- Makefile.in.dist Tue Apr 15 14:50:22 2003
   +++ Makefile.in      Tue Apr 15 14:50:58 2003
   @@ -698,10 +698,10 @@
  @@ -25,6 +26,7 @@
                        sleep(1);
                        return 0;
                } else if (child < 0) {
  +Index: whoson.conf
   --- whoson.conf.dist Tue Apr 15 15:16:43 2003
   +++ whoson.conf      Tue Apr 15 16:51:52 2003
   @@ -13,13 +13,13 @@
  @@ -88,3 +90,16 @@
   +    cachesize=100000                    # max. number of entries to keep
    
    # end of config
  +Index: WHOSON/Makefile.PL.in
  +--- WHOSON/Makefile.PL.in.orig       2004-05-08 23:49:45.000000000 +0200
  ++++ WHOSON/Makefile.PL.in    2004-05-08 23:51:41.000000000 +0200
  +@@ -6,7 +6,7 @@
  + WriteMakefile(
  +     'NAME'  => 'WHOSON',
  +     'VERSION_FROM' => 'WHOSON.pm',
  +-    'LIBS'  => ['[EMAIL PROTECTED]@ -lwhoson'],
  ++    'LIBS'  => ['-L../.libs -lwhoson'],
  +     'DEFINE'        => '',
  +-    'INC'   => '[EMAIL PROTECTED]@',
  ++    'INC'   => '-I..',
  + );
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/whoson/whoson.spec
  ============================================================================
  $ cvs diff -u -r1.27 -r1.28 whoson.spec
  --- openpkg-src/whoson/whoson.spec    3 Apr 2004 07:52:47 -0000       1.27
  +++ openpkg-src/whoson/whoson.spec    8 May 2004 21:58:58 -0000       1.28
  @@ -34,7 +34,7 @@
   Group:        Mail
   License:      GPL
   Version:      2.03
  -Release:      20040403
  +Release:      20040508
   
   #   package options
   %option       with_fsl  yes
  @@ -82,7 +82,6 @@
   %build
       %{l_shtool} subst %{l_value -s -a} \
           whoson.conf
  -
       CC="%{l_cc}" \
       CFLAGS="%{l_cflags -O}" \
       CPPFLAGS="%{l_cppflags}" \
  @@ -94,13 +93,16 @@
           --enable-static \
           --disable-shared
       %{l_make} %{l_mflags}
  +%if "%{with_perl}" == "yes"
  +    %{l_prefix}/bin/perl-openpkg prepare
  +    %{l_prefix}/bin/perl-openpkg -d WHOSON configure build
  +%endif
   
   %install
       rm -rf $RPM_BUILD_ROOT
   
   %if "%{with_perl}" == "yes"
  -    %{l_prefix}/bin/perl-openpkg prepare
  -    %{l_prefix}/bin/perl-openpkg -d WHOSON configure build install
  +    %{l_prefix}/bin/perl-openpkg -d WHOSON install
       %{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
   %else
       >perl-openpkg-files
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to