- PLD sasl uses /etc/sasl dir

diff --git a/pcp-saslconfdir.patch b/pcp-saslconfdir.patch
new file mode 100644 (file)
index 0000000..2355997
--- /dev/null
+++ b/pcp-saslconfdir.patch
@@ -0,0 +1,11 @@
+--- pcp-3.8.2/configure.in~    2013-08-28 21:02:12.078864396 +0200
++++ pcp-3.8.2/configure.in     2013-08-28 21:04:27.163062319 +0200
+@@ -1687,7 +1687,7 @@
+ pcp_etc_dir=`eval echo $sysconfdir`
+ pcp_etc_dir=`eval echo $pcp_etc_dir`
+ AC_SUBST(pcp_etc_dir)
+-pcp_saslconf_dir=`eval echo $sysconfdir/sasl2`
++pcp_saslconf_dir=`eval echo $sysconfdir/sasl`
+ pcp_saslconf_dir=`eval echo $pcp_saslconf_dir`
+ AC_SUBST(pcp_saslconf_dir)
+ pcp_sysconf_dir=`eval echo $sysconfdir/pcp`

diff --git a/pcp.spec b/pcp.spec
index 6d9667473954dc10bf5115aa8ab64073941f84eb..202b238d682c3ee2e226bbb78fe9b2a15408d06d 100644 (file)
--- a/pcp.spec
+++ b/pcp.spec
@@ -17,6 +17,7 @@ Patch0:               %{name}-ps.patch
 Patch1:                %{name}-opt.patch
 Patch2:                %{name}-nspr.patch
 Patch3:                %{name}-man.patch
+Patch4:                %{name}-saslconfdir.patch
 URL:           http://oss.sgi.com/projects/pcp/
 BuildRequires: autoconf >= 2.60
 BuildRequires: bison
@@ -131,6 +132,7 @@ Bashowe uzupełnianie nazw dla narzędzi PCP.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__autoconf}
@@ -261,7 +263,7 @@ PCP_DIR= PCP_TMP_DIR=/tmp ./Make.stdpmid
 %{_datadir}/pcp/lib/rc-proc.sh.minimal
 %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/pmie
 %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/pmlogger
-%config(noreplace) %verify(not md5 mtime size) /etc/sasl2/pmcd.conf
+%config(noreplace) %verify(not md5 mtime size) /etc/sasl/pmcd.conf
 %{_sysconfdir}/pcp.sh
 %dir %{_sysconfdir}/pcp
 %dir %{_sysconfdir}/pcp/pmcd