rpms/ccache/devel ccache.csh.in, 1.1, 1.2 ccache.sh.in, 1.1, 1.2 ccache.spec, 1.25, 1.26

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/ccache/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24205

Modified Files:
	ccache.csh.in ccache.sh.in ccache.spec 
Log Message:
* 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.



Index: ccache.csh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.csh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ccache.csh.in	29 Jul 2007 22:38:31 -0000	1.1
+++ ccache.csh.in	19 Dec 2009 11:44:52 -0000	1.2
@@ -9,8 +9,8 @@ endif
 # want that even if they have that write permission can set the CCACHE_DIR
 # and unset the CCACHE_UMASK environment variables in their personal profile.
 
-if ( ! $?CCACHE_DIR && -d @CACHEDIR@ && -w @CACHEDIR@ ) then
-    setenv CCACHE_DIR /var/cache/ccache
+if ( ! $?CCACHE_DIR && -w @CACHEDIR@ && -d @CACHEDIR@ ) then
+    setenv CCACHE_DIR @CACHEDIR@
     setenv CCACHE_UMASK 002
     unsetenv CCACHE_HARDLINK
 endif


Index: ccache.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ccache.sh.in	29 Jul 2007 22:38:31 -0000	1.1
+++ ccache.sh.in	19 Dec 2009 11:44:52 -0000	1.2
@@ -1,16 +1,14 @@
 # Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
 # environment variable in their personal profile.
 
-if ! echo "$PATH" | grep -qw @LIBDIR@/ccache ; then
-    PATH="@LIBDIR@/ccache:$PATH"
-fi
+pathmunge @LIBDIR@/ccache
 
 # 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
 # and unset the CCACHE_UMASK environment variables in their personal profile.
 
-if [ -z "$CCACHE_DIR" -a -d @CACHEDIR@ -a -w @CACHEDIR@ ] ; then
-    export CCACHE_DIR=/var/cache/ccache
+if [ -z "$CCACHE_DIR" ] && [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
+    export CCACHE_DIR=@CACHEDIR@
     export CCACHE_UMASK=002
     unset CCACHE_HARDLINK
 fi


Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- ccache.spec	10 Aug 2009 17:43:51 -0000	1.25
+++ ccache.spec	19 Dec 2009 11:44:52 -0000	1.26
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -23,6 +23,8 @@ Patch4:         http://patch-tracking.de
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
+# For pathmunge in profile.d/ccache.sh, #123621
+Requires:       setup >= 2.5.48
 Requires(triggerin): coreutils
 Requires(triggerpostun): coreutils
 
@@ -102,6 +104,10 @@ done
 
 
 %changelog
+* 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.
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 2.4-16
 - Switch #438201 patch URL to Debian patch tracking (original is MIA).