[shibboleth-sp2] 59/119: Macro errors.

[Ferenc Wágner]

This is an automated email from the git hooks/post-receive script.

wferi-guest pushed a commit to annotated tag 1.3.1
in repository shibboleth-sp2.

commit f45a56941f91640fe7b4224793f86a012833802b
Author: Scott Cantor <cantor.2 at osu.edu>
Date:   Sun Sep 16 03:06:12 2007 +0000

    Macro errors.
---
 shibboleth.spec.in | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/shibboleth.spec.in b/shibboleth.spec.in
index b4a1ac6..d12186f 100644
--- a/shibboleth.spec.in
+++ b/shibboleth.spec.in
@@ -56,11 +56,11 @@ applications that use the shibboleth library.
 %{__make}
 
 %install
-[ "$RPM_BUILD_ROOT" != "/" ] && {__rm} -rf $RPM_BUILD_ROOT
-{__rm} -rf _docs
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf _docs
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
-{__mv} $RPM_BUILD_ROOT/usr/doc/shibboleth _docs
+%{__mv} $RPM_BUILD_ROOT/usr/doc/shibboleth _docs
 
 %if "%{_vendor}" == "suse"
 	%{__sed} -i "s/\/var\/log\/httpd/\/var\/log\/apache2/g" \
@@ -74,7 +74,7 @@ find $RPM_BUILD_ROOT/%{_libexecdir} -type f -or -type l |
 %{__make} check
 
 %clean
-[ "$RPM_BUILD_ROOT" != "/" ] && {__rm} -rf $RPM_BUILD_ROOT
+[ "$RPM_BUILD_ROOT" != "/" ] && %{__rm} -rf $RPM_BUILD_ROOT
 
 %ifnos solaris2.8 solaris2.9 solaris2.10 
 %post -p /sbin/ldconfig
@@ -118,7 +118,7 @@ fi
 %if "%{_vendor}" == "redhat"
 	if [ -d %{_sysconfdir}/init.d ] ; then
 		if [ ! -f %{_sysconfdir}/init.d/shibd ] ; then
-			{__cp} -p %{_sysconfdir}/shibboleth/%{_vendor} %{_sysconfdir}/init.d/shibd
+			%{__cp} -p %{_sysconfdir}/shibboleth/%{_vendor} %{_sysconfdir}/init.d/shibd
 			%{__chmod} 755 %{_sysconfdir}/init.d/shibd
 			chkconfig --add shibd
 		fi
@@ -132,15 +132,15 @@ fi
 # delete the Apache configuration if we're being removed
 [ "$1" = 0 ] || exit 0
 [ -f %{_sysconfdir}/httpd/conf.d/shib.conf ] && \
-    {__rm} -f %{_sysconfdir}/httpd/conf.d/shib.conf
+    %{__rm} -f %{_sysconfdir}/httpd/conf.d/shib.conf
 [ -f %{_sysconfdir}/apache2/conf.d/shib.conf ] && \
-    {__rm} -f %{_sysconfdir}/apache2/conf.d/shib.conf
+    %{__rm} -f %{_sysconfdir}/apache2/conf.d/shib.conf
 
 # clear init.d state
 %if "%{_vendor}" == "redhat"
 	chkconfig --del shibd
 	[ -f %{_sysconfdir}/init.d/shibd ] && \
-	    {__rm} -f %{_sysconfdir}/init.d/shibd
+	    %{__rm} -f %{_sysconfdir}/init.d/shibd
 %endif
 
 %files -f rpm.filelist

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/shibboleth-sp2.git