rpms/ccache/F-13 ccache.sh.in,1.2,1.3 ccache.spec,1.26,1.27

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/ccache/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24255

Modified Files:
	ccache.sh.in ccache.spec 
Log Message:
* Fri Jun  4 2010 Ville Skyttä <ville.skytta at iki.fi> - 2.4-18
- Don't use "pathmunge" in the profile.d sh script to work around #548960.



Index: ccache.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/F-13/ccache.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ccache.sh.in	19 Dec 2009 11:44:52 -0000	1.2
+++ ccache.sh.in	4 Jun 2010 20:00:38 -0000	1.3
@@ -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


Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/F-13/ccache.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ccache.spec	19 Dec 2009 11:44:52 -0000	1.26
+++ ccache.spec	4 Jun 2010 20:00:38 -0000	1.27
@@ -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 at 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 at iki.fi> - 2.4-17
 - Minor profile.d script performance improvements.
 - Fix hardcoded /var/cache/ccache in profile.d scripts.