[ccache] - Update to 3.1, fixes #610853. - Make sh profile script "nounset" clean.

Ville Skyttä scop at fedoraproject.org
Sat Sep 18 10:28:51 UTC 2010


commit fc4c39b2ecda140463c6de9f1c44e1fced8675e6
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat Sep 18 13:28:39 2010 +0300

    - Update to 3.1, fixes #610853.
    - Make sh profile script "nounset" clean.

 .gitignore   |    2 +-
 ccache.sh.in |    6 +++---
 ccache.spec  |    8 ++++++--
 sources      |    2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d8ef47e..ab41dc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-ccache-3.0.1.tar.bz2
+/ccache-3.1.tar.bz2
diff --git a/ccache.sh.in b/ccache.sh.in
index c751a60..03f2c85 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -1,16 +1,16 @@
 # Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
 # environment variable in their personal profile.
 
-case ":$PATH:" in
+case ":${PATH:-}:" in
     *:@LIBDIR@/ccache:*) ;;
-    *) PATH="@LIBDIR@/ccache:$PATH" ;;
+    *) PATH="@LIBDIR@/ccache${PATH:+:$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
 # and unset the CCACHE_UMASK environment variables in their personal profile.
 
-if [ -z "$CCACHE_DIR" ] && [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
+if [ -z "${CCACHE_DIR:-}" ] && [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
     export CCACHE_DIR=@CACHEDIR@
     export CCACHE_UMASK=002
     unset CCACHE_HARDLINK
diff --git a/ccache.spec b/ccache.spec
index 8d01ea2..4ceb28c 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -5,7 +5,7 @@
 %{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
 
 Name:           ccache
-Version:        3.0.1
+Version:        3.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -89,7 +89,7 @@ done
 
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
-%doc COPYING NEWS.txt README.txt
+%doc AUTHORS.* GPL-3.0.txt LICENSE.* MANUAL.* NEWS.* README.*
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
@@ -98,6 +98,10 @@ done
 
 
 %changelog
+* Sat Sep 18 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.1-1
+- Update to 3.1, fixes #610853.
+- Make sh profile script "nounset" clean.
+
 * Fri Jul 16 2010 Ville Skyttä <ville.skytta at iki.fi> - 3.0.1-1
 - Update to 3.0.1.
 
diff --git a/sources b/sources
index e20be53..ed7eb62 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-223449f7891e5d6a15b25100eca5cca4  ccache-3.0.1.tar.bz2
+7961852e1e36f11559039c32142f58df  ccache-3.1.tar.bz2


More information about the scm-commits mailing list