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

  Server: cvs.openpkg.org                  Name:   Thomas Lotterer
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   15-Jul-2004 10:25:58
  Branch: OPENPKG_2_1_SOLID                Handle: 2004071509255800

  Modified files:           (Branch: OPENPKG_2_1_SOLID)
    openpkg-src/less        less.spec lesspipe

  Log:
    MFC: fix RPM usage and cleanup style

  Summary:
    Revision    Changes     Path
    1.37.4.2    +8  -6      openpkg-src/less/less.spec
    1.1.1.1.14.1+1  -1      openpkg-src/less/lesspipe
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/less/less.spec
  ============================================================================
  $ cvs diff -u -r1.37.4.1 -r1.37.4.2 less.spec
  --- openpkg-src/less/less.spec        2 Jul 2004 15:25:46 -0000       1.37.4.1
  +++ openpkg-src/less/less.spec        15 Jul 2004 08:25:58 -0000      1.37.4.2
  @@ -87,12 +87,14 @@
       rm -rf $RPM_BUILD_ROOT
       %{l_make} %{l_mflags} install prefix=$RPM_BUILD_ROOT%{l_prefix}
       strip $RPM_BUILD_ROOT%{l_prefix}/bin/less*
  -    ln $RPM_BUILD_ROOT%{l_prefix}/bin/less \
  -       $RPM_BUILD_ROOT%{l_prefix}/bin/more
  -    ln $RPM_BUILD_ROOT%{l_prefix}/man/man1/less.1 \
  -       $RPM_BUILD_ROOT%{l_prefix}/man/man1/more.1
  -    %{l_shtool} install -c -m 755 %{SOURCE lesspipe} $RPM_BUILD_ROOT%{l_prefix}/bin/
  -    %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
  +    ln  $RPM_BUILD_ROOT%{l_prefix}/bin/less \
  +        $RPM_BUILD_ROOT%{l_prefix}/bin/more
  +    ln  $RPM_BUILD_ROOT%{l_prefix}/man/man1/less.1 \
  +        $RPM_BUILD_ROOT%{l_prefix}/man/man1/more.1
  +    %{l_shtool} install -c -m 755 %{l_value -s -a} \
  +        %{SOURCE lesspipe} $RPM_BUILD_ROOT%{l_prefix}/bin/
  +    %{l_shtool} mkdir -f -p -m 755 \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
       %{l_shtool} install -c -m 755 %{l_value -s -a} \
           %{SOURCE rc.less} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
       %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-src/less/lesspipe
  ============================================================================
  $ cvs diff -u -r1.1.1.1 -r1.1.1.1.14.1 lesspipe
  --- openpkg-src/less/lesspipe 18 Sep 2001 09:48:29 -0000      1.1.1.1
  +++ openpkg-src/less/lesspipe 15 Jul 2004 08:25:58 -0000      1.1.1.1.14.1
  @@ -35,7 +35,7 @@
                   break
                   ;;
               rpm )
  -                filter="$filter | rpm -qpilv --scripts -- -"
  +                filter="$filter | @l_prefix@/bin/openpkg rpm -qpilv --scripts -- -"
                   break
                   ;;
               * )
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to