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:   02-Mar-2006 15:53:05
  Branch: HEAD                             Handle: 2006030214530500

  Modified files:
    openpkg-src/rdiff-backup
                            rdiff-backup.spec

  Log:
    re-create the packaging from scratch as the newer rdiff-backup
    versions are completely different

  Summary:
    Revision    Changes     Path
    1.59        +13 -15     openpkg-src/rdiff-backup/rdiff-backup.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/rdiff-backup/rdiff-backup.spec
  ============================================================================
  $ cvs diff -u -r1.58 -r1.59 rdiff-backup.spec
  --- openpkg-src/rdiff-backup/rdiff-backup.spec        2 Jan 2006 12:53:29 
-0000       1.58
  +++ openpkg-src/rdiff-backup/rdiff-backup.spec        2 Mar 2006 14:53:05 
-0000       1.59
  @@ -33,7 +33,7 @@
   Group:        Network
   License:      GPL
   Version:      1.1.5
  -Release:      20060102
  +Release:      20060302
   
   #   list of sources
   Source0:      
http://download.savannah.nongnu.org/releases/rdiff-backup/rdiff-backup-%{version}.tar.gz
  @@ -42,7 +42,9 @@
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
   BuildPreReq:  OpenPKG, openpkg >= 20040130
  -PreReq:       OpenPKG, openpkg >= 20040130, librsync, python
  +PreReq:       OpenPKG, openpkg >= 20040130
  +BuildPreReq:  python, librsync
  +PreReq:       python, librsync
   AutoReq:      no
   AutoReqProv:  no
   
  @@ -70,22 +72,18 @@
       %setup -q
   
   %build
  -    #   use plain sed(1) instead of shtool subst, because
  -    #   currently shtool still has problems with the sticks.
  -    sed -e 's;#!/usr/bin/env python;#!%{l_prefix}/bin/python;' \
  -        -e "s;'rdiff';'%{l_prefix}/bin/rdiff';g" \
  -        <rdiff-backup >rdiff-backup.n
  -    mv rdiff-backup.n rdiff-backup
  +    %{l_shtool} subst \
  +        -e 's;#!/usr/bin/env python;#!%{l_prefix}/bin/python;' \
  +        rdiff-backup
  +    %{l_prefix}/bin/python setup.py build \
  +        --librsync-dir=%{l_prefix}
   
   %install
       rm -rf $RPM_BUILD_ROOT
  -    %{l_shtool} mkdir -f -p -m 755 \
  -        $RPM_BUILD_ROOT%{l_prefix}/bin \
  -        $RPM_BUILD_ROOT%{l_prefix}/man/man1
  -    %{l_shtool} install -c -m 755 \
  -        rdiff-backup $RPM_BUILD_ROOT%{l_prefix}/bin/
  -    %{l_shtool} install -c -m 644 \
  -        rdiff-backup.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
  +    %{l_prefix}/bin/python setup.py install \
  +        --root=$RPM_BUILD_ROOT \
  +        --prefix=%{l_prefix}
  +    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
   
   %files -f files
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org

Reply via email to