From: Elan Ruusamäe <glen@pld-linux.org>
Date: Sat, 2 Sep 2006 20:34:47 +0000 (+0000)
Subject: - cp -a implies cp -r
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fdemarc.git;a=commitdiff_plain;h=b4d6e872024aa0739b62724e63157029692e5ad6

- cp -a implies cp -r

Changed files:
    demarc.spec -> 1.24
---

diff --git a/demarc.spec b/demarc.spec
index 47db2ec..337c9e4 100644
--- a/demarc.spec
+++ b/demarc.spec
@@ -59,8 +59,8 @@ mo
 %package client
 Summary:	Network monitoring program - client
 Summary(pl):	Program do monitorowania sieci - klient
-Requires:	snort(mysql) >= 1.8.1
 Group:		Networking
+Requires:	snort(mysql) >= 1.8.1
 
 %description client
 DEMARC is an all-inclusive network monitoring program that allows you
@@ -88,12 +88,12 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,demarcd,httpd} \
 	$RPM_BUILD_ROOT{%{_sbindir},%{_datadir}/demarc/{images,cgi}} \
 	$RPM_BUILD_ROOT%{_var}/lib/demarcd
 
-install %{SOURCE1}		$RPM_BUILD_ROOT/etc/httpd/%{name}.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/%{name}.conf
 install %{SOURCE2}		$RPM_BUILD_ROOT/etc/rc.d/init.d/demarcd
 install %{SOURCE3}		$RPM_BUILD_ROOT/etc/cron.d/%{name}
 install bin/demarcd		$RPM_BUILD_ROOT%{_sbindir}
 install conf/* $RPM_BUILD_ROOT%{_sysconfdir}/demarcd
-cp -ar  cgi images		$RPM_BUILD_ROOT%{_datadir}/demarc
+cp -a  cgi images		$RPM_BUILD_ROOT%{_datadir}/demarc
 install install/{c*,d*,p*}	$RPM_BUILD_ROOT%{_datadir}/demarc
 
 %clean
@@ -144,7 +144,7 @@ fi
 %dir %{_datadir}/demarc/images
 %{_datadir}/demarc/images/*
 
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/httpd/demarc.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd/demarc.conf
 
 %files client
 %defattr(644,root,root,755)