[cups/f17] Fixed paths in config migration %post script.

[Tim Waugh]

commit bfa12a96164115fee3e4c40083a4a592cc615cf9
Author: Tim Waugh <twaugh at redhat.com>
Date:   Wed Nov 28 11:22:28 2012 +0000

    Fixed paths in config migration %post script.

 cups.spec |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/cups.spec b/cups.spec
index 4cc8584..466a7a6 100644
--- a/cups.spec
+++ b/cups.spec
@@ -12,7 +12,7 @@
 Summary: Common Unix Printing System
 Name: cups
 Version: 1.5.4
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPLv2
 Group: System Environment/Daemons
 Source: http://ftp.easysw.com/pub/cups/%{version}/cups-%{version}-source.tar.bz2
@@ -494,14 +494,14 @@ for keyword in AccessLog CacheDir ConfigFilePerm	\
     RequestRoot ServerBin ServerCertificate		\
     ServerKey ServerRoot SMBConfigFile StateDir		\
     SystemGroup SystemGroupAuthKey TempDir User; do
-    if ! /usr/bin/grep -iq ^$keyword "$IN"; then continue; fi
+    if ! /bin/grep -iq ^$keyword "$IN"; then continue; fi
     copy=yes
-    if /usr/bin/grep -iq ^$keyword "$OUT"; then
-	if [ "`/usr/bin/grep -i ^$keyword "$IN"`" ==	\
-	     "`/usr/bin/grep -i ^$keyword "$OUT"`" ]; then
+    if /bin/grep -iq ^$keyword "$OUT"; then
+	if [ "`/bin/grep -i ^$keyword "$IN"`" ==	\
+	     "`/bin/grep -i ^$keyword "$OUT"`" ]; then
 	    copy=no
 	else
-	    /usr/bin/sed -i -e "s,^$keyword,#$keyword,i" "$OUT"
+	    /bin/sed -i -e "s,^$keyword,#$keyword,i" "$OUT"
 	fi
     fi
     if [ "$copy" == "yes" ]; then
@@ -512,11 +512,11 @@ for keyword in AccessLog CacheDir ConfigFilePerm	\
 EOF
 	fi
 
-	/usr/bin/grep -i ^$keyword "$IN" >> "$OUT"
+	/bin/grep -i ^$keyword "$IN" >> "$OUT"
 	copiedany=yes
     fi
 
-    /usr/bin/sed -i -e "s,^$keyword,#$keyword,i" "$IN"
+    /bin/sed -i -e "s,^$keyword,#$keyword,i" "$IN"
 done
 
 if [ $1 -eq 1 ] ; then
@@ -736,6 +736,9 @@ rm -f %{cups_serverbin}/backend/smb
 %{_mandir}/man1/ipptool.1.gz
 
 %changelog
+* Wed Nov 28 2012 Tim Waugh <twaugh at redhat.com> 1:1.5.4-13
+- Fixed paths in config migration %%post script.
+
 * Mon Nov 26 2012 Tim Waugh <twaugh at redhat.com> 1:1.5.4-12
 - Apply upstream fix for CVE-2012-5519 (STR #4223, bug #875898).
   Migrate configuration keywords as needed.