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 openpkg-web          Date:   12-Feb-2003 20:32:24
  Branch: HEAD                             Handle: 2003021219322301

  Modified files:
    openpkg-src/html2ps     html2ps.spec
    openpkg-web             news.txt

  Log:
    - make sure executable uses really our Perl via shebang
    - remove not holding build dependencies
    - "shtool install" can copy multiple files at once
    - use "share" instead of "lib" because its just aux files
    - really use the html2psrc file in <prefix>/etc/
    - make html2psrc file a %config file

  Summary:
    Revision    Changes     Path
    1.3         +14 -9      openpkg-src/html2ps/html2ps.spec
    1.3286      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/html2ps/html2ps.spec
  ============================================================================
  $ cvs diff -u -r1.2 -r1.3 html2ps.spec
  --- openpkg-src/html2ps/html2ps.spec  12 Feb 2003 15:58:45 -0000      1.2
  +++ openpkg-src/html2ps/html2ps.spec  12 Feb 2003 19:32:24 -0000      1.3
  @@ -42,7 +42,7 @@
   #   build information
   Prefix:       %{l_prefix}
   BuildRoot:    %{l_buildroot}
  -BuildPreReq:  OpenPKG, openpkg >= 20030103, perl, perl-www, netpbm
  +BuildPreReq:  OpenPKG, openpkg >= 20030103
   PreReq:       OpenPKG, openpkg >= 20030103, perl, perl-www, netpbm
   AutoReq:      no
   AutoReqProv:  no
  @@ -61,24 +61,29 @@
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/etc/html2ps \
  -        $RPM_BUILD_ROOT%{l_prefix}/lib/html2ps \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/html2ps \
           $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
           $RPM_BUILD_ROOT%{l_prefix}/man/man5
  -    %{l_shtool} install -c -m 755 -e 
's;/usr/local/lib/html2ps/;%{l_prefix}/lib/html2ps/;g'\
  +    %{l_shtool} install -c -m 755 \
  +        -e 's;^:.*;#!%{l_prefix}/bin/perl;' \
  +        -e 's;/usr/local/lib/html2ps/html2psrc;%{l_prefix}/etc/html2ps/html2psrc;g' 
\
  +        -e 
's;/usr/local/lib/html2ps/html2ps.html;%{l_prefix}/share/html2ps/html2ps.html;g' \
           html2ps $RPM_BUILD_ROOT%{l_prefix}/bin/
       %{l_shtool} install -c -m 644 \
  -        sample $RPM_BUILD_ROOT%{l_prefix}/etc/html2ps/html2ps.rc
  -    %{l_shtool} install -c -m 644 -e 's;@l_prefix@;%{l_prefix};g' \
  -        %{SOURCE html2psrc} $RPM_BUILD_ROOT%{l_prefix}/lib/html2ps/
  +        sample $RPM_BUILD_ROOT%{l_prefix}/etc/html2ps/html2psrc.sample
       %{l_shtool} install -c -m 644 \
  -        html2ps.html $RPM_BUILD_ROOT%{l_prefix}/lib/html2ps/
  +        -e 's;@l_prefix@;%{l_prefix};g' \
  +        %{SOURCE html2psrc} $RPM_BUILD_ROOT%{l_prefix}/etc/html2ps/
       %{l_shtool} install -c -m 644 \
  -         hyphen.tex $RPM_BUILD_ROOT%{l_prefix}/lib/html2ps/
  +        html2ps.html hyphen.tex \
  +        $RPM_BUILD_ROOT%{l_prefix}/share/html2ps/
       %{l_shtool} install -c -m 644 \
           html2ps.1 $RPM_BUILD_ROOT%{l_prefix}/man/man1/
       %{l_shtool} install -c -m 644 \
           html2psrc.5 $RPM_BUILD_ROOT%{l_prefix}/man/man5/
  -    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
  +    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
  +        %{l_files_std} \
  +        '%config %{l_prefix}/etc/html2ps/html2psrc'
   
   %files -f files
   
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-web/news.txt
  ============================================================================
  $ cvs diff -u -r1.3285 -r1.3286 news.txt
  --- openpkg-web/news.txt      12 Feb 2003 18:55:18 -0000      1.3285
  +++ openpkg-web/news.txt      12 Feb 2003 19:32:23 -0000      1.3286
  @@ -1,3 +1,4 @@
  +12-Feb-2003: Upgraded package: P<html2ps-1.0b3-20030212>
   12-Feb-2003: Upgraded package: P<samhain-1.7.2-20030212>
   12-Feb-2003: Upgraded package: P<sysmon-0.91.14-20030212>
   12-Feb-2003: Upgraded package: P<lmtp2nntp-1.2b4-20030212>
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to