packages: cyrus-sasl/cyrus-sasl.spec - update paths in manpages

[glen]

Author: glen                         Date: Thu Oct 14 11:30:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- update paths in manpages

---- Files affected:
packages/cyrus-sasl:
   cyrus-sasl.spec (1.191 -> 1.192) 

---- Diffs:

================================================================
Index: packages/cyrus-sasl/cyrus-sasl.spec
diff -u packages/cyrus-sasl/cyrus-sasl.spec:1.191 packages/cyrus-sasl/cyrus-sasl.spec:1.192
--- packages/cyrus-sasl/cyrus-sasl.spec:1.191	Thu Oct 14 13:07:03 2010
+++ packages/cyrus-sasl/cyrus-sasl.spec	Thu Oct 14 13:30:44 2010
@@ -473,6 +473,14 @@
 # acinclude.m4 contains only old libtool.m4
 rm -f acinclude.m4 libtool config/libtool.m4 saslauthd/acinclude.m4
 
+# update to our paths
+sed -i -e '
+	s,/usr/local/etc/saslauthd.conf,%{_sysconfdir}/saslauthd.conf,g
+	s,/etc/saslauthd.conf,%{_sysconfdir}/saslauthd.conf,g
+	s,/var/run/saslauthd/mux,/var/lib/sasl2/mux,g
+	s,/var/state/saslauthd,/var/lib/sasl2,g
+' saslauthd/saslauthd.8 saslauthd/saslauthd.mdoc saslauthd/LDAP_SASLAUTHD doc/sysadmin.html
+
 %build
 %{__libtoolize}
 %{__aclocal} -I cmulocal -I config
@@ -519,7 +527,7 @@
 %{__make} -C sample sample-client sample-server
 
 cd doc
-RFCLIST=`grep 'rfc.\+\.txt' rfc-compliance`
+RFCLIST=$(grep 'rfc.\+\.txt' rfc-compliance)
 for i in $RFCLIST; do
 	RFCDIR=../RFC/text/`echo $i | sed -e 's:^rfc::' -e 's:..\.txt$::' `00
 	echo -e ',s:'$i':'$RFCDIR/$i'\n,w\nq' | ed index.html
@@ -537,8 +545,8 @@
 rm -rf $RPM_BUILD_ROOT%{_mandir}/cat*
 rm -f $RPM_BUILD_ROOT%{_libdir}/sasl2/*.{la,a}
 
-install utils/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
-install saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
+cp -a utils/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
+cp -a saslauthd/saslauthd.mdoc $RPM_BUILD_ROOT%{_mandir}/man8/saslauthd.8
 
 ln -sf libsasl2.so $RPM_BUILD_ROOT%{_libdir}/libsasl.so
 
@@ -546,11 +554,11 @@
 
 # create empty config
 touch $RPM_BUILD_ROOT%{_sysconfdir}/saslauthd.conf
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
-install %{SOURCE3} cyrus.pam
+install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/saslauthd
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/saslauthd
+cp -a %{SOURCE3} cyrus.pam
 
-install saslauthd/{testsaslauthd,saslcache} $RPM_BUILD_ROOT%{_sbindir}
+install -p saslauthd/{testsaslauthd,saslcache} $RPM_BUILD_ROOT%{_sbindir}
 
 # sample programs for testing sasl
 libtool --mode=install cp sample/sample-client $RPM_BUILD_ROOT%{_bindir}/sasl-sample-client
@@ -714,6 +722,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.192  2010/10/14 11:30:44  glen
+- update paths in manpages
+
 Revision 1.191  2010/10/14 11:07:03  glen
 - add -saslauthd-httpform-urlescape.patch from AC-branch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cyrus-sasl/cyrus-sasl.spec?r1=1.191&r2=1.192&f=u