[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openpkg-cvs
Subject:    [CVS] OpenPKG: openpkg-src/openpkg openpkg.spec rpmmacros
From:       "Ralf S. Engelschall" <rse () openpkg ! org>
Date:       2002-05-29 20:38:57
[Download RAW message or body]

  OpenPKG CVS Repository
  http://www.openpkg.org/cvsweb/cvsweb.cgi
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  rse@openpkg.org
  Module: openpkg-src                      Date:   29-May-2002 22:38:57
  Branch: HEAD                             Handle: 2002052921385700

  Modified files:
    openpkg-src/openpkg     openpkg.spec rpmmacros

  Log:
    finally move rpmtool from sbin/ to lib/openpkg/

  Summary:
    Revision    Changes     Path
    1.75        +18 -23     openpkg-src/openpkg/openpkg.spec
    1.13        +1  -1      openpkg-src/openpkg/rpmmacros
  ____________________________________________________________________________

  Index: openpkg-src/openpkg/openpkg.spec
  ============================================================
  $ cvs diff -u -r1.74 -r1.75 openpkg.spec
  --- openpkg-src/openpkg/openpkg.spec	29 May 2002 20:01:38 -0000	1.74
  +++ openpkg-src/openpkg/openpkg.spec	29 May 2002 20:38:57 -0000	1.75
  @@ -521,24 +521,17 @@
              $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/$dst
       done
   
  -    #   install additional RPM tools (rpmtool, lsync)
  -    sed -e "s:@l_prefix@:%{l_prefix}:g" \
  -        <`SOURCE rpmtool` \
  -        >$RPM_BUILD_ROOT%{l_prefix}/sbin/rpmtool
  +    #   install lsync tool
       sed -e "s:@l_prefix@:%{l_prefix}:g" \
           <`SOURCE lsync` \
           >$RPM_BUILD_ROOT%{l_prefix}/sbin/lsync
  +    chmod a+x $RPM_BUILD_ROOT%{l_prefix}/sbin/lsync
       sed -e "s:@l_prefix@:%{l_prefix}:g" \
           <`SOURCE dot.lsyncrc` \
           >$RPM_BUILD_ROOT%{l_prefix}/local/.lsyncrc
       sed -e "s:@l_prefix@:%{l_prefix}:g" \
  -        <`SOURCE rpmtool.8` \
  -        >$RPM_BUILD_ROOT%{l_prefix}/man/man8/rpmtool.8
  -    sed -e "s:@l_prefix@:%{l_prefix}:g" \
           <`SOURCE lsync.8` \
           >$RPM_BUILD_ROOT%{l_prefix}/man/man8/lsync.8
  -    chmod a+x $RPM_BUILD_ROOT%{l_prefix}/sbin/rpmtool
  -    chmod a+x $RPM_BUILD_ROOT%{l_prefix}/sbin/lsync
   
       #   install RPM extension
       ( cd curl-%{V_curl}
  @@ -574,6 +567,9 @@
       sed -e "s;@l_prefix@;%{l_prefix};g" \
           <`SOURCE mkproxyrpm.pl` >$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/mkproxyrpm.pl
       chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/mkproxyrpm.pl
  +    sed -e "s:@l_prefix@:%{l_prefix}:g" \
  +        <`SOURCE rpmtool` >$RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmtool
  +    chmod a+x $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/rpmtool
   
       #   install an own copy of shtool
       cp $shtool $RPM_BUILD_ROOT%{l_prefix}/lib/openpkg/shtool
  @@ -690,30 +686,31 @@
       %dir %{l_prefix}/info
       %dir %{l_prefix}/lib
       %dir %{l_prefix}/lib/openpkg
  +    %{l_prefix}/lib/openpkg/bash
  +    %{l_prefix}/lib/openpkg/bzip2
  +    %{l_prefix}/lib/openpkg/curl
  +    %{l_prefix}/lib/openpkg/find-provides
  +    %{l_prefix}/lib/openpkg/find-requires
  +    %{l_prefix}/lib/openpkg/gzip
  +    %{l_prefix}/lib/openpkg/macros
  +    %{l_prefix}/lib/openpkg/mkproxyrpm.pl
  +    %{l_prefix}/lib/openpkg/patch
       %{l_prefix}/lib/openpkg/rpm
       %{l_prefix}/lib/openpkg/rpmb
       %{l_prefix}/lib/openpkg/rpmdb
  +    %{l_prefix}/lib/openpkg/rpme
       %{l_prefix}/lib/openpkg/rpmi
       %{l_prefix}/lib/openpkg/rpmk
  -    %{l_prefix}/lib/openpkg/rpmq
  -    %{l_prefix}/lib/openpkg/find-provides
  -    %{l_prefix}/lib/openpkg/find-requires
       %{l_prefix}/lib/openpkg/rpmpopt-%{V_rpm}
  -    %{l_prefix}/lib/openpkg/macros
  +    %{l_prefix}/lib/openpkg/rpmq
       %{l_prefix}/lib/openpkg/rpmt
  -    %{l_prefix}/lib/openpkg/rpme
  +    %{l_prefix}/lib/openpkg/rpmtool
       %{l_prefix}/lib/openpkg/rpmu
       %{l_prefix}/lib/openpkg/rpmv
  -    %{l_prefix}/lib/openpkg/rpmx.sh
       %{l_prefix}/lib/openpkg/rpmx.pl
  -    %{l_prefix}/lib/openpkg/mkproxyrpm.pl
  -    %{l_prefix}/lib/openpkg/curl
  -    %{l_prefix}/lib/openpkg/gzip
  -    %{l_prefix}/lib/openpkg/bzip2
  +    %{l_prefix}/lib/openpkg/rpmx.sh
       %{l_prefix}/lib/openpkg/shtool
  -    %{l_prefix}/lib/openpkg/patch
       %{l_prefix}/lib/openpkg/tar
  -    %{l_prefix}/lib/openpkg/bash
       %{l_prefix}/lib/librpmpopt.a
       %{l_prefix}/lib/librpm.a
       %{l_prefix}/lib/librpmbuild.a
  @@ -740,13 +737,11 @@
       %dir %{l_prefix}/man/cat9
       %{l_prefix}/man/man8/rpm.8
       %{l_prefix}/man/man8/rpm2cpio.8
  -    %{l_prefix}/man/man8/rpmtool.8
       %{l_prefix}/man/man8/lsync.8
       %dir %{l_prefix}/sbin
       %dir %{l_prefix}/pub
       %dir %{l_prefix}/share
       %dir %{l_prefix}/var
  -    %{l_prefix}/sbin/rpmtool
       %{l_prefix}/sbin/lsync
       %dir %{l_prefix}/local
       %{l_prefix}/local/README
  Index: openpkg-src/openpkg/rpmmacros
  ============================================================
  $ cvs diff -u -r1.12 -r1.13 rpmmacros
  --- openpkg-src/openpkg/rpmmacros	15 May 2002 12:48:23 -0000	1.12
  +++ openpkg-src/openpkg/rpmmacros	29 May 2002 20:38:57 -0000	1.13
  @@ -133,7 +133,7 @@
   %_tarbin                 %{l_prefix}/lib/openpkg/tar
   
   #   provide fixed paths to tools (additional)
  -%l_rpmtool               %{l_prefix}/sbin/rpmtool
  +%l_rpmtool               %{l_prefix}/lib/openpkg/rpmtool
   %l_shtool                %{l_prefix}/lib/openpkg/shtool
   %l_curl                  %{l_prefix}/lib/openpkg/curl
   %l_bash                  %{l_prefix}/lib/openpkg/bash
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     openpkg-cvs@openpkg.org
[prev in list] [next in list] [prev in thread] [next in thread]