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

  Server: cvs.openpkg.org                  Name:   Christoph Schug
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-src                      Date:   09-Jan-2006 21:18:18
  Branch: HEAD                             Handle: 2006010920181800

  Modified files:
    openpkg-src/analog      analog.spec

  Log:
    It's certainly hard to supply suitable defaults to a program like
    analog\(1\) but currently all directory settings default to
    %{l_prefix}/bin/. Defined correct paths where possible, the rest
    defaults to /tmp/ now, which might be more secure than bin/; installed
    man page

  Summary:
    Revision    Changes     Path
    1.47        +15 -1      openpkg-src/analog/analog.spec
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/analog/analog.spec
  ============================================================================
  $ cvs diff -u -r1.46 -r1.47 analog.spec
  --- openpkg-src/analog/analog.spec    1 Jan 2006 13:11:55 -0000       1.46
  +++ openpkg-src/analog/analog.spec    9 Jan 2006 20:18:18 -0000       1.47
  @@ -33,7 +33,7 @@
   Group:        Web
   License:      GPL
   Version:      6.0
  -Release:      20050608
  +Release:      20060109
   
   #   list of sources
   Source0:      http://www.analog.cx/analog-%{version}.tar.gz
  @@ -65,6 +65,17 @@
   %prep
       %setup -q
       %patch -p0
  +    %{l_shtool} subst \
  +        -e 's;^\(#define CONFIGDIR \).*$;\1"%{l_prefix}/etc/analog/";' \
  +        -e 's;^\(#define LANGDIR \).*$;\1"%{l_prefix}/share/analog/lang/";' \
  +        -e 's;^\(#define LOGSDIR \).*$;\1"/tmp/";' \
  +        -e 's;^\(#define CACHEDIR \).*$;\1"/tmp/";' \
  +        -e 's;^\(#define OUTDIR \).*$;\1"/tmp/";' \
  +        -e 's;^\(#define HEADERDIR \).*$;\1"/tmp/";' \
  +        -e 's;^\(#define DNSDIR \).*$;\1"/tmp/";' \
  +        -e 's;^\(#define LOCKDIR \).*$;\1"/tmp/";' \
  +        -e 's;^\(#define ERRDIR \).*$;\1"/tmp/";' \
  +        src/anlghead.h
   
   %build
       cd src
  @@ -83,6 +94,7 @@
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/bin \
           $RPM_BUILD_ROOT%{l_prefix}/etc/analog \
  +        $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
           $RPM_BUILD_ROOT%{l_prefix}/share/analog/image \
           $RPM_BUILD_ROOT%{l_prefix}/share/analog/lang
       %{l_shtool} install -c -s -m 755 \
  @@ -93,6 +105,8 @@
           -e 's;^# DESCFILE ukdesc.txt;DESCFILE 
%{l_prefix}/share/analog/lang/ukdesc.txt;' \
           examples/big.cfg $RPM_BUILD_ROOT%{l_prefix}/etc/analog/analog.cfg
       %{l_shtool} install -c -m 644 \
  +        analog.man $RPM_BUILD_ROOT%{l_prefix}/man/man1/analog.1
  +    %{l_shtool} install -c -m 644 \
           images/* $RPM_BUILD_ROOT%{l_prefix}/share/analog/image/
       %{l_shtool} install -c -m 644 \
           lang/* $RPM_BUILD_ROOT%{l_prefix}/share/analog/lang/
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to