- updated to 3.1.7

Changed files:
    ccache-nohash_size_mtime.patch -> 1.3
    ccache.spec -> 1.37

diff --git a/ccache-nohash_size_mtime.patch b/ccache-nohash_size_mtime.patch
index 700e69eb88caf734cbe0c37e0c174422da0ca9ab..b28550a4845728068d36e60f25d452bb51531a46 100644 (file)
--- a/ccache-nohash_size_mtime.patch
+++ b/ccache-nohash_size_mtime.patch
@@ -1,15 +1,15 @@
 --- ccache-3.1/ccache.c~       2010-09-16 19:01:09.000000000 +0200
 +++ ccache-3.1/ccache.c        2010-10-02 18:16:57.670019849 +0200
 @@ -814,8 +814,10 @@
-               hash_file(hash, args->argv[0]);
+               /* Do nothing. */
        } else if (str_eq(compilercheck, "mtime")) {
                hash_delimiter(hash, "cc_mtime");
--              hash_int(hash, st.st_size);
--              hash_int(hash, st.st_mtime);
+-              hash_int(hash, st->st_size);
+-              hash_int(hash, st->st_mtime);
 +              if (!getenv("CCACHE_NOHASH_SIZE_MTIME")) {
-+                      hash_int(hash, st.st_size);
-+                      hash_int(hash, st.st_mtime);
++                      hash_int(hash, st->st_size);
++                      hash_int(hash, st->st_mtime);
 +              }
-       } else { /* command string */
-               if (!hash_multicommand_output(hash, compilercheck, orig_args->argv[0])) {
-                       fatal("Failure running compiler check command: %s", compilercheck);
+       } else if (str_eq(compilercheck, "content") || !allow_command) {
+               hash_delimiter(hash, "cc_content");
+               hash_file(hash, path);

diff --git a/ccache.spec b/ccache.spec
index d3219b320aed1b9e372c97ee7b7323b05f5576fa..a5df31ac2b6c42a149cbc572129d6b5fbdb0335d 100644 (file)
--- a/ccache.spec
+++ b/ccache.spec
@@ -2,12 +2,12 @@ Summary:      Compiler cache
 Summary(pl.UTF-8):     Przyspieszacz kompilowania
 Summary(pt_BR.UTF-8):  Cache para compiladores C/C++
 Name:          ccache
-Version:       3.1.6
+Version:       3.1.7
 Release:       1
 License:       GPL v3
 Group:         Development/Tools
 Source0:       http://samba.org/ftp/ccache/%{name}-%{version}.tar.bz2
-# Source0-md5: 343dc9b642e1d2af1e6bd8e474dde92e
+# Source0-md5: 82257745eac54826527946e9e3d046f4
 Patch0:                %{name}-nohash_size_mtime.patch
 URL:           http://ccache.samba.org/
 BuildRequires: automake