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:   20-Dec-2004 13:17:21
  Branch: HEAD                             Handle: 2004122012172100

  Modified files:
    openpkg-src/pnet        pnet.spec

  Log:
    resolve conflict with gc

  Summary:
    Revision    Changes     Path
    1.19        +3  -2      openpkg-src/pnet/pnet.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/pnet/pnet.spec
  ============================================================================
  $ cvs diff -u -r1.18 -r1.19 pnet.spec
  --- openpkg-src/pnet/pnet.spec        30 Oct 2004 17:39:42 -0000      1.18
  +++ openpkg-src/pnet/pnet.spec        20 Dec 2004 12:17:21 -0000      1.19
  @@ -34,7 +34,7 @@
   Group:        Language
   License:      GPL
   Version:      0.6.10
  -Release:      20041030
  +Release:      20041220
   
   #   package options
   %option       with_threads no
  @@ -97,7 +97,8 @@
   %install
       rm -rf $RPM_BUILD_ROOT
       %{l_make} %{l_mflags} install AM_MAKEFLAGS="DESTDIR=$RPM_BUILD_ROOT"
  -    rm -f $RPM_BUILD_ROOT%{l_prefix}/info/dir
  +    rm -f  $RPM_BUILD_ROOT%{l_prefix}/info/dir
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/gc
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to