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

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /e/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-web, openpkg-src         Date:   04-Dec-2002 11:23:05
  Branch: HEAD                             Handle: 2002120410230401

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

  Log:
    try to fix packaging

  Summary:
    Revision    Changes     Path
    1.23        +18 -8      openpkg-src/samhain/samhain.spec
    1.2185      +1  -0      openpkg-web/news.txt
  ____________________________________________________________________________

  Index: openpkg-src/samhain/samhain.spec
  ============================================================
  $ cvs diff -u -r1.22 -r1.23 samhain.spec
  --- openpkg-src/samhain/samhain.spec  31 Oct 2002 19:08:50 -0000      1.22
  +++ openpkg-src/samhain/samhain.spec  4 Dec 2002 10:23:05 -0000       1.23
  @@ -33,7 +33,7 @@
   Group:        System
   License:      GPL
   Version:      1.6.3
  -Release:      20021031
  +Release:      20021204
   
   #   list of sources
   Source0:      http://la-samhna.de/samhain/samhain-current.tar.gz
  @@ -69,26 +69,36 @@
             --with-dataroot-prefix=%{l_prefix}/var/samhain \
             --with-html-file=%{l_prefix}/var/samhain/samhain.html \
             --with-data-file=%{l_prefix}/var/samhain/samhain.data \
  -          --with-log-file=%{l_prefix}/var/samhain/run/samhain.log \
  -          --with-lock-file=%{l_prefix}/var/samhain/run/samhain.pid
  +          --with-pid-file=%{l_prefix}/var/samhain/run/samhain.pid \
  +          --with-log-file=%{l_prefix}/var/samhain/run/samhain.log
         %{l_make} %{l_mflags}
       )
   
   %install
       rm -rf $RPM_BUILD_ROOT
       ( cd samhain-%{version}
  -      %{l_shtool} subst \
  -          -e "s; %{l_prefix}; $RPM_BUILD_ROOT%{l_prefix};g" \
  -          Makefile Makefile_D
  -      %{l_make} %{l_mflags} install install-man
  +      %{l_make} %{l_mflags} \
  +          install-program install-man install-data \
  +          DESTDIR=$RPM_BUILD_ROOT
       )
  +    case "%{l_target}" in
  +        *-freebsd* ) rc="samhainrc.freebsd" ;;
  +        *-linux*   ) rc="samhainrc.linux"   ;;
  +        *-solaris* ) rc="samhainrc.solaris" ;;
  +        * ) echo "ERROR: platform \"%{l_target}\" not supported" 1>&2; exit 1 ;;
  +    esac
  +    %{l_shtool} install -c -m 644 \
  +        samhain-%{version}/$rc \
  +        $RPM_BUILD_ROOT%{l_prefix}/etc/samhain/samhainrc
       %{l_shtool} mkdir -f -p -m 755 \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
       %{l_shtool} install -c -m 755 \
           -e 's;@l_prefix@;%{l_prefix};g' \
           %{SOURCE rc.samhain} \
           $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
  -    %{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/samhain/samhainrc'
   
   %files -f files
   
  Index: openpkg-web/news.txt
  ============================================================
  $ cvs diff -u -r1.2184 -r1.2185 news.txt
  --- openpkg-web/news.txt      4 Dec 2002 10:07:00 -0000       1.2184
  +++ openpkg-web/news.txt      4 Dec 2002 10:23:04 -0000       1.2185
  @@ -1,3 +1,4 @@
  +04-Dec-2002: Upgraded package: P<samhain-1.6.3-20021204>
   04-Dec-2002: Upgraded package: P<perl-www-20021204-20021204>
   04-Dec-2002: Upgraded package: P<mysql-3.23.53-20021204>
   04-Dec-2002: New package: P<cfengine-2.0.5pre2-20021204>
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to