From 16a95ab0cf675601b487debc9e09e98298de3ab1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Fri, 4 Jun 2010 20:00:38 +0000
Subject: [PATCH] - Don't use "pathmunge" in the profile.d sh script to work
 around #548960.

---
 ccache.sh.in | 5 ++++-
 ccache.spec  | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ccache.sh.in b/ccache.sh.in
index 7d6d485..c751a60 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -1,7 +1,10 @@
 # Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
 # environment variable in their personal profile.
 
-pathmunge @LIBDIR@/ccache
+case ":$PATH:" in
+    *:@LIBDIR@/ccache:*) ;;
+    *) PATH="@LIBDIR@/ccache:$PATH" ;;
+esac
 
 # If @CACHEDIR@ is writable, use a shared cache there.  Users who don't
 # want that even if they have that write permission can set the CCACHE_DIR
diff --git a/ccache.spec b/ccache.spec
index f57ca07..dab1e56 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -104,6 +104,9 @@ done
 
 
 %changelog
+* Fri Jun  4 2010 Ville Skyttä <ville.skytta@iki.fi> - 2.4-18
+- Don't use "pathmunge" in the profile.d sh script to work around #548960.
+
 * Sat Dec 19 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.4-17
 - Minor profile.d script performance improvements.
 - Fix hardcoded /var/cache/ccache in profile.d scripts.