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 Date: 29-Feb-2004 09:50:11
Branch: HEAD Handle: 2004022908501100
Modified files:
openpkg-src/amanda amanda.spec
Log:
apply fixed
Summary:
Revision Changes Path
1.2 +15 -7 openpkg-src/amanda/amanda.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/amanda/amanda.spec
============================================================================
$ cvs diff -u -r1.1 -r1.2 amanda.spec
--- openpkg-src/amanda/amanda.spec 21 Feb 2004 16:12:31 -0000 1.1
+++ openpkg-src/amanda/amanda.spec 29 Feb 2004 08:50:11 -0000 1.2
@@ -34,10 +34,10 @@
Group: System
License: BSD-style
Version: 2.4.4p2
-Release: 20040221
+Release: 20040229
# package options
-%option with_server yes
+%option with_server no
%option with_port_range yes
# list of sources
@@ -79,6 +79,11 @@
-e 's;/etc/amandates;%{l_prefix}/etc/amanda/amandates;g' \
client-src/amandates.h
+ # relocate .amandahosts to %{l_prefix}/etc/amanda
+ %{l_shtool} subst -s \
+ -e 's;pwptr->pw_dir, "/.amandahosts";"%{l_prefix}/etc/amanda",
"/.amandahosts";g' \
+ common-src/security.c
+
%build
# configure package
CC="%{l_cc}" \
@@ -123,9 +128,10 @@
# create additional directories
%{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/amanda \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/xinetd/xinetd.d \
$RPM_BUILD_ROOT%{l_prefix}/var/amanda/gnutar-lists \
- $RPM_BUILD_ROOT%{l_prefix}/var/amanda/DailySet1 \
- $RPM_BUILD_ROOT%{l_prefix}/etc/xinetd/xinetd.d
+ $RPM_BUILD_ROOT%{l_prefix}/var/amanda/DailySet1
# create additional server-specific directories
%if "%{with_server}" == "yes"
@@ -137,8 +143,8 @@
$RPM_BUILD_ROOT%{l_prefix}/var/amanda/DailySet1/index
%endif
- # create empty files (FIXME: path of .amandahosts!!)
- touch $RPM_BUILD_ROOT%{l_prefix}/.amandahosts
+ # create empty files
+ touch $RPM_BUILD_ROOT%{l_prefix}/etc/amanda/.amandahosts
touch $RPM_BUILD_ROOT%{l_prefix}/etc/amanda/amandates
touch $RPM_BUILD_ROOT%{l_prefix}/lib/amanda/exclude.gtar
@@ -181,10 +187,12 @@
'%config %{l_prefix}/etc/amanda/DailySet1/*' \
'%not %dir %{l_prefix}/etc/xinetd/xinetd.d' \
'%config(noreplace) %{l_prefix}/etc/xinetd/xinetd.d/*' \
- '%attr(660,%{l_musr},%{l_mgrp}) %config(noreplace)
%{l_prefix}/.amandahosts' \
+ '%attr(660,%{l_musr},%{l_mgrp}) %config(noreplace)
%{l_prefix}/etc/amanda/.amandahosts' \
+%if "%{with_server}" == "yes"
'%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/sbin/amcheck' \
'%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/amanda/dumper' \
'%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/amanda/planner' \
+%endif
'%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/amanda/runtar' \
'%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/amanda/rundump' \
'%attr(4711,%{l_susr},%{l_mgrp}) %{l_prefix}/libexec/amanda/calcsize' \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
