From 5dbee91663150bb967699d71d76351dad7816bdc Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 04:07:43 +0000
Subject: [PATCH 001/153] auto-import changelog data from
 ccache-2.3-0.fdr.5.rh80.src.rpm 2.3-0.fdr.5 - Add support for gcc33 and
 g++33. 2.3-0.fdr.4 - Fix hardcoded lib path in profile.d scriptlets (bug
 1558). 2.3-0.fdr.3 - Add support for gcc34 and g++34, and    
 %{_target_cpu}-%{_vendor}-%{_target_os}-* variants. 2.3-0.fdr.2 - Add
 overriding symlinks for gcc-ssa and g++-ssa (bug 963). 2.3-0.fdr.1 - Update
 to 2.3. - Implement triggers to keep list of "aliased" compilers up to date
 on the     fly. - Add gcc32 and a bunch of legacy packages to the list of
 overridden     compilers. 2.2-0.fdr.6 - Add c++ to the list of overridden
 compilers (bug 548). - Own everything including dirs under %{_libdir}/ccache
 (bug 529). - %{buildroot} -> $RPM_BUILD_ROOT. - Fix man page permissions. -
 Use %{?_smp_mflags}. - Other cosmetic specfile tweaks. Sat Mar 29 2003 Warren
 Togami <warren@togami.com> 2.2-0.fdr.5 - Epoch: 0 - Remove
 /usr/lib/ccache/sbin from PATH Fri Mar 28 2003 Warren Togami
 <warren@togami.com> 2.2-0.fdr.4 - Add BuildRequires: autoconf >= 0:2.52 - Add
 Requires: gcc, gcc-c++ (minimal expectation of compilers) Fri Mar 28 2003
 Warren Togami <warren@togami.com> 2.2-0.fdr.3 - No longer use %ghost,
 symlinks always exist Thu Mar 27 2003 Warren Togami <warren@togami.com>
 2.2-0.fdr.2 - Move symlinks to /usr/lib/ccache/bin - Use
 /etc/profile.d/ccache.* scripts to add it to PATH As long as it is     before
 /usr/bin it is good. Thu Mar 27 2003 Warren Togami <warren@togami.com>
 2.2-0.fdr.1 - Move symlinks to /bin since it seems to be at the beginning of
 PATH of     all users before /usr/bin, the location of the real compiler. -
 Package symlinks rather than create and remove during %post and %postun Thu
 Feb 20 2003 Warren Togami <warren@togami.com> 2.2-4.fedora.1 - Fedora Thu Feb
 20 2003 Samir M. Nassar <rpm@redconcepts.net> 2.2-3.redconcepts - Added
 symlinks to g++ - Removed symlink removal in post Thu Feb 20 2003 Samir M.
 Nassar <rpm@redconcepts.net> 2.2-2.redconcepts - Cleans symlinks if present
 to make upgrades easier Thu Feb 20 2003 Samir M. Nassar <rpm@redconcepts.net>
 2.2-1.redconcepts - Upgraded to ccache 2.2 Tue Feb 04 2003 Samir M. Nassar
 <rpm@redconcepts.net> 2.1.1-4.redconcepts - Using %post to create the soft
 symlinks - Using %postun to remove the soft symlinks - Thanks to Che
 <che666@uni.de> for the help - Packaged as user Sun Jan 19 2003 Samir M.
 Nassar <rpm@redconcepts.net> 2.1.1-3.redconcepts - make a soft symlink
 between ccache and gcc - make a soft symlink between ccache and cc Thu Jan 16
 2003 Samir M. Nassar <rpm@redconcepts.net> 2.1.1-2.redconcepts - Normalized
 spec file. Wed Jan 15 2003 Samir M, Nassar <rpm@redconcepts.net>
 2.1.1-1.redconcepts - Using ccache 2.2.1 sources - Changed release to
 redconcepts for consistency Tue Oct 22 2002 Samir M. Nassar
 <rpm.redconcepts.net> 1.9-1.rcn - Initial RedConcepts.NET (rcn) build for Red
 Hat Linux 8.0

---
 .cvsignore  |   1 +
 ccache.spec | 171 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 sources     |   1 +
 3 files changed, 173 insertions(+)
 create mode 100644 ccache.spec

diff --git a/.cvsignore b/.cvsignore
index e69de29..e93dfed 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+ccache-2.3.tar.gz
diff --git a/ccache.spec b/ccache.spec
new file mode 100644
index 0000000..bf70d87
--- /dev/null
+++ b/ccache.spec
@@ -0,0 +1,171 @@
+%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 kgcc egcs egcs++ gcc3 g++3 gcc-ssa g++-ssa gcc34 c++34 g++34 gcc33 c++33 g++33
+%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, gcc32, gcc3, gcc3-c++, kgcc, compat-egcs, compat-egcs-c++, egcs, egcs-c++, gcc-ssa, gcc-c++-ssa, gcc34, gcc34-c++
+
+Name:		ccache
+Version:	2.3
+Release:	0.fdr.5.rh80
+Epoch:          0
+Summary:	Compiler cache
+
+Group:		Development/Tools
+License:	GPL
+URL:		http://ccache.samba.org/
+Source0:	http://ccache.samba.org/ftp/ccache/ccache-2.3.tar.gz
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+ccache is a compiler cache. It acts as a caching pre-processor to
+C/C++ compilers, using the -E compiler switch and a hash to detect
+when a compilation can be satisfied from cache. This often results in
+a 5 to 10 times speedup in common compilations.
+
+
+%prep
+%setup -q
+
+
+%build
+%configure
+%{__make} %{?_smp_mflags}
+cat <<EOF > %{name}.sh
+if ! echo "\$PATH" | grep -q %{_libdir}/ccache/bin ; then
+    PATH="%{_libdir}/ccache/bin:\$PATH"
+fi
+EOF
+cat <<EOF > %{name}.csh
+if ( "\$path" !~ *%{_libdir}/ccache/bin* ) then
+    set path = ( %{_libdir}/ccache/bin \$path )
+endif
+EOF
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -dm 755 $RPM_BUILD_ROOT{%{_libdir}/ccache/bin,%{_mandir}/man1}
+install -pm 755 ccache $RPM_BUILD_ROOT%{_libdir}/ccache/bin
+install -pm 644 ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -pm 755 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+> %{name}-%{version}.compilers
+for name in %{compilers} ; do
+  for comp in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
+    ln -s ccache $RPM_BUILD_ROOT%{_libdir}/ccache/bin/$comp
+    echo "%ghost %{_libdir}/ccache/bin/$comp" >> %{name}-%{version}.compilers
+  done
+done
+
+
+%clean
+rm -fr $RPM_BUILD_ROOT
+
+
+%triggerin -- %{pkgs}
+for name in %{compilers} ; do
+  for comp in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
+    if [ -x %{_bindir}/$comp ] ; then
+      ln -sf ccache %{_libdir}/ccache/bin/$comp
+    else
+      # This block is to support upgrading from < 2.3-0.fdr.1.
+      rm -f %{_libdir}/ccache/bin/$comp
+    fi
+  done
+done
+
+%triggerpostun -- %{pkgs}
+for name in %{compilers} ; do
+  for comp in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
+    [ -x %{_bindir}/$comp ] || rm -f %{_libdir}/ccache/bin/$comp
+  done
+done
+
+
+%files -f %{name}-%{version}.compilers
+%defattr(-,root,root,-)
+%doc README
+%config %{_sysconfdir}/profile.d/%{name}.*sh
+%dir %{_libdir}/ccache
+%dir %{_libdir}/ccache/bin
+%{_libdir}/ccache/bin/ccache
+%{_mandir}/man1/ccache.1*
+
+
+%changelog
+* Fri Jun 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.5
+- Add support for gcc33 and g++33.
+
+* Thu Jun 10 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.4
+- Fix hardcoded lib path in profile.d scriptlets (bug 1558).
+
+* Mon May  3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.3
+- Add support for gcc34 and g++34, and
+  %%{_target_cpu}-%%{_vendor}-%%{_target_os}-* variants.
+
+* Thu Nov 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
+- Add overriding symlinks for gcc-ssa and g++-ssa (bug 963).
+
+* Tue Nov 11 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.1
+- Update to 2.3.
+- Implement triggers to keep list of "aliased" compilers up to date on the fly.
+- Add gcc32 and a bunch of legacy packages to the list of overridden compilers.
+
+* Sat Aug  2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2-0.fdr.6
+- Add c++ to the list of overridden compilers (bug 548).
+- Own everything including dirs under %%{_libdir}/ccache (bug 529).
+- %%{buildroot} -> $RPM_BUILD_ROOT.
+- Fix man page permissions.
+- Use %%{?_smp_mflags}.
+- Other cosmetic specfile tweaks.
+
+* Fri Mar 29 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.5
+- Epoch: 0
+- Remove /usr/lib/ccache/sbin from PATH
+
+* Fri Mar 28 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.4
+- Add BuildRequires: autoconf >= 0:2.52
+- Add Requires: gcc, gcc-c++ (minimal expectation of compilers)
+
+* Fri Mar 28 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.3
+- No longer use %ghost, symlinks always exist
+
+* Thu Mar 27 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.2
+- Move symlinks to /usr/lib/ccache/bin
+- Use /etc/profile.d/ccache.* scripts to add it to PATH
+  As long as it is before /usr/bin it is good.
+
+* Thu Mar 27 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.1
+- Move symlinks to /bin since it seems to be at the beginning of PATH of all users
+    before /usr/bin, the location of the real compiler.
+- Package symlinks rather than create and remove during %post and %postun
+
+* Thu Feb 20 2003 Warren Togami <warren@togami.com> 2.2-4.fedora.1
+- Fedora
+
+* Thu Feb 20 2003 Samir M. Nassar <rpm@redconcepts.net> 2.2-3.redconcepts
+- Added symlinks to g++
+- Removed symlink removal in post
+
+* Thu Feb 20 2003 Samir M. Nassar <rpm@redconcepts.net> 2.2-2.redconcepts
+- Cleans symlinks if present to make upgrades easier
+
+* Thu Feb 20 2003 Samir M. Nassar <rpm@redconcepts.net> 2.2-1.redconcepts
+- Upgraded to ccache 2.2
+
+* Tue Feb 04 2003 Samir M. Nassar <rpm@redconcepts.net> 2.1.1-4.redconcepts
+- Using %post to create the soft symlinks
+- Using %postun to remove the soft symlinks
+- Thanks to Che <che666@uni.de> for the help
+- Packaged as user
+
+* Sun Jan 19 2003 Samir M. Nassar <rpm@redconcepts.net> 2.1.1-3.redconcepts
+- make a soft symlink between ccache and gcc
+- make a soft symlink between ccache and cc
+
+* Thu Jan 16 2003 Samir M. Nassar <rpm@redconcepts.net> 2.1.1-2.redconcepts
+- Normalized spec file.
+
+* Wed Jan 15 2003 Samir M, Nassar <rpm@redconcepts.net> 2.1.1-1.redconcepts
+- Using ccache 2.2.1 sources
+- Changed release to redconcepts for consistency
+
+* Wed Oct 22 2002 Samir M. Nassar <rpm.redconcepts.net> 1.9-1.rcn
+- Initial RedConcepts.NET (rcn) build for Red Hat Linux 8.0
diff --git a/sources b/sources
index e69de29..4245f52 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+5e4afc0b170bf282d1813aeaf3d577d2  ccache-2.3.tar.gz

From 604d757b7cdc13f631b7160d188e91fb777dab95 Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 04:07:49 +0000
Subject: [PATCH 002/153] auto-import ccache-2.3-0.fdr.5.rh90 from
 ccache-2.3-0.fdr.5.rh90.src.rpm

---
 ccache.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index bf70d87..001ce94 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,7 @@
 
 Name:		ccache
 Version:	2.3
-Release:	0.fdr.5.rh80
+Release:	0.fdr.5.rh90
 Epoch:          0
 Summary:	Compiler cache
 

From f328ec967793df2bcd6b84f7cca3486de3c1da9b Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 04:07:58 +0000
Subject: [PATCH 003/153] auto-import ccache-2.3-0.fdr.5.1 from
 ccache-2.3-0.fdr.5.1.src.rpm

---
 ccache.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 001ce94..d9b7ab0 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,7 @@
 
 Name:		ccache
 Version:	2.3
-Release:	0.fdr.5.rh90
+Release:	0.fdr.5.1
 Epoch:          0
 Summary:	Compiler cache
 

From 0336c55699577fe87b88af7c500f05094f35a20e Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 04:08:07 +0000
Subject: [PATCH 004/153] auto-import ccache-2.3-0.fdr.5.2 from
 ccache-2.3-0.fdr.5.2.src.rpm

---
 ccache.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index d9b7ab0..3768bbd 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,7 @@
 
 Name:		ccache
 Version:	2.3
-Release:	0.fdr.5.1
+Release:	0.fdr.5.2
 Epoch:          0
 Summary:	Compiler cache
 

From a76ce24a3ba457aa6f486d4941468da33d10fcb5 Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 04:08:19 +0000
Subject: [PATCH 005/153] auto-import changelog data from
 ccache-2.4-0.fdr.1.2.src.rpm 2.4-0.fdr.1 - Update to 2.4. - Add symlinking
 support for gcc4 and gcc4-c++. - Move the ccache executable to %{_bindir}. -
 Include more docs.

---
 .cvsignore              |  2 +-
 ccache-html-links.patch | 33 +++++++++++++++++++++++++++
 ccache.spec             | 49 +++++++++++++++++++++--------------------
 sources                 |  2 +-
 4 files changed, 60 insertions(+), 26 deletions(-)
 create mode 100644 ccache-html-links.patch

diff --git a/.cvsignore b/.cvsignore
index e93dfed..0741eb7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ccache-2.3.tar.gz
+ccache-2.4.tar.gz
diff --git a/ccache-html-links.patch b/ccache-html-links.patch
new file mode 100644
index 0000000..dadf1b6
--- /dev/null
+++ b/ccache-html-links.patch
@@ -0,0 +1,33 @@
+--- web/index.html~	2004-09-13 13:38:30.000000000 +0300
++++ web/index.html	2004-09-26 01:04:38.458008118 +0300
+@@ -29,10 +29,10 @@
+ <li>fixed handling of HOME environment variable
+ </ul>
+ 
+-See the <a href="/ccache/ccache-man.html">manual page</a> for details
++See the <a href="ccache-man.html">manual page</a> for details
+ on the new options.<p>
+ 
+-You can get this release from the <a href="/ftp/ccache/">download directory</a> 
++You can get this release from the <a href="http://ccache.samba.org/ftp/ccache/">download directory</a> 
+ 
+ <p>NOTE! This release changes the hash input slighly, so you will
+ probably find that you will not get any hits against your existing
+@@ -87,7 +87,7 @@
+ 
+ <h2>Documentation</h2>
+ 
+-See the <a href="/ccache/ccache-man.html">manual page</a>
++See the <a href="ccache-man.html">manual page</a>
+ 
+ 
+ <h2>Performance</h2>
+@@ -116,7 +116,7 @@
+ <h2>Download</h2>
+ 
+ You can download the latest release from the <a
+-href="/ftp/ccache/">download directory</a>.<p>
++href="http://ccache.samba.org/ftp/ccache/">download directory</a>.<p>
+ 
+ For the bleeding edge, you can fetch ccache via CVS or
+ rsync. To fetch via cvs use the following command:
diff --git a/ccache.spec b/ccache.spec
index 3768bbd..72ca3ac 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -1,16 +1,17 @@
-%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 kgcc egcs egcs++ gcc3 g++3 gcc-ssa g++-ssa gcc34 c++34 g++34 gcc33 c++33 g++33
-%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, gcc32, gcc3, gcc3-c++, kgcc, compat-egcs, compat-egcs-c++, egcs, egcs-c++, gcc-ssa, gcc-c++-ssa, gcc34, gcc34-c++
+%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 kgcc egcs egcs++ gcc3 g++3 gcc-ssa g++-ssa gcc34 c++34 g++34 gcc33 c++33 g++33 gcc4 g++4 c++4
+%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, gcc32, gcc3, gcc3-c++, kgcc, compat-egcs, compat-egcs-c++, egcs, egcs-c++, gcc-ssa, gcc-c++-ssa, gcc34, gcc34-c++, gcc4, gcc4-c++
 
 Name:		ccache
-Version:	2.3
-Release:	0.fdr.5.2
+Version:	2.4
+Release:	0.fdr.1.2
 Epoch:          0
 Summary:	Compiler cache
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://ccache.samba.org/
-Source0:	http://ccache.samba.org/ftp/ccache/ccache-2.3.tar.gz
+Source0:	http://ccache.samba.org/ftp/ccache/ccache-2.4.tar.gz
+Patch0:         %{name}-html-links.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -22,6 +23,7 @@ a 5 to 10 times speedup in common compilations.
 
 %prep
 %setup -q
+%patch0 -p0
 
 
 %build
@@ -40,17 +42,15 @@ EOF
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -dm 755 $RPM_BUILD_ROOT{%{_libdir}/ccache/bin,%{_mandir}/man1}
-install -pm 755 ccache $RPM_BUILD_ROOT%{_libdir}/ccache/bin
-install -pm 644 ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1
+rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
+make install DESTDIR=$RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 755 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-> %{name}-%{version}.compilers
+install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache/bin
 for name in %{compilers} ; do
-  for comp in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    ln -s ccache $RPM_BUILD_ROOT%{_libdir}/ccache/bin/$comp
-    echo "%ghost %{_libdir}/ccache/bin/$comp" >> %{name}-%{version}.compilers
+  for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
+    ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/bin/$c
+    echo "%ghost %{_libdir}/ccache/bin/$c" >> %{name}-%{version}.compilers
   done
 done
 
@@ -61,35 +61,36 @@ rm -fr $RPM_BUILD_ROOT
 
 %triggerin -- %{pkgs}
 for name in %{compilers} ; do
-  for comp in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    if [ -x %{_bindir}/$comp ] ; then
-      ln -sf ccache %{_libdir}/ccache/bin/$comp
-    else
-      # This block is to support upgrading from < 2.3-0.fdr.1.
-      rm -f %{_libdir}/ccache/bin/$comp
-    fi
+  for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
+    [ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/bin/$c
   done
 done
 
 %triggerpostun -- %{pkgs}
 for name in %{compilers} ; do
-  for comp in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    [ -x %{_bindir}/$comp ] || rm -f %{_libdir}/ccache/bin/$comp
+  for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
+    [ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/bin/$c
   done
 done
 
 
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
-%doc README
+%doc COPYING README web/*.html
 %config %{_sysconfdir}/profile.d/%{name}.*sh
+%{_bindir}/ccache
 %dir %{_libdir}/ccache
 %dir %{_libdir}/ccache/bin
-%{_libdir}/ccache/bin/ccache
 %{_mandir}/man1/ccache.1*
 
 
 %changelog
+* Sun Sep 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4-0.fdr.1
+- Update to 2.4.
+- Add symlinking support for gcc4 and gcc4-c++.
+- Move the ccache executable to %%{_bindir}.
+- Include more docs.
+
 * Fri Jun 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.5
 - Add support for gcc33 and g++33.
 
diff --git a/sources b/sources
index 4245f52..7c7b031 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e4afc0b170bf282d1813aeaf3d577d2  ccache-2.3.tar.gz
+73c1ed1e767c1752dd0f548ec1e66ce7  ccache-2.4.tar.gz

From cb5b39d5677dd6cdd581012eb49149a645c8203a Mon Sep 17 00:00:00 2001
From: gafton <gafton@fedoraproject.org>
Date: Wed, 24 Nov 2004 03:10:00 +0000
Subject: [PATCH 006/153] Fix braindead import typo artifact in the default
 generated Makefile. Oh     well, the fedora extras commits list needs a
 workout anyway...

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ee92723..006abfe 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for source rpm: ccache
-# $Id$
+# $Id: Makefile,v 1.1 2004/11/08 04:07:41 cvsextras Exp $
 NAME := ccache
 SPECFILE = $(firstword $(wildcard *.spec))
 
@@ -12,7 +12,7 @@ MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
 ifeq ($(MAKEFILE_COMMON),)
 # attept a checkout
 define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
 endef
 
 MAKEFILE_COMMON := $(shell $(checkout-makefile-common))

From 622f6e865e5e182a12153fb030d4b22898d34653 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Fri, 10 Dec 2004 22:03:01 +0000
Subject: [PATCH 007/153] Bump release, strip off fedora.us prefix and dist
 tag.

---
 ccache.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 72ca3ac..9460230 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,7 @@
 
 Name:		ccache
 Version:	2.4
-Release:	0.fdr.1.2
+Release:	1
 Epoch:          0
 Summary:	Compiler cache
 

From 3bd3eaf03c27fdf957d78eaed53276624ebd421b Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Thu, 3 Mar 2005 20:08:36 +0000
Subject: [PATCH 008/153] Mass letter "c" update, one or more apply : - Drop
 epoch: 0 - Remove %{epoch} requirements in sub-packages - Remove trailing
 white spaces - Keep consistent between spaces and tabs

---
 ccache.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 9460230..91fb3ab 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -4,14 +4,13 @@
 Name:		ccache
 Version:	2.4
 Release:	1
-Epoch:          0
 Summary:	Compiler cache
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://ccache.samba.org/
 Source0:	http://ccache.samba.org/ftp/ccache/ccache-2.4.tar.gz
-Patch0:         %{name}-html-links.patch
+Patch0:		%{name}-html-links.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description

From 13a5f49232593a7582f429528536664af93e48c7 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Wed, 6 Apr 2005 22:11:33 +0000
Subject: [PATCH 009/153] mass release bump for packages not rebuilt after
 FC-3-split

---
 ccache.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 91fb3ab..33bb942 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,8 @@
 
 Name:		ccache
 Version:	2.4
-Release:	1
+Release:	2
+
 Summary:	Compiler cache
 
 Group:		Development/Tools
@@ -84,6 +85,9 @@ done
 
 
 %changelog
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sun Sep 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4-0.fdr.1
 - Update to 2.4.
 - Add symlinking support for gcc4 and gcc4-c++.

From ad08d3a16a3f838a70e6ed38d953cdf4f8bbadef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 4 May 2005 19:21:00 +0000
Subject: [PATCH 010/153] Auto-symlink update for FC4.

---
 ccache.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 33bb942..eddfc17 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -1,16 +1,15 @@
-%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 kgcc egcs egcs++ gcc3 g++3 gcc-ssa g++-ssa gcc34 c++34 g++34 gcc33 c++33 g++33 gcc4 g++4 c++4
-%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, gcc32, gcc3, gcc3-c++, kgcc, compat-egcs, compat-egcs-c++, egcs, egcs-c++, gcc-ssa, gcc-c++-ssa, gcc34, gcc34-c++, gcc4, gcc4-c++
+%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34
+%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++
 
 Name:		ccache
 Version:	2.4
 Release:	2
-
-Summary:	Compiler cache
+Summary:	C/C++ compiler cache
 
 Group:		Development/Tools
 License:	GPL
 URL:		http://ccache.samba.org/
-Source0:	http://ccache.samba.org/ftp/ccache/ccache-2.4.tar.gz
+Source0:	http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
 Patch0:		%{name}-html-links.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -85,6 +84,10 @@ done
 
 
 %changelog
+* Sun May  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-2
+- Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
+  bunch of no longer relevant compilers.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 

From ed2bc97e604c351e7e2d31dbce71f0889924791e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 4 May 2005 19:53:51 +0000
Subject: [PATCH 011/153] ...

---
 ccache.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index eddfc17..f6fe961 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,7 @@
 
 Name:		ccache
 Version:	2.4
-Release:	2
+Release:	3
 Summary:	C/C++ compiler cache
 
 Group:		Development/Tools
@@ -84,11 +84,11 @@ done
 
 
 %changelog
-* Sun May  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-2
+* Sun May  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-3
 - Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
   bunch of no longer relevant compilers.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
 - rebuilt
 
 * Sun Sep 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4-0.fdr.1

From af53f9963a6723c3b30c8027cfd0eba5772ca615 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 18 Feb 2006 11:43:08 +0000
Subject: [PATCH 012/153] - Drop "bin" from compiler symlink path. - Make
 profile.d snippets non-executable (#35714).

---
 ccache.spec | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index f6fe961..daf3152 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,7 @@
 
 Name:		ccache
 Version:	2.4
-Release:	3
+Release:	4%{?dist}
 Summary:	C/C++ compiler cache
 
 Group:		Development/Tools
@@ -14,9 +14,9 @@ Patch0:		%{name}-html-links.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-ccache is a compiler cache. It acts as a caching pre-processor to
+ccache is a compiler cache.  It acts as a caching pre-processor to
 C/C++ compilers, using the -E compiler switch and a hash to detect
-when a compilation can be satisfied from cache. This often results in
+when a compilation can be satisfied from cache.  This often results in
 a 5 to 10 times speedup in common compilations.
 
 
@@ -29,13 +29,13 @@ a 5 to 10 times speedup in common compilations.
 %configure
 %{__make} %{?_smp_mflags}
 cat <<EOF > %{name}.sh
-if ! echo "\$PATH" | grep -q %{_libdir}/ccache/bin ; then
-    PATH="%{_libdir}/ccache/bin:\$PATH"
+if ! echo "\$PATH" | grep -q %{_libdir}/ccache ; then
+    PATH="%{_libdir}/ccache:\$PATH"
 fi
 EOF
 cat <<EOF > %{name}.csh
-if ( "\$path" !~ *%{_libdir}/ccache/bin* ) then
-    set path = ( %{_libdir}/ccache/bin \$path )
+if ( "\$path" !~ *%{_libdir}/ccache* ) then
+    set path = ( %{_libdir}/ccache \$path )
 endif
 EOF
 
@@ -44,12 +44,12 @@ EOF
 rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
 make install DESTDIR=$RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -pm 755 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache/bin
+install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/bin/$c
-    echo "%ghost %{_libdir}/ccache/bin/$c" >> %{name}-%{version}.compilers
+    ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/$c
+    echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
   done
 done
 
@@ -61,14 +61,14 @@ rm -fr $RPM_BUILD_ROOT
 %triggerin -- %{pkgs}
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    [ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/bin/$c
+    [ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/$c
   done
 done
 
 %triggerpostun -- %{pkgs}
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    [ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/bin/$c
+    [ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/$c
   done
 done
 
@@ -79,11 +79,14 @@ done
 %config %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache
-%dir %{_libdir}/ccache/bin
 %{_mandir}/man1/ccache.1*
 
 
 %changelog
+* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-4
+- Drop "bin" from compiler symlink path.
+- Make profile.d snippets non-executable (#35714).
+
 * Sun May  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-3
 - Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
   bunch of no longer relevant compilers.

From 36b4029e05e8b0f024396b701dace1f32cbb9a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 16 May 2006 19:09:50 +0000
Subject: [PATCH 013/153] - Add auto-symlink support for g++-libstdc++-so_7.

---
 ccache.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index daf3152..b0b431d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -1,9 +1,9 @@
-%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34
-%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++
+%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7
+%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, libstdc++so7-devel
 
 Name:		ccache
 Version:	2.4
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	C/C++ compiler cache
 
 Group:		Development/Tools
@@ -83,6 +83,9 @@ done
 
 
 %changelog
+* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-5
+- Add auto-symlink support for g++-libstdc++-so_7.
+
 * Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-4
 - Drop "bin" from compiler symlink path.
 - Make profile.d snippets non-executable (#35714).

From 8e3347f612bd6337b70c133af7e76630d0c653e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 27 Aug 2006 20:17:53 +0000
Subject: [PATCH 014/153] 
 http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

---
 needs.rebuild | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 needs.rebuild

diff --git a/needs.rebuild b/needs.rebuild
new file mode 100644
index 0000000..815fd29
--- /dev/null
+++ b/needs.rebuild
@@ -0,0 +1 @@
+http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

From 07282d918acac811e0079d1e923f862ae8cd20c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 29 Aug 2006 19:56:32 +0000
Subject: [PATCH 015/153] - Add auto-symlink support for compat-gcc-34(-c++). -
 Untabify, escape macros in changelog.

---
 ccache.spec | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index b0b431d..2f9e575 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -1,17 +1,17 @@
 %define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7
-%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, libstdc++so7-devel
+%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, libstdc++so7-devel
 
-Name:		ccache
-Version:	2.4
-Release:	5%{?dist}
-Summary:	C/C++ compiler cache
+Name:           ccache
+Version:        2.4
+Release:        6%{?dist}
+Summary:        C/C++ compiler cache
 
-Group:		Development/Tools
-License:	GPL
-URL:		http://ccache.samba.org/
-Source0:	http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
-Patch0:		%{name}-html-links.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:          Development/Tools
+License:        GPL
+URL:            http://ccache.samba.org/
+Source0:        http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
+Patch0:         %{name}-html-links.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 ccache is a compiler cache.  It acts as a caching pre-processor to
@@ -78,11 +78,15 @@ done
 %doc COPYING README web/*.html
 %config %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
-%dir %{_libdir}/ccache
+%dir %{_libdir}/ccache/
 %{_mandir}/man1/ccache.1*
 
 
 %changelog
+* Wed Aug  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-6
+- Add auto-symlink support for compat-gcc-34(-c++).
+- Untabify, escape macros in changelog.
+
 * Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-5
 - Add auto-symlink support for g++-libstdc++-so_7.
 
@@ -138,7 +142,7 @@ done
 - Add Requires: gcc, gcc-c++ (minimal expectation of compilers)
 
 * Fri Mar 28 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.3
-- No longer use %ghost, symlinks always exist
+- No longer use %%ghost, symlinks always exist
 
 * Thu Mar 27 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.2
 - Move symlinks to /usr/lib/ccache/bin
@@ -148,7 +152,7 @@ done
 * Thu Mar 27 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.1
 - Move symlinks to /bin since it seems to be at the beginning of PATH of all users
     before /usr/bin, the location of the real compiler.
-- Package symlinks rather than create and remove during %post and %postun
+- Package symlinks rather than create and remove during %%post and %%postun
 
 * Thu Feb 20 2003 Warren Togami <warren@togami.com> 2.2-4.fedora.1
 - Fedora
@@ -164,8 +168,8 @@ done
 - Upgraded to ccache 2.2
 
 * Tue Feb 04 2003 Samir M. Nassar <rpm@redconcepts.net> 2.1.1-4.redconcepts
-- Using %post to create the soft symlinks
-- Using %postun to remove the soft symlinks
+- Using %%post to create the soft symlinks
+- Using %%postun to remove the soft symlinks
 - Thanks to Che <che666@uni.de> for the help
 - Packaged as user
 

From fb8dd0788d7bd89f2073a3aa87d101eabe410de2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 30 Aug 2006 06:43:13 +0000
Subject: [PATCH 016/153] Rebuilt and pushed.

---
 needs.rebuild | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 needs.rebuild

diff --git a/needs.rebuild b/needs.rebuild
deleted file mode 100644
index 815fd29..0000000
--- a/needs.rebuild
+++ /dev/null
@@ -1 +0,0 @@
-http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

From 859f2b73e75fb4781779fda425f1bcc20c3a1d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Fri, 10 Nov 2006 20:10:10 +0000
Subject: [PATCH 017/153] - Require coreutils for triggers (#215030).

---
 ccache.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 2f9e575..94c6aba 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -13,6 +13,9 @@ Source0:        http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
 Patch0:         %{name}-html-links.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Requires(triggerin): coreutils
+Requires(triggerpostun): coreutils
+
 %description
 ccache is a compiler cache.  It acts as a caching pre-processor to
 C/C++ compilers, using the -E compiler switch and a hash to detect
@@ -83,6 +86,9 @@ done
 
 
 %changelog
+* Fri Nov 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-7
+- Require coreutils for triggers (#215030).
+
 * Wed Aug  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-6
 - Add auto-symlink support for compat-gcc-34(-c++).
 - Untabify, escape macros in changelog.

From 8e1b4ffd4210e9cd03f3b5f0077ecad27becb65d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Thu, 15 Mar 2007 10:40:54 +0000
Subject: [PATCH 018/153] - Bypass cache with --coverage, -fprofile-arcs and
 -ftest-coverage     (upstream CVS and Matt Fago, #231462).

---
 ccache-2.4-coverage-231462.patch | 12 ++++++++++++
 ccache.spec                      |  8 +++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 ccache-2.4-coverage-231462.patch

diff --git a/ccache-2.4-coverage-231462.patch b/ccache-2.4-coverage-231462.patch
new file mode 100644
index 0000000..27d063b
--- /dev/null
+++ b/ccache-2.4-coverage-231462.patch
@@ -0,0 +1,12 @@
+--- ccache.c~	2004-09-13 13:38:30.000000000 +0300
++++ ccache.c	2007-03-15 12:31:41.000000000 +0200
+@@ -640,6 +640,9 @@
+ 
+ 		/* these are too hard */
+ 		if (strcmp(argv[i], "-fbranch-probabilities")==0 ||
++		    strcmp(argv[i], "--coverage") == 0 ||
++		    strcmp(argv[i], "-fprofile-arcs") == 0 ||
++		    strcmp(argv[i], "-ftest-coverage") == 0 ||
+ 		    strcmp(argv[i], "-M") == 0 ||
+ 		    strcmp(argv[i], "-MM") == 0 ||
+ 		    strcmp(argv[i], "-x") == 0) {
diff --git a/ccache.spec b/ccache.spec
index 94c6aba..099724d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,7 +3,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -11,6 +11,7 @@ License:        GPL
 URL:            http://ccache.samba.org/
 Source0:        http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
 Patch0:         %{name}-html-links.patch
+Patch1:         %{name}-2.4-coverage-231462.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(triggerin): coreutils
@@ -26,6 +27,7 @@ a 5 to 10 times speedup in common compilations.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -86,6 +88,10 @@ done
 
 
 %changelog
+* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-8
+- Bypass cache with --coverage, -fprofile-arcs and -ftest-coverage
+  (upstream CVS and Matt Fago, #231462).
+
 * Fri Nov 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-7
 - Require coreutils for triggers (#215030).
 

From ecf88276da91384b6b4e66e586df7629d80fc402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 29 Jul 2007 22:38:31 +0000
Subject: [PATCH 019/153] - Use shared cache dir for users in the ccache group
 by default (#247760,     based on Andy Shevchenko's work). - Fix outdated
 hardlink info in cache sharing docs. - Add auto-symlink support for
 avr-gcc(-c++) and arm-gp2x-linux-gcc(-c++). - Make triggers always exit with
 a zero exit status.

---
 ccache-2.4-hardlink-doc.patch | 48 +++++++++++++++++++++++++++++++++++
 ccache.csh.in                 | 16 ++++++++++++
 ccache.sh.in                  | 16 ++++++++++++
 ccache.spec                   | 41 ++++++++++++++++++++----------
 4 files changed, 107 insertions(+), 14 deletions(-)
 create mode 100644 ccache-2.4-hardlink-doc.patch
 create mode 100644 ccache.csh.in
 create mode 100644 ccache.sh.in

diff --git a/ccache-2.4-hardlink-doc.patch b/ccache-2.4-hardlink-doc.patch
new file mode 100644
index 0000000..bd9e25b
--- /dev/null
+++ b/ccache-2.4-hardlink-doc.patch
@@ -0,0 +1,48 @@
+Index: ccache.1
+===================================================================
+RCS file: /cvsroot/ccache/ccache.1,v
+retrieving revision 1.26
+diff -u -r1.26 ccache.1
+--- ccache.1	24 Nov 2005 21:10:08 -0000	1.26
++++ ccache.1	21 Jul 2007 21:03:32 -0000
+@@ -330,7 +330,7 @@
+ .IP o 
+ Use the same \fBCCACHE_DIR\fP environment variable setting
+ .IP o 
+-Set the \fBCCACHE_NOLINK\fP environment variable
++Unset the \fBCCACHE_HARDLINK\fP environment variable
+ .IP o 
+ Make sure everyone sets the CCACHE_UMASK environment variable
+ to 002, this ensures that cached files are accessible to everyone in
+Index: ccache.yo
+===================================================================
+RCS file: /cvsroot/ccache/ccache.yo,v
+retrieving revision 1.27
+diff -u -r1.27 ccache.yo
+--- ccache.yo	24 Nov 2005 21:54:09 -0000	1.27
++++ ccache.yo	21 Jul 2007 21:03:32 -0000
+@@ -289,7 +289,7 @@
+ 
+ itemize(
+   it() Use the same bf(CCACHE_DIR) environment variable setting
+-  it() Set the bf(CCACHE_NOLINK) environment variable
++  it() Unset the bf(CCACHE_HARDLINK) environment variable
+   it() Make sure everyone sets the CCACHE_UMASK environment variable
+   to 002, this ensures that cached files are accessible to everyone in
+   the group.
+Index: web/ccache-man.html
+===================================================================
+RCS file: /cvsroot/ccache/web/ccache-man.html,v
+retrieving revision 1.25
+diff -u -r1.25 ccache-man.html
+--- web/ccache-man.html	13 Sep 2004 10:38:17 -0000	1.25
++++ web/ccache-man.html	21 Jul 2007 21:03:32 -0000
+@@ -256,7 +256,7 @@
+ following conditions need to be met:
+ <p><ul>
+   <li > Use the same <strong>CCACHE_DIR</strong> environment variable setting
+-  <li > Set the <strong>CCACHE_NOLINK</strong> environment variable
++  <li > Unset the <strong>CCACHE_HARDLINK</strong> environment variable
+   <li > Make sure everyone sets the CCACHE_UMASK environment variable
+   to 002, this ensures that cached files are accessible to everyone in
+   the group.
diff --git a/ccache.csh.in b/ccache.csh.in
new file mode 100644
index 0000000..af6fa9e
--- /dev/null
+++ b/ccache.csh.in
@@ -0,0 +1,16 @@
+# Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
+# environment variable in their personal profile.
+
+if ( "$path" !~ *@LIBDIR@/ccache* ) then
+    set path = ( @LIBDIR@/ccache $path )
+endif
+
+# 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 ( ! $?CCACHE_DIR && -d @CACHEDIR@ && -w @CACHEDIR@ ) then
+    setenv CCACHE_DIR /var/cache/ccache
+    setenv CCACHE_UMASK 002
+    unsetenv CCACHE_HARDLINK
+endif
diff --git a/ccache.sh.in b/ccache.sh.in
new file mode 100644
index 0000000..d5cd116
--- /dev/null
+++ b/ccache.sh.in
@@ -0,0 +1,16 @@
+# 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
+
+# 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
+    export CCACHE_UMASK=002
+    unset CCACHE_HARDLINK
+fi
diff --git a/ccache.spec b/ccache.spec
index 099724d..bac3b8e 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -1,17 +1,20 @@
-%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7
-%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, libstdc++so7-devel
+%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++
+%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++
 
 Name:           ccache
 Version:        2.4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
 License:        GPL
 URL:            http://ccache.samba.org/
 Source0:        http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
+Source1:        %{name}.sh.in
+Source2:        %{name}.csh.in
 Patch0:         %{name}-html-links.patch
 Patch1:         %{name}-2.4-coverage-231462.patch
+Patch2:         %{name}-2.4-hardlink-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(triggerin): coreutils
@@ -28,21 +31,16 @@ a 5 to 10 times speedup in common compilations.
 %setup -q
 %patch0 -p0
 %patch1 -p0
+%patch2 -p0
+sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
+    %{SOURCE1} > %{name}.sh
+sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
+    %{SOURCE2} > %{name}.csh
 
 
 %build
 %configure
-%{__make} %{?_smp_mflags}
-cat <<EOF > %{name}.sh
-if ! echo "\$PATH" | grep -q %{_libdir}/ccache ; then
-    PATH="%{_libdir}/ccache:\$PATH"
-fi
-EOF
-cat <<EOF > %{name}.csh
-if ( "\$path" !~ *%{_libdir}/ccache* ) then
-    set path = ( %{_libdir}/ccache \$path )
-endif
-EOF
+make %{?_smp_mflags}
 
 
 %install
@@ -57,18 +55,24 @@ for name in %{compilers} ; do
     echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
   done
 done
+install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache
 
 
 %clean
 rm -fr $RPM_BUILD_ROOT
 
 
+%pre
+getent group ccache >/dev/null || groupadd -r ccache || :
+
+
 %triggerin -- %{pkgs}
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
     [ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/$c
   done
 done
+:
 
 %triggerpostun -- %{pkgs}
 for name in %{compilers} ; do
@@ -76,6 +80,7 @@ for name in %{compilers} ; do
     [ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/$c
   done
 done
+:
 
 
 %files -f %{name}-%{version}.compilers
@@ -84,10 +89,18 @@ done
 %config %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
+%attr(2770,root,ccache) %dir %{_var}/cache/ccache/
 %{_mandir}/man1/ccache.1*
 
 
 %changelog
+* Mon Jul 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-9
+- Use shared cache dir for users in the ccache group by default
+  (#247760, based on Andy Shevchenko's work).
+- Fix outdated hardlink info in cache sharing docs.
+- Add auto-symlink support for avr-gcc(-c++) and arm-gp2x-linux-gcc(-c++).
+- Make triggers always exit with a zero exit status.
+
 * Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-8
 - Bypass cache with --coverage, -fprofile-arcs and -ftest-coverage
   (upstream CVS and Matt Fago, #231462).

From ea9104370c7d9a2adb5c389fa7159a694cb885c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Thu, 16 Aug 2007 09:09:14 +0000
Subject: [PATCH 020/153] - License: GPLv2+

---
 ccache.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index bac3b8e..98ba8d8 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -3,11 +3,11 @@
 
 Name:           ccache
 Version:        2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
-License:        GPL
+License:        GPLv2+
 URL:            http://ccache.samba.org/
 Source0:        http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
 Source1:        %{name}.sh.in
@@ -94,6 +94,9 @@ done
 
 
 %changelog
+* Wed Aug 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
+- License: GPLv2+
+
 * Mon Jul 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-9
 - Use shared cache dir for users in the ccache group by default
   (#247760, based on Andy Shevchenko's work).

From 36637c85c8da2c1ad440c67c6dddc4663183ee71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 19 Aug 2007 17:05:06 +0000
Subject: [PATCH 021/153] - Make compiler symlinks relative. - Make profile.d
 scripts noreplace.

---
 ccache.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 98ba8d8..f0fbf97 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -1,6 +1,9 @@
 %define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++
 %define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++
 
+%define abs2rel() perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' %1 %2
+%{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
+
 Name:           ccache
 Version:        2.4
 Release:        10%{?dist}
@@ -17,6 +20,7 @@ Patch1:         %{name}-2.4-coverage-231462.patch
 Patch2:         %{name}-2.4-hardlink-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(File::Spec)
 Requires(triggerin): coreutils
 Requires(triggerpostun): coreutils
 
@@ -51,7 +55,7 @@ install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/$c
+    ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$c
     echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
   done
 done
@@ -69,7 +73,7 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 %triggerin -- %{pkgs}
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    [ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/$c
+    [ ! -x %{_bindir}/$c ] || ln -sf %{relccache} %{_libdir}/ccache/$c
   done
 done
 :
@@ -86,7 +90,7 @@ done
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
 %doc COPYING README web/*.html
-%config %{_sysconfdir}/profile.d/%{name}.*sh
+%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
 %attr(2770,root,ccache) %dir %{_var}/cache/ccache/
@@ -94,8 +98,10 @@ done
 
 
 %changelog
-* Wed Aug 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
+* Sun Aug 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
 - License: GPLv2+
+- Make compiler symlinks relative.
+- Make profile.d scripts noreplace.
 
 * Mon Jul 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-9
 - Use shared cache dir for users in the ccache group by default

From 0c996b9a28b660b2ca6ea42770cb8057d3e6eb9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 22 Aug 2007 05:30:17 +0000
Subject: [PATCH 022/153] - Fix URL to upstream tarball.

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index f0fbf97..3d138a7 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@ Summary:        C/C++ compiler cache
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://ccache.samba.org/
-Source0:        http://ccache.samba.org/ftp/ccache/%{name}-%{version}.tar.gz
+Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.gz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 Patch0:         %{name}-html-links.patch
@@ -98,6 +98,9 @@ done
 
 
 %changelog
+* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi>
+- Fix URL to upstream tarball.
+
 * Sun Aug 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
 - License: GPLv2+
 - Make compiler symlinks relative.

From 5dc57d7dbfc87b7a2dc59054c6f37888c7f0680c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 2 Oct 2007 16:50:35 +0000
Subject: [PATCH 023/153] - Apply upstream fix for problems when $HOME is not
 set (#315441).

---
 ccache-2.4-noHOME-315441.patch | 45 ++++++++++++++++++++++++++++++++++
 ccache.spec                    |  7 +++++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 ccache-2.4-noHOME-315441.patch

diff --git a/ccache-2.4-noHOME-315441.patch b/ccache-2.4-noHOME-315441.patch
new file mode 100644
index 0000000..03b04f2
--- /dev/null
+++ b/ccache-2.4-noHOME-315441.patch
@@ -0,0 +1,45 @@
+Index: config.h.in
+===================================================================
+RCS file: /cvsroot/ccache/config.h.in,v
+retrieving revision 1.5
+retrieving revision 1.7
+diff -u -r1.5 -r1.7
+--- config.h.in	7 Mar 2003 12:09:19 -0000	1.5
++++ config.h.in	25 Jul 2005 07:05:46 -0000	1.7
+@@ -19,6 +19,9 @@
+ /* Define to 1 if you have the `gethostname' function. */
+ #undef HAVE_GETHOSTNAME
+ 
++/* Define to 1 if you have the `getpwuid' function. */
++#undef HAVE_GETPWUID
++
+ /* Define to 1 if you have the <inttypes.h> header file. */
+ #undef HAVE_INTTYPES_H
+ 
+@@ -31,6 +34,9 @@
+ /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
+ #undef HAVE_NDIR_H
+ 
++/* Define to 1 if you have the <pwd.h> header file. */
++#undef HAVE_PWD_H
++
+ /* Define to 1 if you have the `realpath' function. */
+ #undef HAVE_REALPATH
+ 
+Index: util.c
+===================================================================
+RCS file: /cvsroot/ccache/util.c,v
+retrieving revision 1.34
+retrieving revision 1.37
+diff -u -r1.34 -r1.37
+--- util.c	6 Sep 2004 12:59:12 -0000	1.34
++++ util.c	17 Jul 2006 03:41:12 -0000	1.37
+@@ -448,7 +444,7 @@
+ 		}
+ 	}
+ #endif
+-	fatal("Unable to determine home directory");
++	fprintf(stderr, "ccache: Unable to determine home directory");
+ 	return NULL;
+ }
+ 
diff --git a/ccache.spec b/ccache.spec
index 3d138a7..bc2a840 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -18,6 +18,7 @@ Source2:        %{name}.csh.in
 Patch0:         %{name}-html-links.patch
 Patch1:         %{name}-2.4-coverage-231462.patch
 Patch2:         %{name}-2.4-hardlink-doc.patch
+Patch3:         %{name}-2.4-noHOME-315441.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -36,6 +37,7 @@ a 5 to 10 times speedup in common compilations.
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -98,6 +100,9 @@ done
 
 
 %changelog
+* Tue Oct  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-11
+- Apply upstream fix for problems when $HOME is not set (#315441).
+
 * Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Fix URL to upstream tarball.
 

From 7ea7ef627bd075db51c6e52807303e830acbb5da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 9 Feb 2008 21:05:57 +0000
Subject: [PATCH 024/153] - Rebuild.

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index bc2a840..55d8c07 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -100,6 +100,9 @@ done
 
 
 %changelog
+* Sat Feb  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-12
+- Rebuild.
+
 * Tue Oct  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-11
 - Apply upstream fix for problems when $HOME is not set (#315441).
 

From 6ccf70a21cad7af15e47a37113c129a2e33e3c3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 19 Mar 2008 20:41:35 +0000
Subject: [PATCH 025/153] - Apply patch to fix path to saved dependency files
 (#438201).

---
 ccache-2.4-md.patch | 78 +++++++++++++++++++++++++++++++++++++++++++++
 ccache.spec         |  7 +++-
 2 files changed, 84 insertions(+), 1 deletion(-)
 create mode 100644 ccache-2.4-md.patch

diff --git a/ccache-2.4-md.patch b/ccache-2.4-md.patch
new file mode 100644
index 0000000..3ee5941
--- /dev/null
+++ b/ccache-2.4-md.patch
@@ -0,0 +1,78 @@
+diff -rup ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
+--- ccache-2.4.orig/ccache.c	Mon Sep 13 11:38:30 2004
++++ ccache-2.4/ccache.c	Thu Jun 21 22:17:32 2007
+@@ -627,6 +627,13 @@ static void process_args(int argc, char 
+ 	int found_S_opt = 0;
+ 	struct stat st;
+ 	char *e;
++	/* is gcc being asked to output dependencies? */
++	int generating_dependencies = 0;
++	/* is the dependency makefile name overridden with -MF? */
++	int dependency_filename_specified = 0;
++	/* is the dependency makefile target name specified with -MQ or -MF? */
++	int dependency_target_specified = 0;
++
+ 
+ 	stripped_args = args_init(0, NULL);
+ 
+@@ -702,6 +709,18 @@ static void process_args(int argc, char 
+ 			continue;
+ 		}
+ 
++		/* These options require special handling, because they
++		   behave differently with gcc -E, when the output
++		   file is not specified. */
++
++		if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) {
++			generating_dependencies = 1;
++		} else if (strcmp(argv[i], "-MF") == 0) {
++			dependency_filename_specified = 1;
++		} else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) {
++			dependency_target_specified = 1;
++		}
++
+ 		/* options that take an argument */
+ 		{
+ 			const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",
+@@ -812,6 +831,41 @@ static void process_args(int argc, char 
+ 		}
+ 		p[1] = found_S_opt ? 's' : 'o';
+ 		p[2] = 0;
++	}
++
++	/* If dependencies are generated, configure the preprocessor */
++
++	if (generating_dependencies && output_file) {
++		if (!dependency_filename_specified) {
++			char *default_depfile_name = x_strdup(output_file);
++			char *p = strrchr(default_depfile_name, '.');
++
++			if (p) {
++				if (strlen(p) < 2) {
++					stats_update(STATS_ARGS);
++					failed();
++					return;
++				}
++				*p = 0;
++			}
++			else  {
++				int len = p - default_depfile_name;
++				
++				p = x_malloc(len + 3);
++				strncpy(default_depfile_name, p, len - 1);
++				free(default_depfile_name);
++				default_depfile_name = p;
++			}
++
++			strcat(default_depfile_name, ".d");
++			args_add(stripped_args, "-MF");
++			args_add(stripped_args, default_depfile_name);
++		}
++
++		if (!dependency_target_specified) {
++			args_add(stripped_args, "-MT");
++			args_add(stripped_args, output_file);
++		}
+ 	}
+ 
+ 	/* cope with -o /dev/null */
diff --git a/ccache.spec b/ccache.spec
index 55d8c07..2cb2783 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -19,6 +19,7 @@ Patch0:         %{name}-html-links.patch
 Patch1:         %{name}-2.4-coverage-231462.patch
 Patch2:         %{name}-2.4-hardlink-doc.patch
 Patch3:         %{name}-2.4-noHOME-315441.patch
+Patch4:         http://darkircop.org/ccache/ccache-2.4-md.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -38,6 +39,7 @@ a 5 to 10 times speedup in common compilations.
 %patch1 -p0
 %patch2 -p0
 %patch3 -p0
+%patch4 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -100,6 +102,9 @@ done
 
 
 %changelog
+* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-13
+- Apply patch to fix path to saved dependency files (#438201).
+
 * Sat Feb  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-12
 - Rebuild.
 

From 1628c789bbe63a9080513226a69c9216289de4f7 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Tue, 24 Feb 2009 06:39:52 +0000
Subject: [PATCH 026/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 2cb2783..4a13b33 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -102,6 +102,9 @@ done
 
 
 %changelog
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-13
 - Apply patch to fix path to saved dependency files (#438201).
 

From 71706d4261abb1b05b6493c19976c66fbca879af Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Fri, 24 Jul 2009 18:41:35 +0000
Subject: [PATCH 027/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 4a13b33..a6b64a0 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -102,6 +102,9 @@ done
 
 
 %changelog
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

From cce51f8845d59ad905b82e8afc23933416dd28eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Mon, 10 Aug 2009 17:43:51 +0000
Subject: [PATCH 028/153] - Switch #438201 patch URL to Debian patch tracking
 (original is MIA).

---
 ccache-2.4-md.patch => 06_md.diff | 27 ++++++++++---------
 ccache.spec                       | 45 ++++++++++++++++---------------
 2 files changed, 39 insertions(+), 33 deletions(-)
 rename ccache-2.4-md.patch => 06_md.diff (80%)

diff --git a/ccache-2.4-md.patch b/06_md.diff
similarity index 80%
rename from ccache-2.4-md.patch
rename to 06_md.diff
index 3ee5941..75d82a2 100644
--- a/ccache-2.4-md.patch
+++ b/06_md.diff
@@ -1,7 +1,9 @@
-diff -rup ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
---- ccache-2.4.orig/ccache.c	Mon Sep 13 11:38:30 2004
-+++ ccache-2.4/ccache.c	Thu Jun 21 22:17:32 2007
-@@ -627,6 +627,13 @@ static void process_args(int argc, char 
+
+diff --git a/ccache.c b/ccache.c
+index 64c979b..843929f 100644
+--- a/ccache.c
++++ b/ccache.c
+@@ -647,6 +647,13 @@ static void process_args(int argc, char **argv)
  	int found_S_opt = 0;
  	struct stat st;
  	char *e;
@@ -15,7 +17,7 @@ diff -rup ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
  
  	stripped_args = args_init(0, NULL);
  
-@@ -702,6 +709,18 @@ static void process_args(int argc, char 
+@@ -725,6 +732,18 @@ static void process_args(int argc, char **argv)
  			continue;
  		}
  
@@ -34,12 +36,10 @@ diff -rup ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
  		/* options that take an argument */
  		{
  			const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",
-@@ -812,6 +831,41 @@ static void process_args(int argc, char 
- 		}
- 		p[1] = found_S_opt ? 's' : 'o';
+@@ -837,6 +856,41 @@ static void process_args(int argc, char **argv)
  		p[2] = 0;
-+	}
-+
+ 	}
+ 
 +	/* If dependencies are generated, configure the preprocessor */
 +
 +	if (generating_dependencies && output_file) {
@@ -73,6 +73,9 @@ diff -rup ccache-2.4.orig/ccache.c ccache-2.4/ccache.c
 +			args_add(stripped_args, "-MT");
 +			args_add(stripped_args, output_file);
 +		}
- 	}
- 
++	}
++
  	/* cope with -o /dev/null */
+ 	if (strcmp(output_file,"/dev/null") != 0 && stat(output_file, &st) == 0 && !S_ISREG(st.st_mode)) {
+ 		cc_log("Not a regular file %s\n", output_file);
+
diff --git a/ccache.spec b/ccache.spec
index a6b64a0..60711af 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        2.4
-Release:        15%{?dist}
+Release:        16%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -19,7 +19,7 @@ Patch0:         %{name}-html-links.patch
 Patch1:         %{name}-2.4-coverage-231462.patch
 Patch2:         %{name}-2.4-hardlink-doc.patch
 Patch3:         %{name}-2.4-noHOME-315441.patch
-Patch4:         http://darkircop.org/ccache/ccache-2.4-md.patch
+Patch4:         http://patch-tracking.debian.net/patch/series/dl/ccache/2.4-17/06_md.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -102,86 +102,89 @@ done
 
 
 %changelog
+* Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 2.4-16
+- Switch #438201 patch URL to Debian patch tracking (original is MIA).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
-* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-13
+* Wed Mar 19 2008 Ville Skyttä <ville.skytta@iki.fi> - 2.4-13
 - Apply patch to fix path to saved dependency files (#438201).
 
-* Sat Feb  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 2.4-12
+* Sat Feb  9 2008 Ville Skyttä <ville.skytta@iki.fi> - 2.4-12
 - Rebuild.
 
-* Tue Oct  2 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-11
+* Tue Oct  2 2007 Ville Skyttä <ville.skytta@iki.fi> - 2.4-11
 - Apply upstream fix for problems when $HOME is not set (#315441).
 
-* Wed Aug 22 2007 Ville Skyttä <ville.skytta at iki.fi>
+* Wed Aug 22 2007 Ville Skyttä <ville.skytta@iki.fi>
 - Fix URL to upstream tarball.
 
-* Sun Aug 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
+* Sun Aug 19 2007 Ville Skyttä <ville.skytta@iki.fi> - 2.4-10
 - License: GPLv2+
 - Make compiler symlinks relative.
 - Make profile.d scripts noreplace.
 
-* Mon Jul 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-9
+* Mon Jul 30 2007 Ville Skyttä <ville.skytta@iki.fi> - 2.4-9
 - Use shared cache dir for users in the ccache group by default
   (#247760, based on Andy Shevchenko's work).
 - Fix outdated hardlink info in cache sharing docs.
 - Add auto-symlink support for avr-gcc(-c++) and arm-gp2x-linux-gcc(-c++).
 - Make triggers always exit with a zero exit status.
 
-* Thu Mar 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-8
+* Thu Mar 15 2007 Ville Skyttä <ville.skytta@iki.fi> - 2.4-8
 - Bypass cache with --coverage, -fprofile-arcs and -ftest-coverage
   (upstream CVS and Matt Fago, #231462).
 
-* Fri Nov 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-7
+* Fri Nov 10 2006 Ville Skyttä <ville.skytta@iki.fi> - 2.4-7
 - Require coreutils for triggers (#215030).
 
-* Wed Aug  9 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-6
+* Wed Aug  9 2006 Ville Skyttä <ville.skytta@iki.fi> - 2.4-6
 - Add auto-symlink support for compat-gcc-34(-c++).
 - Untabify, escape macros in changelog.
 
-* Tue May 16 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.4-5
+* Tue May 16 2006 Ville Skyttä <ville.skytta@iki.fi> - 2.4-5
 - Add auto-symlink support for g++-libstdc++-so_7.
 
-* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-4
+* Sat Nov 26 2005 Ville Skyttä <ville.skytta@iki.fi> - 2.4-4
 - Drop "bin" from compiler symlink path.
 - Make profile.d snippets non-executable (#35714).
 
-* Sun May  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-3
+* Sun May  1 2005 Ville Skyttä <ville.skytta@iki.fi> - 2.4-3
 - Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
   bunch of no longer relevant compilers.
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
 - rebuilt
 
-* Sun Sep 26 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.4-0.fdr.1
+* Sun Sep 26 2004 Ville Skyttä <ville.skytta@iki.fi> - 0:2.4-0.fdr.1
 - Update to 2.4.
 - Add symlinking support for gcc4 and gcc4-c++.
 - Move the ccache executable to %%{_bindir}.
 - Include more docs.
 
-* Fri Jun 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.5
+* Fri Jun 25 2004 Ville Skyttä <ville.skytta@iki.fi> - 0:2.3-0.fdr.5
 - Add support for gcc33 and g++33.
 
-* Thu Jun 10 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.4
+* Thu Jun 10 2004 Ville Skyttä <ville.skytta@iki.fi> - 0:2.3-0.fdr.4
 - Fix hardcoded lib path in profile.d scriptlets (bug 1558).
 
-* Mon May  3 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.3
+* Mon May  3 2004 Ville Skyttä <ville.skytta@iki.fi> - 0:2.3-0.fdr.3
 - Add support for gcc34 and g++34, and
   %%{_target_cpu}-%%{_vendor}-%%{_target_os}-* variants.
 
-* Thu Nov 13 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.2
+* Thu Nov 13 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:2.3-0.fdr.2
 - Add overriding symlinks for gcc-ssa and g++-ssa (bug 963).
 
-* Tue Nov 11 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.3-0.fdr.1
+* Tue Nov 11 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:2.3-0.fdr.1
 - Update to 2.3.
 - Implement triggers to keep list of "aliased" compilers up to date on the fly.
 - Add gcc32 and a bunch of legacy packages to the list of overridden compilers.
 
-* Sat Aug  2 2003 Ville Skyttä <ville.skytta at iki.fi> - 0:2.2-0.fdr.6
+* Sat Aug  2 2003 Ville Skyttä <ville.skytta@iki.fi> - 0:2.2-0.fdr.6
 - Add c++ to the list of overridden compilers (bug 548).
 - Own everything including dirs under %%{_libdir}/ccache (bug 529).
 - %%{buildroot} -> $RPM_BUILD_ROOT.

From d0de5221ffa31c6da1f33eaa1397d581ae0e07b5 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 22:47:29 +0000
Subject: [PATCH 029/153] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 006abfe..6bf36ae 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: ccache
-# $Id: Makefile,v 1.1 2004/11/08 04:07:41 cvsextras Exp $
+# $Id: Makefile,v 1.2 2004/11/24 03:10:00 gafton Exp $
 NAME := ccache
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON	:= $(shell $(find-makefile-common))

From f4ba2cd223dc6cd7e078ee6128700f2b3e57ca85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 19 Dec 2009 11:44:52 +0000
Subject: [PATCH 030/153] - Minor profile.d script performance improvements. -
 Fix hardcoded /var/cache/ccache in profile.d scripts.

---
 ccache.csh.in | 4 ++--
 ccache.sh.in  | 8 +++-----
 ccache.spec   | 8 +++++++-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ccache.csh.in b/ccache.csh.in
index af6fa9e..846fead 100644
--- a/ccache.csh.in
+++ b/ccache.csh.in
@@ -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
diff --git a/ccache.sh.in b/ccache.sh.in
index d5cd116..7d6d485 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -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
diff --git a/ccache.spec b/ccache.spec
index 60711af..f57ca07 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -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.debian.net/patch/series/dl/ccache/2.4-17/0
 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@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@iki.fi> - 2.4-16
 - Switch #438201 patch URL to Debian patch tracking (original is MIA).
 

From 28a127a7467686796f8ffedaac4b684495f0334b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Mon, 1 Mar 2010 22:38:44 +0000
Subject: [PATCH 031/153] - Update to 3.0pre0, all old patches
 applied/superseded upstream. Note: old     caches will no longer be used, see
 NEWS for details. - Don't use "pathmunge" in the profile.d sh script to work
 around #548960. - Patch to avoid stripping the binary during build. - Add
 auto-symlink support for gcc44(-c++) and msp430-gcc. - Run test suite during
 build. - Update description.

---
 .cvsignore                       |  2 +-
 06_md.diff                       | 81 --------------------------------
 ccache-2.4-coverage-231462.patch | 12 -----
 ccache-2.4-hardlink-doc.patch    | 48 -------------------
 ccache-2.4-noHOME-315441.patch   | 45 ------------------
 ccache-3.0pre0-nostrip.patch     | 12 +++++
 ccache-html-links.patch          | 33 -------------
 ccache.sh.in                     |  4 +-
 ccache.spec                      | 53 ++++++++++++---------
 sources                          |  2 +-
 10 files changed, 48 insertions(+), 244 deletions(-)
 delete mode 100644 06_md.diff
 delete mode 100644 ccache-2.4-coverage-231462.patch
 delete mode 100644 ccache-2.4-hardlink-doc.patch
 delete mode 100644 ccache-2.4-noHOME-315441.patch
 create mode 100644 ccache-3.0pre0-nostrip.patch
 delete mode 100644 ccache-html-links.patch

diff --git a/.cvsignore b/.cvsignore
index 0741eb7..fa8c782 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ccache-2.4.tar.gz
+ccache-3.0pre0.tar.bz2
diff --git a/06_md.diff b/06_md.diff
deleted file mode 100644
index 75d82a2..0000000
--- a/06_md.diff
+++ /dev/null
@@ -1,81 +0,0 @@
-
-diff --git a/ccache.c b/ccache.c
-index 64c979b..843929f 100644
---- a/ccache.c
-+++ b/ccache.c
-@@ -647,6 +647,13 @@ static void process_args(int argc, char **argv)
- 	int found_S_opt = 0;
- 	struct stat st;
- 	char *e;
-+	/* is gcc being asked to output dependencies? */
-+	int generating_dependencies = 0;
-+	/* is the dependency makefile name overridden with -MF? */
-+	int dependency_filename_specified = 0;
-+	/* is the dependency makefile target name specified with -MQ or -MF? */
-+	int dependency_target_specified = 0;
-+
- 
- 	stripped_args = args_init(0, NULL);
- 
-@@ -725,6 +732,18 @@ static void process_args(int argc, char **argv)
- 			continue;
- 		}
- 
-+		/* These options require special handling, because they
-+		   behave differently with gcc -E, when the output
-+		   file is not specified. */
-+
-+		if (strcmp(argv[i], "-MD") == 0 || strcmp(argv[i], "-MMD") == 0) {
-+			generating_dependencies = 1;
-+		} else if (strcmp(argv[i], "-MF") == 0) {
-+			dependency_filename_specified = 1;
-+		} else if (strcmp(argv[i], "-MQ") == 0 || strcmp(argv[i], "-MT") == 0) {
-+			dependency_target_specified = 1;
-+		}
-+
- 		/* options that take an argument */
- 		{
- 			const char *opts[] = {"-I", "-include", "-imacros", "-iprefix",
-@@ -837,6 +856,41 @@ static void process_args(int argc, char **argv)
- 		p[2] = 0;
- 	}
- 
-+	/* If dependencies are generated, configure the preprocessor */
-+
-+	if (generating_dependencies && output_file) {
-+		if (!dependency_filename_specified) {
-+			char *default_depfile_name = x_strdup(output_file);
-+			char *p = strrchr(default_depfile_name, '.');
-+
-+			if (p) {
-+				if (strlen(p) < 2) {
-+					stats_update(STATS_ARGS);
-+					failed();
-+					return;
-+				}
-+				*p = 0;
-+			}
-+			else  {
-+				int len = p - default_depfile_name;
-+				
-+				p = x_malloc(len + 3);
-+				strncpy(default_depfile_name, p, len - 1);
-+				free(default_depfile_name);
-+				default_depfile_name = p;
-+			}
-+
-+			strcat(default_depfile_name, ".d");
-+			args_add(stripped_args, "-MF");
-+			args_add(stripped_args, default_depfile_name);
-+		}
-+
-+		if (!dependency_target_specified) {
-+			args_add(stripped_args, "-MT");
-+			args_add(stripped_args, output_file);
-+		}
-+	}
-+
- 	/* cope with -o /dev/null */
- 	if (strcmp(output_file,"/dev/null") != 0 && stat(output_file, &st) == 0 && !S_ISREG(st.st_mode)) {
- 		cc_log("Not a regular file %s\n", output_file);
-
diff --git a/ccache-2.4-coverage-231462.patch b/ccache-2.4-coverage-231462.patch
deleted file mode 100644
index 27d063b..0000000
--- a/ccache-2.4-coverage-231462.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- ccache.c~	2004-09-13 13:38:30.000000000 +0300
-+++ ccache.c	2007-03-15 12:31:41.000000000 +0200
-@@ -640,6 +640,9 @@
- 
- 		/* these are too hard */
- 		if (strcmp(argv[i], "-fbranch-probabilities")==0 ||
-+		    strcmp(argv[i], "--coverage") == 0 ||
-+		    strcmp(argv[i], "-fprofile-arcs") == 0 ||
-+		    strcmp(argv[i], "-ftest-coverage") == 0 ||
- 		    strcmp(argv[i], "-M") == 0 ||
- 		    strcmp(argv[i], "-MM") == 0 ||
- 		    strcmp(argv[i], "-x") == 0) {
diff --git a/ccache-2.4-hardlink-doc.patch b/ccache-2.4-hardlink-doc.patch
deleted file mode 100644
index bd9e25b..0000000
--- a/ccache-2.4-hardlink-doc.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: ccache.1
-===================================================================
-RCS file: /cvsroot/ccache/ccache.1,v
-retrieving revision 1.26
-diff -u -r1.26 ccache.1
---- ccache.1	24 Nov 2005 21:10:08 -0000	1.26
-+++ ccache.1	21 Jul 2007 21:03:32 -0000
-@@ -330,7 +330,7 @@
- .IP o 
- Use the same \fBCCACHE_DIR\fP environment variable setting
- .IP o 
--Set the \fBCCACHE_NOLINK\fP environment variable
-+Unset the \fBCCACHE_HARDLINK\fP environment variable
- .IP o 
- Make sure everyone sets the CCACHE_UMASK environment variable
- to 002, this ensures that cached files are accessible to everyone in
-Index: ccache.yo
-===================================================================
-RCS file: /cvsroot/ccache/ccache.yo,v
-retrieving revision 1.27
-diff -u -r1.27 ccache.yo
---- ccache.yo	24 Nov 2005 21:54:09 -0000	1.27
-+++ ccache.yo	21 Jul 2007 21:03:32 -0000
-@@ -289,7 +289,7 @@
- 
- itemize(
-   it() Use the same bf(CCACHE_DIR) environment variable setting
--  it() Set the bf(CCACHE_NOLINK) environment variable
-+  it() Unset the bf(CCACHE_HARDLINK) environment variable
-   it() Make sure everyone sets the CCACHE_UMASK environment variable
-   to 002, this ensures that cached files are accessible to everyone in
-   the group.
-Index: web/ccache-man.html
-===================================================================
-RCS file: /cvsroot/ccache/web/ccache-man.html,v
-retrieving revision 1.25
-diff -u -r1.25 ccache-man.html
---- web/ccache-man.html	13 Sep 2004 10:38:17 -0000	1.25
-+++ web/ccache-man.html	21 Jul 2007 21:03:32 -0000
-@@ -256,7 +256,7 @@
- following conditions need to be met:
- <p><ul>
-   <li > Use the same <strong>CCACHE_DIR</strong> environment variable setting
--  <li > Set the <strong>CCACHE_NOLINK</strong> environment variable
-+  <li > Unset the <strong>CCACHE_HARDLINK</strong> environment variable
-   <li > Make sure everyone sets the CCACHE_UMASK environment variable
-   to 002, this ensures that cached files are accessible to everyone in
-   the group.
diff --git a/ccache-2.4-noHOME-315441.patch b/ccache-2.4-noHOME-315441.patch
deleted file mode 100644
index 03b04f2..0000000
--- a/ccache-2.4-noHOME-315441.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: config.h.in
-===================================================================
-RCS file: /cvsroot/ccache/config.h.in,v
-retrieving revision 1.5
-retrieving revision 1.7
-diff -u -r1.5 -r1.7
---- config.h.in	7 Mar 2003 12:09:19 -0000	1.5
-+++ config.h.in	25 Jul 2005 07:05:46 -0000	1.7
-@@ -19,6 +19,9 @@
- /* Define to 1 if you have the `gethostname' function. */
- #undef HAVE_GETHOSTNAME
- 
-+/* Define to 1 if you have the `getpwuid' function. */
-+#undef HAVE_GETPWUID
-+
- /* Define to 1 if you have the <inttypes.h> header file. */
- #undef HAVE_INTTYPES_H
- 
-@@ -31,6 +34,9 @@
- /* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
- #undef HAVE_NDIR_H
- 
-+/* Define to 1 if you have the <pwd.h> header file. */
-+#undef HAVE_PWD_H
-+
- /* Define to 1 if you have the `realpath' function. */
- #undef HAVE_REALPATH
- 
-Index: util.c
-===================================================================
-RCS file: /cvsroot/ccache/util.c,v
-retrieving revision 1.34
-retrieving revision 1.37
-diff -u -r1.34 -r1.37
---- util.c	6 Sep 2004 12:59:12 -0000	1.34
-+++ util.c	17 Jul 2006 03:41:12 -0000	1.37
-@@ -448,7 +444,7 @@
- 		}
- 	}
- #endif
--	fatal("Unable to determine home directory");
-+	fprintf(stderr, "ccache: Unable to determine home directory");
- 	return NULL;
- }
- 
diff --git a/ccache-3.0pre0-nostrip.patch b/ccache-3.0pre0-nostrip.patch
new file mode 100644
index 0000000..7f924f3
--- /dev/null
+++ b/ccache-3.0pre0-nostrip.patch
@@ -0,0 +1,12 @@
+diff -up ccache-3.0pre0/Makefile.in~ ccache-3.0pre0/Makefile.in
+--- ccache-3.0pre0/Makefile.in~	2010-02-28 22:14:39.000000000 +0200
++++ ccache-3.0pre0/Makefile.in	2010-03-01 23:37:41.000000000 +0200
+@@ -45,7 +45,7 @@ ccache.1: ccache.yo
+ .PHONY: install
+ install: all
+ 	$(installcmd) -d $(DESTDIR)$(bindir)
+-	$(installcmd) -s -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
++	$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
+ 	$(installcmd) -d $(DESTDIR)$(mandir)/man1
+ 	-$(installcmd) -m 644 $(srcdir)/ccache.1 $(DESTDIR)$(mandir)/man1/
+ 
diff --git a/ccache-html-links.patch b/ccache-html-links.patch
deleted file mode 100644
index dadf1b6..0000000
--- a/ccache-html-links.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- web/index.html~	2004-09-13 13:38:30.000000000 +0300
-+++ web/index.html	2004-09-26 01:04:38.458008118 +0300
-@@ -29,10 +29,10 @@
- <li>fixed handling of HOME environment variable
- </ul>
- 
--See the <a href="/ccache/ccache-man.html">manual page</a> for details
-+See the <a href="ccache-man.html">manual page</a> for details
- on the new options.<p>
- 
--You can get this release from the <a href="/ftp/ccache/">download directory</a> 
-+You can get this release from the <a href="http://ccache.samba.org/ftp/ccache/">download directory</a> 
- 
- <p>NOTE! This release changes the hash input slighly, so you will
- probably find that you will not get any hits against your existing
-@@ -87,7 +87,7 @@
- 
- <h2>Documentation</h2>
- 
--See the <a href="/ccache/ccache-man.html">manual page</a>
-+See the <a href="ccache-man.html">manual page</a>
- 
- 
- <h2>Performance</h2>
-@@ -116,7 +116,7 @@
- <h2>Download</h2>
- 
- You can download the latest release from the <a
--href="/ftp/ccache/">download directory</a>.<p>
-+href="http://ccache.samba.org/ftp/ccache/">download directory</a>.<p>
- 
- For the bleeding edge, you can fetch ccache via CVS or
- rsync. To fetch via cvs use the following command:
diff --git a/ccache.sh.in b/ccache.sh.in
index 7d6d485..f844648 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -1,7 +1,9 @@
 # Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
 # environment variable in their personal profile.
 
-pathmunge @LIBDIR@/ccache
+if ! echo "$PATH" | grep -Eq '(^|:)@LIBDIR@/ccache($|:)' ; then
+    PATH="@LIBDIR@/ccache:$PATH"
+fi
 
 # 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..8ddc5d7 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -1,51 +1,48 @@
-%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++
-%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++
+%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 gcc44 g++44 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++ msp430-gcc
+%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, gcc44, gcc44-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++, msp430-gcc
 
 %define abs2rel() perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' %1 %2
 %{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
 
 Name:           ccache
-Version:        2.4
-Release:        17%{?dist}
+Version:        3.0
+Release:        0.1.pre0%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://ccache.samba.org/
-Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.gz
+Source0:        http://samba.org/ftp/ccache/%{name}-%{version}pre0.tar.bz2
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-Patch0:         %{name}-html-links.patch
-Patch1:         %{name}-2.4-coverage-231462.patch
-Patch2:         %{name}-2.4-hardlink-doc.patch
-Patch3:         %{name}-2.4-noHOME-315441.patch
-Patch4:         http://patch-tracking.debian.net/patch/series/dl/ccache/2.4-17/06_md.diff
+Patch0:         %{name}-3.0pre0-nostrip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
+BuildRequires:  zlib-devel >= 1.2.3
 # For pathmunge in profile.d/ccache.sh, #123621
 Requires:       setup >= 2.5.48
 Requires(triggerin): coreutils
 Requires(triggerpostun): coreutils
 
 %description
-ccache is a compiler cache.  It acts as a caching pre-processor to
-C/C++ compilers, using the -E compiler switch and a hash to detect
-when a compilation can be satisfied from cache.  This often results in
-a 5 to 10 times speedup in common compilations.
+ccache is a compiler cache.  It speeds up recompilation of C/C++ code
+by caching previous compiles and detecting when the same compile is
+being done again.  The main focus is to handle the GNU C/C++ compiler
+(GCC), but it may also work with compilers that mimic GCC good enough.
 
 
 %prep
-%setup -q
-%patch0 -p0
-%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p1
+%setup -q -n %{name}-%{version}pre0
+%patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE2} > %{name}.csh
+# Make sure system zlib is used
+rm -r zlib
+# Unclean 3.0pre0 tarball
+rm -r .deps
 
 
 %build
@@ -68,6 +65,10 @@ done
 install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache
 
 
+%check
+make check
+
+
 %clean
 rm -fr $RPM_BUILD_ROOT
 
@@ -75,7 +76,6 @@ rm -fr $RPM_BUILD_ROOT
 %pre
 getent group ccache >/dev/null || groupadd -r ccache || :
 
-
 %triggerin -- %{pkgs}
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
@@ -95,7 +95,7 @@ done
 
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
-%doc COPYING README web/*.html
+%doc COPYING NEWS README
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
@@ -104,6 +104,15 @@ done
 
 
 %changelog
+* Mon Mar  1 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-0.1.pre0
+- Update to 3.0pre0, all old patches applied/superseded upstream.
+  Note: old caches will no longer be used, see NEWS for details.
+- Don't use "pathmunge" in the profile.d sh script to work around #548960.
+- Patch to avoid stripping the binary during build.
+- Add auto-symlink support for gcc44(-c++) and msp430-gcc.
+- Run test suite during build.
+- Update description.
+
 * 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.
diff --git a/sources b/sources
index 7c7b031..475dba5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-73c1ed1e767c1752dd0f548ec1e66ce7  ccache-2.4.tar.gz
+3704f1cd486b1e63638fd17910c42e9f  ccache-3.0pre0.tar.bz2

From d688fbd88c662f291a6441320e66f5f9391f6af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Thu, 13 May 2010 18:57:13 +0000
Subject: [PATCH 032/153] - Update to 3.0pre1 (#591040), license changed to
 GPLv3+.

---
 .cvsignore                   |  2 +-
 ccache-3.0pre0-nostrip.patch | 12 ------------
 ccache-3.0pre1-strip.patch   | 21 +++++++++++++++++++++
 ccache.spec                  | 20 +++++++++++---------
 sources                      |  2 +-
 5 files changed, 34 insertions(+), 23 deletions(-)
 delete mode 100644 ccache-3.0pre0-nostrip.patch
 create mode 100644 ccache-3.0pre1-strip.patch

diff --git a/.cvsignore b/.cvsignore
index fa8c782..4f997fe 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ccache-3.0pre0.tar.bz2
+ccache-3.0pre1.tar.bz2
diff --git a/ccache-3.0pre0-nostrip.patch b/ccache-3.0pre0-nostrip.patch
deleted file mode 100644
index 7f924f3..0000000
--- a/ccache-3.0pre0-nostrip.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ccache-3.0pre0/Makefile.in~ ccache-3.0pre0/Makefile.in
---- ccache-3.0pre0/Makefile.in~	2010-02-28 22:14:39.000000000 +0200
-+++ ccache-3.0pre0/Makefile.in	2010-03-01 23:37:41.000000000 +0200
-@@ -45,7 +45,7 @@ ccache.1: ccache.yo
- .PHONY: install
- install: all
- 	$(installcmd) -d $(DESTDIR)$(bindir)
--	$(installcmd) -s -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
-+	$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
- 	$(installcmd) -d $(DESTDIR)$(mandir)/man1
- 	-$(installcmd) -m 644 $(srcdir)/ccache.1 $(DESTDIR)$(mandir)/man1/
- 
diff --git a/ccache-3.0pre1-strip.patch b/ccache-3.0pre1-strip.patch
new file mode 100644
index 0000000..df3304f
--- /dev/null
+++ b/ccache-3.0pre1-strip.patch
@@ -0,0 +1,21 @@
+diff -up ccache-3.0pre1/Makefile.in~ ccache-3.0pre1/Makefile.in
+--- ccache-3.0pre1/Makefile.in~	2010-05-10 23:08:12.000000000 +0300
++++ ccache-3.0pre1/Makefile.in	2010-05-13 20:31:38.000000000 +0300
+@@ -13,6 +13,7 @@ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@ -I.
+ LDFLAGS = @LDFLAGS@
+ EXEEXT = @EXEEXT@
++STRIP = strip
+ 
+ libs = @LIBS@ -lm
+ 
+@@ -47,7 +48,8 @@ ccache.1: manual.xml
+ .PHONY: install
+ install: all
+ 	$(installcmd) -d $(DESTDIR)$(bindir)
+-	$(installcmd) -s -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
++	$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
++	$(STRIP) $(DESTDIR)$(bindir)/ccache$(EXEEXT)
+ 	$(installcmd) -d $(DESTDIR)$(mandir)/man1
+ 	-$(installcmd) -m 644 $(srcdir)/ccache.1 $(DESTDIR)$(mandir)/man1/
+ 
diff --git a/ccache.spec b/ccache.spec
index 8ddc5d7..f67aa46 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,16 +6,17 @@
 
 Name:           ccache
 Version:        3.0
-Release:        0.1.pre0%{?dist}
+Release:        0.1.pre1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
-License:        GPLv2+
+License:        GPLv3+
 URL:            http://ccache.samba.org/
-Source0:        http://samba.org/ftp/ccache/%{name}-%{version}pre0.tar.bz2
+Source0:        http://samba.org/ftp/ccache/%{name}-%{version}pre1.tar.bz2
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-Patch0:         %{name}-3.0pre0-nostrip.patch
+# https://bugzilla.samba.org/show_bug.cgi?id=7428
+Patch0:         %{name}-3.0pre1-strip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -33,7 +34,7 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 
 %prep
-%setup -q -n %{name}-%{version}pre0
+%setup -q -n %{name}-%{version}pre1
 %patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
@@ -41,8 +42,6 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE2} > %{name}.csh
 # Make sure system zlib is used
 rm -r zlib
-# Unclean 3.0pre0 tarball
-rm -r .deps
 
 
 %build
@@ -52,7 +51,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT STRIP=:
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
@@ -95,7 +94,7 @@ done
 
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
-%doc COPYING NEWS README
+%doc COPYING NEWS.txt README.txt
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
@@ -104,6 +103,9 @@ done
 
 
 %changelog
+* Thu May 13 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-0.1.pre1
+- Update to 3.0pre1 (#591040), license changed to GPLv3+.
+
 * Mon Mar  1 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-0.1.pre0
 - Update to 3.0pre0, all old patches applied/superseded upstream.
   Note: old caches will no longer be used, see NEWS for details.
diff --git a/sources b/sources
index 475dba5..c1573fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3704f1cd486b1e63638fd17910c42e9f  ccache-3.0pre0.tar.bz2
+8df2b11277f88e91a3d861d06b92a030  ccache-3.0pre1.tar.bz2

From ab56ad3bba56fe9c040a83386563b8718f68bd16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Fri, 4 Jun 2010 19:57:27 +0000
Subject: [PATCH 033/153] - Reintroduce minor profile.d script performance
 improvements.

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

diff --git a/ccache.sh.in b/ccache.sh.in
index f844648..c751a60 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -1,9 +1,10 @@
 # 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 -Eq '(^|:)@LIBDIR@/ccache($|:)' ; then
-    PATH="@LIBDIR@/ccache:$PATH"
-fi
+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 f67aa46..1635c6d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,7 +6,7 @@
 
 Name:           ccache
 Version:        3.0
-Release:        0.1.pre1%{?dist}
+Release:        0.2.pre1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -103,6 +103,9 @@ done
 
 
 %changelog
+* Fri Jun  4 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-0.2.pre1
+- Reintroduce minor profile.d script performance improvements.
+
 * Thu May 13 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-0.1.pre1
 - Update to 3.0pre1 (#591040), license changed to GPLv3+.
 

From f4f7bcad767e7182fcca721ec00b528ed33c36cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 3 Jul 2010 12:02:48 +0000
Subject: [PATCH 034/153] - Update to 3.0, no-strip patch no longer needed.

---
 .cvsignore                 |  2 +-
 ccache-3.0pre1-strip.patch | 21 ---------------------
 ccache.spec                | 12 ++++++------
 sources                    |  2 +-
 4 files changed, 8 insertions(+), 29 deletions(-)
 delete mode 100644 ccache-3.0pre1-strip.patch

diff --git a/.cvsignore b/.cvsignore
index 4f997fe..6e37d49 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ccache-3.0pre1.tar.bz2
+ccache-3.0.tar.bz2
diff --git a/ccache-3.0pre1-strip.patch b/ccache-3.0pre1-strip.patch
deleted file mode 100644
index df3304f..0000000
--- a/ccache-3.0pre1-strip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -up ccache-3.0pre1/Makefile.in~ ccache-3.0pre1/Makefile.in
---- ccache-3.0pre1/Makefile.in~	2010-05-10 23:08:12.000000000 +0300
-+++ ccache-3.0pre1/Makefile.in	2010-05-13 20:31:38.000000000 +0300
-@@ -13,6 +13,7 @@ CFLAGS = @CFLAGS@
- CPPFLAGS = @CPPFLAGS@ -I.
- LDFLAGS = @LDFLAGS@
- EXEEXT = @EXEEXT@
-+STRIP = strip
- 
- libs = @LIBS@ -lm
- 
-@@ -47,7 +48,8 @@ ccache.1: manual.xml
- .PHONY: install
- install: all
- 	$(installcmd) -d $(DESTDIR)$(bindir)
--	$(installcmd) -s -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
-+	$(installcmd) -m 755 ccache$(EXEEXT) $(DESTDIR)$(bindir)
-+	$(STRIP) $(DESTDIR)$(bindir)/ccache$(EXEEXT)
- 	$(installcmd) -d $(DESTDIR)$(mandir)/man1
- 	-$(installcmd) -m 644 $(srcdir)/ccache.1 $(DESTDIR)$(mandir)/man1/
- 
diff --git a/ccache.spec b/ccache.spec
index 1635c6d..f9db4ee 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -6,17 +6,15 @@
 
 Name:           ccache
 Version:        3.0
-Release:        0.2.pre1%{?dist}
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
 License:        GPLv3+
 URL:            http://ccache.samba.org/
-Source0:        http://samba.org/ftp/ccache/%{name}-%{version}pre1.tar.bz2
+Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.bz2
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-# https://bugzilla.samba.org/show_bug.cgi?id=7428
-Patch0:         %{name}-3.0pre1-strip.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -34,8 +32,7 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
-%patch0 -p1
+%setup -q
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -103,6 +100,9 @@ done
 
 
 %changelog
+* Sat Jul  3 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-1
+- Update to 3.0, no-strip patch no longer needed.
+
 * Fri Jun  4 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-0.2.pre1
 - Reintroduce minor profile.d script performance improvements.
 
diff --git a/sources b/sources
index c1573fc..25d6611 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8df2b11277f88e91a3d861d06b92a030  ccache-3.0pre1.tar.bz2
+213bd7420f913e4c926eeac9cd2dadf6  ccache-3.0.tar.bz2

From 3b23c051c51f58811702cbfb702ebf69d1b9eeb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 3 Jul 2010 12:06:34 +0000
Subject: [PATCH 035/153] Drop no longer needed STRIP=:.

---
 ccache.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index f9db4ee..c2ab5cc 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -48,7 +48,7 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
-make install DESTDIR=$RPM_BUILD_ROOT STRIP=:
+make install DESTDIR=$RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache

From e0315c10a0fabde9e20a7d00d02072c9cccb0f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 3 Jul 2010 12:10:03 +0000
Subject: [PATCH 036/153] Drop stale setup dependeny, pathmunge is no longer
 used.

---
 ccache.spec | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index c2ab5cc..8dff5b0 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -19,8 +19,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
-# For pathmunge in profile.d/ccache.sh, #123621
-Requires:       setup >= 2.5.48
 Requires(triggerin): coreutils
 Requires(triggerpostun): coreutils
 

From 18fa0eba40519e574059f0879a25d63bb774c269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Fri, 16 Jul 2010 16:28:34 +0000
Subject: [PATCH 037/153] - Update to 3.0.1.

---
 .cvsignore  | 2 +-
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 6e37d49..d8ef47e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-ccache-3.0.tar.bz2
+ccache-3.0.1.tar.bz2
diff --git a/ccache.spec b/ccache.spec
index 8dff5b0..8d01ea2 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -5,7 +5,7 @@
 %{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
 
 Name:           ccache
-Version:        3.0
+Version:        3.0.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -98,6 +98,9 @@ done
 
 
 %changelog
+* Fri Jul 16 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0.1-1
+- Update to 3.0.1.
+
 * Sat Jul  3 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.0-1
 - Update to 3.0, no-strip patch no longer needed.
 
diff --git a/sources b/sources
index 25d6611..e20be53 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-213bd7420f913e4c926eeac9cd2dadf6  ccache-3.0.tar.bz2
+223449f7891e5d6a15b25100eca5cca4  ccache-3.0.1.tar.bz2

From 518fac1708e09d555ebc8db60e1e8fe07d2289ba Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Wed, 28 Jul 2010 11:29:25 +0000
Subject: [PATCH 038/153] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 6bf36ae..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: ccache
-# $Id: Makefile,v 1.2 2004/11/24 03:10:00 gafton Exp $
-NAME := ccache
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From fc4c39b2ecda140463c6de9f1c44e1fced8675e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 18 Sep 2010 13:28:39 +0300
Subject: [PATCH 039/153] - 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@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@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

From 4e65e3aa3cd4fba29f5361cd853e815a2faa0f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 19 Nov 2010 00:00:15 +0200
Subject: [PATCH 040/153] - Update to 3.1.1.

---
 .gitignore  | 2 +-
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ab41dc4..6adfb3f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ccache-3.1.tar.bz2
+/ccache-3.1.1.tar.bz2
diff --git a/ccache.spec b/ccache.spec
index 4ceb28c..fa94bfd 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -5,7 +5,7 @@
 %{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
 
 Name:           ccache
-Version:        3.1
+Version:        3.1.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -98,6 +98,9 @@ done
 
 
 %changelog
+* Thu Nov 18 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.1-1
+- Update to 3.1.1.
+
 * Sat Sep 18 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1-1
 - Update to 3.1, fixes #610853.
 - Make sh profile script "nounset" clean.
diff --git a/sources b/sources
index ed7eb62..8b8ab06 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7961852e1e36f11559039c32142f58df  ccache-3.1.tar.bz2
+7dbd668c79d78c0b32c13214b2b35b70  ccache-3.1.1.tar.bz2

From aee42b27aed396fe7fdb80c9b6c449417d2bfa54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 23 Nov 2010 19:06:22 +0200
Subject: [PATCH 041/153] - Update to 3.1.2.

---
 .gitignore  | 2 +-
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6adfb3f..bf27e8a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ccache-3.1.1.tar.bz2
+/ccache-3.1.2.tar.xz
diff --git a/ccache.spec b/ccache.spec
index fa94bfd..11006df 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -5,14 +5,14 @@
 %{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
 
 Name:           ccache
-Version:        3.1.1
+Version:        3.1.2
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
 License:        GPLv3+
 URL:            http://ccache.samba.org/
-Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.bz2
+Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.xz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -98,6 +98,9 @@ done
 
 
 %changelog
+* Tue Nov 23 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.2-1
+- Update to 3.1.2.
+
 * Thu Nov 18 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.1-1
 - Update to 3.1.1.
 
diff --git a/sources b/sources
index 8b8ab06..dcc9b13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7dbd668c79d78c0b32c13214b2b35b70  ccache-3.1.1.tar.bz2
+f82463c2bd123ca60e7c8f314e1fa6e0  ccache-3.1.2.tar.xz

From d54c7baca21fb485cbf95a2b6ba0548e42ed4570 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 28 Nov 2010 21:29:01 +0200
Subject: [PATCH 042/153] - Update to 3.1.3, fixes #657857.

---
 .gitignore  | 2 +-
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bf27e8a..4ea2a09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ccache-3.1.2.tar.xz
+/ccache-3.1.3.tar.xz
diff --git a/ccache.spec b/ccache.spec
index 11006df..c490b36 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -5,7 +5,7 @@
 %{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
 
 Name:           ccache
-Version:        3.1.2
+Version:        3.1.3
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -98,6 +98,9 @@ done
 
 
 %changelog
+* Sun Nov 28 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.3-1
+- Update to 3.1.3, fixes #657857.
+
 * Tue Nov 23 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.2-1
 - Update to 3.1.2.
 
diff --git a/sources b/sources
index dcc9b13..9b264f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f82463c2bd123ca60e7c8f314e1fa6e0  ccache-3.1.2.tar.xz
+86c7b41d85787a383628fc888d62021a  ccache-3.1.3.tar.xz

From 21996824a36c3d5abcb5edf038348c73787e35ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 5 Dec 2010 14:56:11 +0200
Subject: [PATCH 043/153] Update compiler executable lists, make their package
 triggers more targeted.

---
 ccache.spec | 99 ++++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 72 insertions(+), 27 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index c490b36..717f0a6 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -1,8 +1,15 @@
-%define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 gcc44 g++44 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++ msp430-gcc
-%define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, gcc44, gcc44-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++, msp430-gcc
+%ifarch x86_64
+%global archs %{ix86} x86_64
+%else
+%ifarch %{ix86}
+%global archs %{ix86}
+%else
+%global archs %{_target_cpu}
+%endif
+%endif
 
 %define abs2rel() perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' %1 %2
-%{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
+%global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
 Version:        3.1.3
@@ -45,19 +52,33 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
+rm -rf $RPM_BUILD_ROOT
+
 make install DESTDIR=$RPM_BUILD_ROOT
+
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
-for name in %{compilers} ; do
-  for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$c
-    echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
-  done
-done
+
 install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache
 
+# %%ghost files for ownership, keep in sync with triggers
+install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
+for n in cc gcc g++ c++ ; do
+    ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$n
+    for p in avr- arm-gp2x-linux- msp430- ; do
+        ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$p$n
+    done
+    for s in 32 34 4 44 ; do
+        ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$n$s
+    done
+    for a in %{archs} ; do
+        ln -s %{relccache} \
+            $RPM_BUILD_ROOT%{_libdir}/ccache/$a-%{_vendor}-%{_target_os}-$n
+    done
+done
+find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
+    sed -e "s|^$RPM_BUILD_ROOT|%%ghost |" > %{name}-%{version}.compilers
+
 
 %check
 make check
@@ -67,25 +88,46 @@ make check
 rm -fr $RPM_BUILD_ROOT
 
 
+%define ccache_trigger(p:) \
+%triggerin -- %{-p*}\
+for n in %* ; do\
+    [ ! -x %{_bindir}/$n ] || ln -sf %{relccache} %{_libdir}/ccache/$n\
+    for a in %{archs} ; do\
+        [ ! -x %{_bindir}/$a-%{_vendor}-%{_target_os}-$n ] || \\\
+          ln -sf %{relccache} %{_libdir}/ccache/$a-%{_vendor}-%{_target_os}-$n\
+    done\
+done\
+:\
+%triggerpostun -- %{-p*}\
+for n in %* ; do\
+    [ -x %{_bindir}/$n ] || rm -f %{_libdir}/ccache/$n\
+    for a in %{archs} ; do\
+        [ -x %{_bindir}/$a-%{_vendor}-%{_target_os}-$n ] || \\\
+            rm -f %{_libdir}/ccache/$a-%{_vendor}-%{_target_os}-$n\
+    done\
+done\
+:\
+%{nil}
+
+%ccache_trigger -p arm-gp2x-linux-gcc arm-gp2x-linux-cc arm-gp2x-linux-gcc
+%ccache_trigger -p arm-gp2x-linux-gcc-c++ arm-gp2x-linux-c++ arm-gp2x-linux-g++
+%ccache_trigger -p avr-gcc avr-cc avr-gcc
+%ccache_trigger -p avr-gcc-c++ avr-c++ avr-g++
+%ccache_trigger -p compat-gcc-32 cc32 gcc32
+%ccache_trigger -p compat-gcc-32-c++ c++32 g++32
+%ccache_trigger -p compat-gcc-34 cc34 gcc34
+%ccache_trigger -p compat-gcc-34-c++ c++34 g++34
+%ccache_trigger -p gcc cc gcc
+%ccache_trigger -p gcc-c++ c++ g++
+%ccache_trigger -p gcc4 cc4 gcc4
+%ccache_trigger -p gcc4-c++ c++4 g++4
+%ccache_trigger -p gcc44 cc4 gcc44
+%ccache_trigger -p gcc44-c++ c++44 g++44
+%ccache_trigger -p msp430-gcc msp430-cc msp430-gcc
+
 %pre
 getent group ccache >/dev/null || groupadd -r ccache || :
 
-%triggerin -- %{pkgs}
-for name in %{compilers} ; do
-  for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    [ ! -x %{_bindir}/$c ] || ln -sf %{relccache} %{_libdir}/ccache/$c
-  done
-done
-:
-
-%triggerpostun -- %{pkgs}
-for name in %{compilers} ; do
-  for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    [ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/$c
-  done
-done
-:
-
 
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
@@ -98,6 +140,9 @@ done
 
 
 %changelog
+* Sun Dec  5 2010 Ville Skyttä <ville.skytta@iki.fi>
+- Update compiler executable lists, make their package triggers more targeted.
+
 * Sun Nov 28 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.3-1
 - Update to 3.1.3, fixes #657857.
 

From c8a1935519b935ce5b15e97a9a52d0b1a2494420 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 5 Dec 2010 16:06:36 +0200
Subject: [PATCH 044/153] Auto-symlink mingw32-gcc(-c++) compilers.

---
 ccache.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 717f0a6..96c9813 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -123,6 +123,8 @@ done\
 %ccache_trigger -p gcc4-c++ c++4 g++4
 %ccache_trigger -p gcc44 cc4 gcc44
 %ccache_trigger -p gcc44-c++ c++44 g++44
+%ccache_trigger -p mingw32-gcc i686-pc-mingw32-cc i686-pc-mingw32-gcc
+%ccache_trigger -p mingw32-gcc-c++ i686-pc-mingw32-c++ i686-pc-mingw32-g++
 %ccache_trigger -p msp430-gcc msp430-cc msp430-gcc
 
 %pre
@@ -140,8 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
-* Sun Dec  5 2010 Ville Skyttä <ville.skytta@iki.fi>
+* Sun Dec  5 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.3-2
 - Update compiler executable lists, make their package triggers more targeted.
+- Auto-symlink mingw32-gcc(-c++) compilers.
 
 * Sun Nov 28 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.3-1
 - Update to 3.1.3, fixes #657857.

From b59e54835ecfc78c118a74a89038d7b1a489df38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 14 Jan 2011 09:09:29 +0200
Subject: [PATCH 045/153] - Update to 3.1.4.

---
 .gitignore  | 2 +-
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ea2a09..d98cc99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ccache-3.1.3.tar.xz
+/ccache-3.1.4.tar.xz
diff --git a/ccache.spec b/ccache.spec
index 96c9813..b5af655 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.3
-Release:        2%{?dist}
+Version:        3.1.4
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Jan 14 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.4-1
+- Update to 3.1.4.
+
 * Sun Dec  5 2010 Ville Skyttä <ville.skytta@iki.fi> - 3.1.3-2
 - Update compiler executable lists, make their package triggers more targeted.
 - Auto-symlink mingw32-gcc(-c++) compilers.
diff --git a/sources b/sources
index 9b264f5..98a74bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-86c7b41d85787a383628fc888d62021a  ccache-3.1.3.tar.xz
+6c70a6e2e5da8d957d175343412e494b  ccache-3.1.4.tar.xz

From d524202157d2ebb14ab75d1920214b01d309b5ea Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 8 Feb 2011 00:37:22 -0600
Subject: [PATCH 046/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index b5af655..0a54a28 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Fri Jan 14 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.4-1
 - Update to 3.1.4.
 

From 7ad63b91d4df179c09d25cd073a12c9632a4bf61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 2 Apr 2011 12:55:00 +0300
Subject: [PATCH 047/153] Reset non-working cache dir related env settings on
 user switch (#651023).

---
 ccache.csh.in | 28 +++++++++++++++++++---------
 ccache.sh.in  | 24 +++++++++++++++++-------
 ccache.spec   |  5 ++++-
 3 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/ccache.csh.in b/ccache.csh.in
index 846fead..4edbb51 100644
--- a/ccache.csh.in
+++ b/ccache.csh.in
@@ -1,16 +1,26 @@
-# Use ccache by default.  Users who don't want that can set the CCACHE_DISABLE
-# environment variable in their personal profile.
+# Use ccache by default.  Users who don't want that can setenv the
+# CCACHE_DISABLE environment variable in their personal profile.
 
 if ( "$path" !~ *@LIBDIR@/ccache* ) then
     set path = ( @LIBDIR@/ccache $path )
 endif
 
-# 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 @CACHEDIR@ is writable, use a shared cache there, except for root.
+# Users who don't want that even if they have the write permission can setenv
+# the CCACHE_DIR environment variable to another location and possibly unsetenv
+# the CCACHE_UMASK environment variable in their personal profile.
 
-if ( ! $?CCACHE_DIR && -w @CACHEDIR@ && -d @CACHEDIR@ ) then
-    setenv CCACHE_DIR @CACHEDIR@
-    setenv CCACHE_UMASK 002
-    unsetenv CCACHE_HARDLINK
+if ( $?CCACHE_DIR ) then
+    if ( ! -w "$CCACHE_DIR" ) then
+        # Reset broken settings maybe inherited when switching users (#651023).
+        unsetenv CCACHE_DIR
+        unsetenv CCACHE_UMASK
+    endif
+else if ( $uid != 0 ) then
+    if ( -w @CACHEDIR@ && -d @CACHEDIR@ ) then
+        # Set up the shared cache.
+        setenv CCACHE_DIR @CACHEDIR@
+        setenv CCACHE_UMASK 002
+        unsetenv CCACHE_HARDLINK
+    endif
 endif
diff --git a/ccache.sh.in b/ccache.sh.in
index 03f2c85..0ce4d64 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -6,12 +6,22 @@ case ":${PATH:-}:" in
     *) 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 @CACHEDIR@ is writable, use a shared cache there, except for root.
+# Users who don't want that even if they have the write permission can set
+# the CCACHE_DIR environment variable to another location and possibly unset
+# the CCACHE_UMASK environment variables in their personal profile.
 
-if [ -z "${CCACHE_DIR:-}" ] && [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
-    export CCACHE_DIR=@CACHEDIR@
-    export CCACHE_UMASK=002
-    unset CCACHE_HARDLINK
+if [ -n "${CCACHE_DIR:-}" ] ; then
+    if [ ! -w "$CCACHE_DIR" ] ; then
+        # Reset broken settings maybe inherited when switching users (#651023).
+        unset CCACHE_DIR
+        unset CCACHE_UMASK
+    fi
+elif [ "${EUID:-}" != 0 ] ; then
+    if [ -w @CACHEDIR@ ] && [ -d @CACHEDIR@ ] ; then
+        # Set up the shared cache.
+        export CCACHE_DIR=@CACHEDIR@
+        export CCACHE_UMASK=002
+        unset CCACHE_HARDLINK
+    fi
 fi
diff --git a/ccache.spec b/ccache.spec
index 0a54a28..6ab174b 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Apr  2 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.4-3
+- Reset non-working cache dir related env settings on user switch (#651023).
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 7f8288ec27ffd2bdefc0fde4627c763c084f8700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 2 Apr 2011 13:15:37 +0300
Subject: [PATCH 048/153] Replace Requires(trigger*) with plain requires to
 appease rpmbuild >= 4.9.

---
 ccache.spec | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 6ab174b..c709900 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -26,8 +26,8 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
-Requires(triggerin): coreutils
-Requires(triggerpostun): coreutils
+# coreutils for triggerin, triggerpostun
+Requires: coreutils
 
 %description
 ccache is a compiler cache.  It speeds up recompilation of C/C++ code
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Apr  2 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.4-4
+- Replace Requires(trigger*) with plain requires to appease rpmbuild >= 4.9.
+
 * Sat Apr  2 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.4-3
 - Reset non-working cache dir related env settings on user switch (#651023).
 

From 754dbc48634f6dde5aaabe881fbfac906d186321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 30 May 2011 18:25:04 +0300
Subject: [PATCH 049/153] Update to 3.1.5.

---
 .gitignore  | 2 +-
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index d98cc99..9452199 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ccache-3.1.4.tar.xz
+/*.tar.xz
diff --git a/ccache.spec b/ccache.spec
index c709900..ed80a89 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.4
-Release:        4%{?dist}
+Version:        3.1.5
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon May 30 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.5-1
+- Update to 3.1.5.
+
 * Sat Apr  2 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.4-4
 - Replace Requires(trigger*) with plain requires to appease rpmbuild >= 4.9.
 
diff --git a/sources b/sources
index 98a74bb..64ddef8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c70a6e2e5da8d957d175343412e494b  ccache-3.1.4.tar.xz
+b22060dbf5c3c56bf01a92900c0423fb  ccache-3.1.5.tar.xz

From f443a74f12e24dc3882bcd43827447b8f569541f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 22 Aug 2011 23:42:51 +0300
Subject: [PATCH 050/153] Update to 3.1.6.

---
 ccache.spec | 5 ++++-
 sources     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index ed80a89..0d950ce 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.5
+Version:        3.1.6
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Aug 22 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.6-1
+- Update to 3.1.6.
+
 * Mon May 30 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.5-1
 - Update to 3.1.5.
 
diff --git a/sources b/sources
index 64ddef8..1ac65ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b22060dbf5c3c56bf01a92900c0423fb  ccache-3.1.5.tar.xz
+4adee18e0e7a767112913c56fdb06792  ccache-3.1.6.tar.xz

From 98ad636d9da10cc3a5bddc84c7f316e7aca3db32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 17 Dec 2011 23:58:28 +0200
Subject: [PATCH 051/153] Turn on CCACHE_HASHDIR by default (#759592, Jan
 Kratochvil).

---
 ccache.csh.in | 2 ++
 ccache.sh.in  | 2 ++
 ccache.spec   | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/ccache.csh.in b/ccache.csh.in
index 4edbb51..0f58940 100644
--- a/ccache.csh.in
+++ b/ccache.csh.in
@@ -24,3 +24,5 @@ else if ( $uid != 0 ) then
         unsetenv CCACHE_HARDLINK
     endif
 endif
+
+setenv CCACHE_HASHDIR
diff --git a/ccache.sh.in b/ccache.sh.in
index 0ce4d64..29f8303 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -25,3 +25,5 @@ elif [ "${EUID:-}" != 0 ] ; then
         unset CCACHE_HARDLINK
     fi
 fi
+
+export CCACHE_HASHDIR=
diff --git a/ccache.spec b/ccache.spec
index 0d950ce..4849d69 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Dec  4 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.6-2
+- Turn on CCACHE_HASHDIR by default (#759592, Jan Kratochvil).
+
 * Mon Aug 22 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.6-1
 - Update to 3.1.6.
 

From a28223f6be58843f2091fc6ddbe4b799eab8c697 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 18 Dec 2011 00:13:34 +0200
Subject: [PATCH 052/153] Actually bump the release tag.

---
 ccache.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 4849d69..4143fa8 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools

From b1743975f101e44972e51cbb079b1017314d8f38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 8 Jan 2012 17:23:05 +0200
Subject: [PATCH 053/153] Update to 3.1.7.

---
 ccache.spec | 7 +++++--
 sources     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 4143fa8..4dc5d2c 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.6
-Release:        2%{?dist}
+Version:        3.1.7
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Jan  8 2012 Ville Skyttä <ville.skytta@iki.fi> - 3.1.7-1
+- Update to 3.1.7.
+
 * Sun Dec  4 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.6-2
 - Turn on CCACHE_HASHDIR by default (#759592, Jan Kratochvil).
 
diff --git a/sources b/sources
index 1ac65ce..5a823d8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4adee18e0e7a767112913c56fdb06792  ccache-3.1.6.tar.xz
+80a698c22d0b06b19c88ac58e8d8b632  ccache-3.1.7.tar.xz

From 650757e0c0ac1acc5e11642f70319c841b660ec2 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 18 Jul 2012 13:39:59 -0500
Subject: [PATCH 054/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 4dc5d2c..d383bf5 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -142,6 +142,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Sun Jan  8 2012 Ville Skyttä <ville.skytta@iki.fi> - 3.1.7-1
 - Update to 3.1.7.
 

From d18df048f2c2e79cb43f7b6b4324cc11a70014ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 18 Aug 2012 21:49:52 +0300
Subject: [PATCH 055/153] Update to 3.1.8, fixes #783971.

- Update mingw* symlink triggers.
---
 ccache.spec | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index d383bf5..621ea6c 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.7
-Release:        2%{?dist}
+Version:        3.1.8
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -123,8 +123,10 @@ done\
 %ccache_trigger -p gcc4-c++ c++4 g++4
 %ccache_trigger -p gcc44 cc4 gcc44
 %ccache_trigger -p gcc44-c++ c++44 g++44
-%ccache_trigger -p mingw32-gcc i686-pc-mingw32-cc i686-pc-mingw32-gcc
-%ccache_trigger -p mingw32-gcc-c++ i686-pc-mingw32-c++ i686-pc-mingw32-g++
+%ccache_trigger -p mingw32-gcc i686-pc-mingw32-cc i686-pc-mingw32-gcc i686-w64-mingw32-gcc
+%ccache_trigger -p mingw32-gcc-c++ i686-pc-mingw32-c++ i686-pc-mingw32-g++ i686-w64-mingw32-c++ i686-w64-mingw32-g++
+%ccache_trigger -p mingw64-gcc i686-w64-mingw32-gcc x86_64-w64-mingw32-gcc
+%ccache_trigger -p mingw64-gcc-c++ i686-w64-mingw32-c++ i686-w64-mingw32-g++ x86_64-w64-mingw32-c++ x86_64-w64-mingw32-g++
 %ccache_trigger -p msp430-gcc msp430-cc msp430-gcc
 
 %pre
@@ -142,6 +144,10 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Aug 18 2012 Ville Skyttä <ville.skytta@iki.fi> - 3.1.8-1
+- Update to 3.1.8, fixes #783971.
+- Update mingw* symlink triggers.
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From 9a15e46e15f3c26ac31c52c8971e41e7b67ce3a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 18 Aug 2012 21:50:29 +0300
Subject: [PATCH 056/153] Upload 3.1.8 tarball.


From 9468031bc46cca61de0f13bd1beacc7f689c42c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 18 Aug 2012 21:51:25 +0300
Subject: [PATCH 057/153] Really upload 3.1.8 tarball.

---
 sources | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources b/sources
index 5a823d8..b6073f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80a698c22d0b06b19c88ac58e8d8b632  ccache-3.1.7.tar.xz
+ffa001305f31f44a3834be7c6c5102c5  ccache-3.1.8.tar.xz

From 21abeb2f9665b0efce1ac21381a9ff28b8b909ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 9 Jan 2013 23:43:05 +0200
Subject: [PATCH 058/153] Update to 3.1.9.

---
 ccache.spec | 5 ++++-
 sources     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 621ea6c..82da1de 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.8
+Version:        3.1.9
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -144,6 +144,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jan  9 2013 Ville Skyttä <ville.skytta@iki.fi> - 3.1.9-1
+- Update to 3.1.9.
+
 * Sat Aug 18 2012 Ville Skyttä <ville.skytta@iki.fi> - 3.1.8-1
 - Update to 3.1.8, fixes #783971.
 - Update mingw* symlink triggers.
diff --git a/sources b/sources
index b6073f5..c2cf9f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffa001305f31f44a3834be7c6c5102c5  ccache-3.1.8.tar.xz
+522a6016bda56892653612bbdefff3e0  ccache-3.1.9.tar.xz

From ca6ecb7dcda758d8dbe78e653a7fa50a26b0a9cb Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 13 Feb 2013 12:17:07 -0600
Subject: [PATCH 059/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 82da1de..35f4f6a 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -144,6 +144,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Wed Jan  9 2013 Ville Skyttä <ville.skytta@iki.fi> - 3.1.9-1
 - Update to 3.1.9.
 

From 54235746b6e986e44e1fc2f3f3a4a0743cc3ed8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 31 Mar 2013 21:45:30 +0300
Subject: [PATCH 060/153] Apply upstream fix for gcc 4.8 test suite failure
 (#913915).

- Add arm-none-eabi and cross-gcc symlink triggers.
- Fix bogus dates in %changelog.
---
 ccache-3.1.9-gcc48-tests.patch | 158 +++++++++++++++++++++++++++++++++
 ccache.spec                    |  47 ++++++++--
 2 files changed, 199 insertions(+), 6 deletions(-)
 create mode 100644 ccache-3.1.9-gcc48-tests.patch

diff --git a/ccache-3.1.9-gcc48-tests.patch b/ccache-3.1.9-gcc48-tests.patch
new file mode 100644
index 0000000..0175e6b
--- /dev/null
+++ b/ccache-3.1.9-gcc48-tests.patch
@@ -0,0 +1,158 @@
+diff -up ccache-3.1.9/test.sh~ ccache-3.1.9/test.sh
+--- ccache-3.1.9/test.sh~	2013-01-06 18:57:59.000000000 +0200
++++ ccache-3.1.9/test.sh	2013-03-31 21:37:24.647552458 +0300
+@@ -3,7 +3,7 @@
+ # A simple test suite for ccache.
+ #
+ # Copyright (C) 2002-2007 Andrew Tridgell
+-# Copyright (C) 2009-2012 Joel Rosdahl
++# Copyright (C) 2009-2013 Joel Rosdahl
+ #
+ # This program is free software; you can redistribute it and/or modify it under
+ # the terms of the GNU General Public License as published by the Free Software
+@@ -562,6 +562,12 @@ int test3;
+ EOF
+     backdate test1.h test2.h test3.h
+ 
++    $COMPILER -c -Wp,-MD,expected.d test.c
++    expected_d_content=`cat expected.d`
++
++    $COMPILER -c -Wp,-MMD,expected_mmd.d test.c
++    expected_mmd_d_content=`cat expected_mmd.d`
++
+     ##################################################################
+     # First compilation is a miss.
+     testname="first compilation"
+@@ -677,7 +683,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     rm -f other.d
+ 
+@@ -685,7 +691,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     rm -f other.d
+ 
+@@ -698,7 +704,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_mmd_d_content"
+ 
+     rm -f other.d
+ 
+@@ -706,7 +712,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_mmd_d_content"
+ 
+     rm -f other.d
+ 
+@@ -760,7 +766,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     rm -f test.d
+ 
+@@ -768,7 +774,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     ##################################################################
+     # Check the scenario of running a ccache with direct mode on a cache
+@@ -780,7 +786,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     rm -f test.d
+ 
+@@ -788,7 +794,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 1
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     rm -f test.d
+ 
+@@ -796,7 +802,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 2
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     rm -f test.d
+ 
+@@ -804,7 +810,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 2
+     checkstat 'cache miss' 1
+-    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile test.d "$expected_d_content"
+ 
+     ##################################################################
+     # Check that -MF works.
+@@ -815,7 +821,7 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     rm -f other.d
+ 
+@@ -823,7 +829,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     ##################################################################
+     # Check that a missing .d file in the cache is handled correctly.
+@@ -835,13 +841,13 @@ EOF
+     checkstat 'cache hit (direct)' 0
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     $CCACHE $COMPILER -c -MD test.c
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 0
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     find $CCACHE_DIR -name '*.d' -exec rm -f '{}' \;
+ 
+@@ -849,7 +855,7 @@ EOF
+     checkstat 'cache hit (direct)' 1
+     checkstat 'cache hit (preprocessed)' 1
+     checkstat 'cache miss' 1
+-    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
++    checkfile other.d "$expected_d_content"
+ 
+     ##################################################################
+     # Check that stderr from both the preprocessor and the compiler is emitted
diff --git a/ccache.spec b/ccache.spec
index 35f4f6a..8abbd17 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -22,6 +22,8 @@ URL:            http://ccache.samba.org/
 Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.xz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
+# From upstream post 3.1.9
+Patch0:         ccache-3.1.9-gcc48-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -38,6 +40,7 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
+%patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -65,8 +68,10 @@ install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
 for n in cc gcc g++ c++ ; do
     ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$n
-    for p in avr- arm-gp2x-linux- msp430- ; do
-        ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$p$n
+    for p in avr arm-gp2x-linux arm-none-eabi msp430 aarch64 alpha arm avr32 \
+        blackfin c6x cris frv h8300 hppa64 ia64 m32r m68k mips64 mn10300 \
+        powerpc64 s390x sh sh64 sparc64 tile x86_64 xtensa ; do
+        ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$p-$n
     done
     for s in 32 34 4 44 ; do
         ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$n$s
@@ -111,6 +116,7 @@ done\
 
 %ccache_trigger -p arm-gp2x-linux-gcc arm-gp2x-linux-cc arm-gp2x-linux-gcc
 %ccache_trigger -p arm-gp2x-linux-gcc-c++ arm-gp2x-linux-c++ arm-gp2x-linux-g++
+%ccache_trigger -p arm-none-eabi-gcc-cs arm-none-eabi-gcc
 %ccache_trigger -p avr-gcc avr-cc avr-gcc
 %ccache_trigger -p avr-gcc-c++ avr-c++ avr-g++
 %ccache_trigger -p compat-gcc-32 cc32 gcc32
@@ -128,6 +134,30 @@ done\
 %ccache_trigger -p mingw64-gcc i686-w64-mingw32-gcc x86_64-w64-mingw32-gcc
 %ccache_trigger -p mingw64-gcc-c++ i686-w64-mingw32-c++ i686-w64-mingw32-g++ x86_64-w64-mingw32-c++ x86_64-w64-mingw32-g++
 %ccache_trigger -p msp430-gcc msp430-cc msp430-gcc
+# cross-gcc
+%ccache_trigger -p gcc-aarch64-linux-gnu aarch64-linux-gnu-gcc
+%ccache_trigger -p gcc-alpha-linux-gnu alpha-linux-gnu-gcc
+%ccache_trigger -p gcc-arm-linux-gnu arm-linux-gnu-gcc
+%ccache_trigger -p gcc-avr32-linux-gnu avr32-linux-gnu-gcc
+%ccache_trigger -p gcc-blackfin-linux-gnu blackfin-linux-gnu-gcc
+%ccache_trigger -p gcc-c6x-linux-gnu c6x-linux-gnu-gcc
+%ccache_trigger -p gcc-cris-linux-gnu cris-linux-gnu-gcc
+%ccache_trigger -p gcc-frv-linux-gnu frv-linux-gnu-gcc
+%ccache_trigger -p gcc-h8300-linux-gnu h8300-linux-gnu-gcc
+%ccache_trigger -p gcc-hppa64-linux-gnu hppa64-linux-gnu-gcc
+%ccache_trigger -p gcc-ia64-linux-gnu ia64-linux-gnu-gcc
+%ccache_trigger -p gcc-m32r-linux-gnu m32r-linux-gnu-gcc
+%ccache_trigger -p gcc-m68k-linux-gnu m68k-linux-gnu-gcc
+%ccache_trigger -p gcc-mips64-linux-gnu mips64-linux-gnu-gcc
+%ccache_trigger -p gcc-mn10300-linux-gnu mn10300-linux-gnu-gcc
+%ccache_trigger -p gcc-powerpc64-linux-gnu powerpc64-linux-gnu-gcc
+%ccache_trigger -p gcc-s390x-linux-gnu s390x-linux-gnu-gcc
+%ccache_trigger -p gcc-sh-linux-gnu sh-linux-gnu-gcc
+%ccache_trigger -p gcc-sh64-linux-gnu sh64-linux-gnu-gcc
+%ccache_trigger -p gcc-sparc64-linux-gnu sparc64-linux-gnu-gcc
+%ccache_trigger -p gcc-tile-linux-gnu tile-linux-gnu-gcc
+%ccache_trigger -p gcc-x86_64-linux-gnu x86_64-linux-gnu-gcc
+%ccache_trigger -p gcc-xtensa-linux-gnu xtensa-linux-gnu-gcc
 
 %pre
 getent group ccache >/dev/null || groupadd -r ccache || :
@@ -144,6 +174,11 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Mar 31 2013 Ville Skyttä <ville.skytta@iki.fi> - 3.1.9-3
+- Apply upstream fix for gcc 4.8 test suite failure (#913915).
+- Add arm-none-eabi and cross-gcc symlink triggers.
+- Fix bogus dates in %%changelog.
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -278,7 +313,7 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 - Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
   bunch of no longer relevant compilers.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
+* Wed Apr  6 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4-2
 - rebuilt
 
 * Sun Sep 26 2004 Ville Skyttä <ville.skytta@iki.fi> - 0:2.4-0.fdr.1
@@ -313,7 +348,7 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 - Use %%{?_smp_mflags}.
 - Other cosmetic specfile tweaks.
 
-* Fri Mar 29 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.5
+* Sat Mar 29 2003 Warren Togami <warren@togami.com> 2.2-0.fdr.5
 - Epoch: 0
 - Remove /usr/lib/ccache/sbin from PATH
 
@@ -364,5 +399,5 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 - Using ccache 2.2.1 sources
 - Changed release to redconcepts for consistency
 
-* Wed Oct 22 2002 Samir M. Nassar <rpm.redconcepts.net> 1.9-1.rcn
+* Tue Oct 22 2002 Samir M. Nassar <rpm.redconcepts.net> 1.9-1.rcn
 - Initial RedConcepts.NET (rcn) build for Red Hat Linux 8.0

From cefa82e3f4a9d63624c9d86708d5cfa1edd54375 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 2 Aug 2013 23:27:34 -0500
Subject: [PATCH 061/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 8abbd17..04f9a5d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -174,6 +174,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Sun Mar 31 2013 Ville Skyttä <ville.skytta@iki.fi> - 3.1.9-3
 - Apply upstream fix for gcc 4.8 test suite failure (#913915).
 - Add arm-none-eabi and cross-gcc symlink triggers.

From f4f8e79a49963369fd4e5ad46ac7d36c3ef0b6b7 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 6 Jun 2014 23:14:07 -0500
Subject: [PATCH 062/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 04f9a5d..f3db64a 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.9
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -174,6 +174,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.9-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 

From 868d1912286f5ea9550a4234d909d8b164206d97 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Fri, 15 Aug 2014 23:40:44 +0000
Subject: [PATCH 063/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index f3db64a..3ee38ce 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -174,6 +174,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.9-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.9-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 23c054fc4ab8e22d3870c1a06f2e5b793d49142b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 10 Sep 2014 22:00:03 +0300
Subject: [PATCH 064/153] Add clang and clang++ symlink triggers (#1140349, Jan
 Kratochvil)

- Mark license files as %license where applicable
---
 ccache.spec | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 3ee38ce..f5ce92d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.1.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -29,7 +29,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
 # coreutils for triggerin, triggerpostun
-Requires: coreutils
+Requires:       coreutils
 
 %description
 ccache is a compiler cache.  It speeds up recompilation of C/C++ code
@@ -81,6 +81,9 @@ for n in cc gcc g++ c++ ; do
             $RPM_BUILD_ROOT%{_libdir}/ccache/$a-%{_vendor}-%{_target_os}-$n
     done
 done
+for n in clang clang++ ; do
+    ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$n
+done
 find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
     sed -e "s|^$RPM_BUILD_ROOT|%%ghost |" > %{name}-%{version}.compilers
 
@@ -158,6 +161,7 @@ done\
 %ccache_trigger -p gcc-tile-linux-gnu tile-linux-gnu-gcc
 %ccache_trigger -p gcc-x86_64-linux-gnu x86_64-linux-gnu-gcc
 %ccache_trigger -p gcc-xtensa-linux-gnu xtensa-linux-gnu-gcc
+%ccache_trigger -p clang clang clang++
 
 %pre
 getent group ccache >/dev/null || groupadd -r ccache || :
@@ -165,7 +169,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
-%doc AUTHORS.* GPL-3.0.txt LICENSE.* MANUAL.* NEWS.* README.*
+%{!?_licensedir:%global license %%doc}
+%license GPL-3.0.txt LICENSE.*
+%doc AUTHORS.*  MANUAL.* NEWS.* README.*
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
@@ -174,6 +180,10 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Sep 10 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.1.9-7
+- Add clang and clang++ symlink triggers (#1140349, Jan Kratochvil)
+- Mark license files as %%license where applicable
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.9-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From 3d19f990ee555e319617fc2cb2d04f4f01a5f71f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 20 Oct 2014 21:12:10 +0300
Subject: [PATCH 065/153] Update to 3.1.10

---
 ccache-3.1.9-gcc48-tests.patch | 158 ---------------------------------
 ccache.spec                    |  10 +--
 sources                        |   2 +-
 3 files changed, 6 insertions(+), 164 deletions(-)
 delete mode 100644 ccache-3.1.9-gcc48-tests.patch

diff --git a/ccache-3.1.9-gcc48-tests.patch b/ccache-3.1.9-gcc48-tests.patch
deleted file mode 100644
index 0175e6b..0000000
--- a/ccache-3.1.9-gcc48-tests.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-diff -up ccache-3.1.9/test.sh~ ccache-3.1.9/test.sh
---- ccache-3.1.9/test.sh~	2013-01-06 18:57:59.000000000 +0200
-+++ ccache-3.1.9/test.sh	2013-03-31 21:37:24.647552458 +0300
-@@ -3,7 +3,7 @@
- # A simple test suite for ccache.
- #
- # Copyright (C) 2002-2007 Andrew Tridgell
--# Copyright (C) 2009-2012 Joel Rosdahl
-+# Copyright (C) 2009-2013 Joel Rosdahl
- #
- # This program is free software; you can redistribute it and/or modify it under
- # the terms of the GNU General Public License as published by the Free Software
-@@ -562,6 +562,12 @@ int test3;
- EOF
-     backdate test1.h test2.h test3.h
- 
-+    $COMPILER -c -Wp,-MD,expected.d test.c
-+    expected_d_content=`cat expected.d`
-+
-+    $COMPILER -c -Wp,-MMD,expected_mmd.d test.c
-+    expected_mmd_d_content=`cat expected_mmd.d`
-+
-     ##################################################################
-     # First compilation is a miss.
-     testname="first compilation"
-@@ -677,7 +683,7 @@ EOF
-     checkstat 'cache hit (direct)' 0
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_d_content"
- 
-     rm -f other.d
- 
-@@ -685,7 +691,7 @@ EOF
-     checkstat 'cache hit (direct)' 1
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_d_content"
- 
-     rm -f other.d
- 
-@@ -698,7 +704,7 @@ EOF
-     checkstat 'cache hit (direct)' 0
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_mmd_d_content"
- 
-     rm -f other.d
- 
-@@ -706,7 +712,7 @@ EOF
-     checkstat 'cache hit (direct)' 1
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_mmd_d_content"
- 
-     rm -f other.d
- 
-@@ -760,7 +766,7 @@ EOF
-     checkstat 'cache hit (direct)' 0
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile test.d "$expected_d_content"
- 
-     rm -f test.d
- 
-@@ -768,7 +774,7 @@ EOF
-     checkstat 'cache hit (direct)' 1
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile test.d "$expected_d_content"
- 
-     ##################################################################
-     # Check the scenario of running a ccache with direct mode on a cache
-@@ -780,7 +786,7 @@ EOF
-     checkstat 'cache hit (direct)' 0
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile test.d "$expected_d_content"
- 
-     rm -f test.d
- 
-@@ -788,7 +794,7 @@ EOF
-     checkstat 'cache hit (direct)' 0
-     checkstat 'cache hit (preprocessed)' 1
-     checkstat 'cache miss' 1
--    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile test.d "$expected_d_content"
- 
-     rm -f test.d
- 
-@@ -796,7 +802,7 @@ EOF
-     checkstat 'cache hit (direct)' 0
-     checkstat 'cache hit (preprocessed)' 2
-     checkstat 'cache miss' 1
--    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile test.d "$expected_d_content"
- 
-     rm -f test.d
- 
-@@ -804,7 +810,7 @@ EOF
-     checkstat 'cache hit (direct)' 1
-     checkstat 'cache hit (preprocessed)' 2
-     checkstat 'cache miss' 1
--    checkfile test.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile test.d "$expected_d_content"
- 
-     ##################################################################
-     # Check that -MF works.
-@@ -815,7 +821,7 @@ EOF
-     checkstat 'cache hit (direct)' 0
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_d_content"
- 
-     rm -f other.d
- 
-@@ -823,7 +829,7 @@ EOF
-     checkstat 'cache hit (direct)' 1
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_d_content"
- 
-     ##################################################################
-     # Check that a missing .d file in the cache is handled correctly.
-@@ -835,13 +841,13 @@ EOF
-     checkstat 'cache hit (direct)' 0
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_d_content"
- 
-     $CCACHE $COMPILER -c -MD test.c
-     checkstat 'cache hit (direct)' 1
-     checkstat 'cache hit (preprocessed)' 0
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_d_content"
- 
-     find $CCACHE_DIR -name '*.d' -exec rm -f '{}' \;
- 
-@@ -849,7 +855,7 @@ EOF
-     checkstat 'cache hit (direct)' 1
-     checkstat 'cache hit (preprocessed)' 1
-     checkstat 'cache miss' 1
--    checkfile other.d "test.o: test.c test1.h test3.h test2.h"
-+    checkfile other.d "$expected_d_content"
- 
-     ##################################################################
-     # Check that stderr from both the preprocessor and the compiler is emitted
diff --git a/ccache.spec b/ccache.spec
index f5ce92d..f114581 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.9
-Release:        7%{?dist}
+Version:        3.1.10
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -22,8 +22,6 @@ URL:            http://ccache.samba.org/
 Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.xz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-# From upstream post 3.1.9
-Patch0:         ccache-3.1.9-gcc48-tests.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
@@ -40,7 +38,6 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
-%patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -180,6 +177,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Oct 20 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.1.10-1
+- Update to 3.1.10
+
 * Wed Sep 10 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.1.9-7
 - Add clang and clang++ symlink triggers (#1140349, Jan Kratochvil)
 - Mark license files as %%license where applicable
diff --git a/sources b/sources
index c2cf9f6..849137e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-522a6016bda56892653612bbdefff3e0  ccache-3.1.9.tar.xz
+20cd43818f84e3208fb4859e9679060e  ccache-3.1.10.tar.xz

From 2c5de1b49e80fcd1f1f6053d05221e15777b70ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 30 Nov 2014 13:09:24 +0200
Subject: [PATCH 066/153] Update to 3.2

---
 ccache.spec | 5 ++++-
 sources     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index f114581..8582baf 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.10
+Version:        3.2
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -177,6 +177,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Nov 30 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.2-1
+- Update to 3.2
+
 * Mon Oct 20 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.1.10-1
 - Update to 3.1.10
 
diff --git a/sources b/sources
index 849137e..7d96975 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20cd43818f84e3208fb4859e9679060e  ccache-3.1.10.tar.xz
+7922ad7b8b44377df78896de8f7b39d1  ccache-3.2.tar.xz

From 5bd8da326627caf19fd6ee858d6ec259b96fb88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 12 Dec 2014 11:01:33 +0200
Subject: [PATCH 067/153] Update to 3.2.1

---
 ccache.spec | 5 ++++-
 sources     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 8582baf..f2f41b8 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.2
+Version:        3.2.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -177,6 +177,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Dec 12 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.2.1-1
+- Update to 3.2.1
+
 * Sun Nov 30 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.2-1
 - Update to 3.2
 
diff --git a/sources b/sources
index 7d96975..5387f13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7922ad7b8b44377df78896de8f7b39d1  ccache-3.2.tar.xz
+d8a7c1d70dbed5dae66620227954ed90  ccache-3.2.1.tar.xz

From 3c8957fb82653292e01e958d89a169630e8530d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 11 May 2015 09:36:00 +0300
Subject: [PATCH 068/153] Update to 3.2.2

- Add bunch of missing cross-gcc and c++ symlink triggers (#1205187)
- Fix cross-gcc symlink ownerships
---
 ccache.spec | 50 ++++++++++++++++++++++++++++++++++++++++++++------
 sources     |  2 +-
 2 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index f2f41b8..903077f 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.2.1
+Version:        3.2.2
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -65,11 +65,14 @@ install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
 for n in cc gcc g++ c++ ; do
     ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$n
-    for p in avr arm-gp2x-linux arm-none-eabi msp430 aarch64 alpha arm avr32 \
-        blackfin c6x cris frv h8300 hppa64 ia64 m32r m68k mips64 mn10300 \
-        powerpc64 s390x sh sh64 sparc64 tile x86_64 xtensa ; do
+    for p in avr arm-gp2x-linux arm-none-eabi msp430 ; do
         ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$p-$n
     done
+    for p in aarch64 alpha arm avr32 bfin c6x cris frv h8300 hppa hppa64 ia64 m32r \
+        m68k microblaze mips64 mn10300 nios2 powerpc64 ppc64 s390x sh sh64 sparc64 \
+        tile x86_64 xtensa ; do
+        ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$p-linux-gnu-$n
+    done
     for s in 32 34 4 44 ; do
         ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$n$s
     done
@@ -119,6 +122,7 @@ done\
 %ccache_trigger -p arm-none-eabi-gcc-cs arm-none-eabi-gcc
 %ccache_trigger -p avr-gcc avr-cc avr-gcc
 %ccache_trigger -p avr-gcc-c++ avr-c++ avr-g++
+%ccache_trigger -p clang clang clang++
 %ccache_trigger -p compat-gcc-32 cc32 gcc32
 %ccache_trigger -p compat-gcc-32-c++ c++32 g++32
 %ccache_trigger -p compat-gcc-34 cc34 gcc34
@@ -136,29 +140,58 @@ done\
 %ccache_trigger -p msp430-gcc msp430-cc msp430-gcc
 # cross-gcc
 %ccache_trigger -p gcc-aarch64-linux-gnu aarch64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-aarch64-linux-gnu aarch64-linux-gnu-c++ aarch64-linux-gnu-g++
 %ccache_trigger -p gcc-alpha-linux-gnu alpha-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-alpha-linux-gnu alpha-linux-gnu-c++ alpha-linux-gnu-g++
 %ccache_trigger -p gcc-arm-linux-gnu arm-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-arm-linux-gnu arm-linux-gnu-c++ arm-linux-gnu-g++
 %ccache_trigger -p gcc-avr32-linux-gnu avr32-linux-gnu-gcc
-%ccache_trigger -p gcc-blackfin-linux-gnu blackfin-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-avr32-linux-gnu avr32-linux-gnu-c++ avr32-linux-gnu-g++
+%ccache_trigger -p gcc-bfin-linux-gnu bfin-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-bfin-linux-gnu bfin-linux-gnu-c++ bfin-linux-gnu-g++
 %ccache_trigger -p gcc-c6x-linux-gnu c6x-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-c6x-linux-gnu c6x-linux-gnu-c++ c6x-linux-gnu-g++
 %ccache_trigger -p gcc-cris-linux-gnu cris-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-cris-linux-gnu cris-linux-gnu-c++ cris-linux-gnu-g++
 %ccache_trigger -p gcc-frv-linux-gnu frv-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-frv-linux-gnu frv-linux-gnu-c++ frv-linux-gnu-g++
 %ccache_trigger -p gcc-h8300-linux-gnu h8300-linux-gnu-gcc
+%ccache_trigger -p gcc-hppa-linux-gnu hppa-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-hppa-linux-gnu hppa-linux-gnu-c++ hppa-linux-gnu-g++
 %ccache_trigger -p gcc-hppa64-linux-gnu hppa64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-hppa64-linux-gnu hppa64-linux-gnu-c++ hppa64-linux-gnu-g++
 %ccache_trigger -p gcc-ia64-linux-gnu ia64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-ia64-linux-gnu ia64-linux-gnu-c++ ia64-linux-gnu-g++
 %ccache_trigger -p gcc-m32r-linux-gnu m32r-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-m32r-linux-gnu m32r-linux-gnu-c++ m32r-linux-gnu-g++
 %ccache_trigger -p gcc-m68k-linux-gnu m68k-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-m68k-linux-gnu m68k-linux-gnu-c++ m68k-linux-gnu-g++
+%ccache_trigger -p gcc-microblaze-linux-gnu microblaze-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-microblaze-linux-gnu microblaze-linux-gnu-c++ microblaze-linux-gnu-g++
 %ccache_trigger -p gcc-mips64-linux-gnu mips64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-mips64-linux-gnu mips64-linux-gnu-c++ mips64-linux-gnu-g++
 %ccache_trigger -p gcc-mn10300-linux-gnu mn10300-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-mn10300-linux-gnu mn10300-linux-gnu-c++ mn10300-linux-gnu-g++
+%ccache_trigger -p gcc-nios2-linux-gnu nios2-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-nios2-linux-gnu nios2-linux-gnu-c++ nios2-linux-gnu-g++
 %ccache_trigger -p gcc-powerpc64-linux-gnu powerpc64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-powerpc64-linux-gnu powerpc64-linux-gnu-c++ powerpc64-linux-gnu-g++
+%ccache_trigger -p gcc-ppc64-linux-gnu ppc64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-ppc64-linux-gnu ppc64-linux-gnu-c++ ppc64-linux-gnu-g++
 %ccache_trigger -p gcc-s390x-linux-gnu s390x-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-s390x-linux-gnu s390x-linux-gnu-c++ s390x-linux-gnu-g++
 %ccache_trigger -p gcc-sh-linux-gnu sh-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-sh-linux-gnu sh-linux-gnu-c++ sh-linux-gnu-g++
 %ccache_trigger -p gcc-sh64-linux-gnu sh64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-sh64-linux-gnu sh64-linux-gnu-c++ sh64-linux-gnu-g++
 %ccache_trigger -p gcc-sparc64-linux-gnu sparc64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-sparc64-linux-gnu sparc64-linux-gnu-c++ sparc64-linux-gnu-g++
 %ccache_trigger -p gcc-tile-linux-gnu tile-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-tile-linux-gnu tile-linux-gnu-c++ tile-linux-gnu-g++
 %ccache_trigger -p gcc-x86_64-linux-gnu x86_64-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-x86_64-linux-gnu x86_64-linux-gnu-c++ x86_64-linux-gnu-g++
 %ccache_trigger -p gcc-xtensa-linux-gnu xtensa-linux-gnu-gcc
-%ccache_trigger -p clang clang clang++
+%ccache_trigger -p gcc-c++-xtensa-linux-gnu xtensa-linux-gnu-c++ xtensa-linux-gnu-g++
 
 %pre
 getent group ccache >/dev/null || groupadd -r ccache || :
@@ -177,6 +210,11 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon May 11 2015 Ville Skyttä <ville.skytta@iki.fi> - 3.2.2-1
+- Update to 3.2.2
+- Add bunch of missing cross-gcc and c++ symlink triggers (#1205187)
+- Fix cross-gcc symlink ownerships
+
 * Fri Dec 12 2014 Ville Skyttä <ville.skytta@iki.fi> - 3.2.1-1
 - Update to 3.2.1
 
diff --git a/sources b/sources
index 5387f13..9f71f57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d8a7c1d70dbed5dae66620227954ed90  ccache-3.2.1.tar.xz
+7e5e6245b21ccc84a66a9c39a83ed8a9  ccache-3.2.2.tar.xz

From 47a6ee45ec692beac285b05ff4b8236e26566a25 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jun 2015 02:24:12 +0000
Subject: [PATCH 069/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 903077f..6b6f1aa 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.2.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -210,6 +210,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Mon May 11 2015 Ville Skyttä <ville.skytta@iki.fi> - 3.2.2-1
 - Update to 3.2.2
 - Add bunch of missing cross-gcc and c++ symlink triggers (#1205187)

From 9d29c2c050cf8765974b95ed4f822a7cbcb8c68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 17 Aug 2015 09:13:25 +0300
Subject: [PATCH 070/153] Update to 3.2.3, fixes #1227819 and #1247493

---
 ccache.spec | 7 +++++--
 sources     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 6b6f1aa..b9064aa 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.2.2
-Release:        2%{?dist}
+Version:        3.2.3
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -210,6 +210,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Aug 17 2015 Ville Skyttä <ville.skytta@iki.fi> - 3.2.3-1
+- Update to 3.2.3, fixes #1227819 and #1247493
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 9f71f57..cacdfe3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7e5e6245b21ccc84a66a9c39a83ed8a9  ccache-3.2.2.tar.xz
+608c78632086a4a051514722d6067a7b  ccache-3.2.3.tar.xz

From 63ddc9086040ace76fc1fd2277f6e75b862c11d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 9 Oct 2015 10:47:10 +0300
Subject: [PATCH 071/153] Update to 3.2.4, specfile cleanups

---
 ccache.spec | 13 +++++--------
 sources     |  2 +-
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index b9064aa..5c6e1b6 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,17 +12,15 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.2.3
+Version:        3.2.4
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
-Group:          Development/Tools
 License:        GPLv3+
 URL:            http://ccache.samba.org/
 Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.xz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
@@ -54,7 +52,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -92,10 +90,6 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
 make check
 
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
-
 %define ccache_trigger(p:) \
 %triggerin -- %{-p*}\
 for n in %* ; do\
@@ -210,6 +204,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Oct  9 2015 Ville Skyttä <ville.skytta@iki.fi> - 3.2.4-1
+- Update to 3.2.4
+
 * Mon Aug 17 2015 Ville Skyttä <ville.skytta@iki.fi> - 3.2.3-1
 - Update to 3.2.3, fixes #1227819 and #1247493
 
diff --git a/sources b/sources
index cacdfe3..09e2998 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-608c78632086a4a051514722d6067a7b  ccache-3.2.3.tar.xz
+1781eec25073765828b874004d944c53  ccache-3.2.4.tar.xz

From 68cff8118fe1fdc0459f36231f96a8c58bae21b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 26 Jan 2016 08:53:44 +0200
Subject: [PATCH 072/153] Remove unnecessary %defattr

---
 ccache.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 5c6e1b6..4944c2f 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.2.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -192,7 +192,6 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %files -f %{name}-%{version}.compilers
-%defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license GPL-3.0.txt LICENSE.*
 %doc AUTHORS.*  MANUAL.* NEWS.* README.*
@@ -204,6 +203,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Jan 26 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.4-2
+- Remove unnecessary %%defattr
+
 * Fri Oct  9 2015 Ville Skyttä <ville.skytta@iki.fi> - 3.2.4-1
 - Update to 3.2.4
 

From af111299e4293055776f409c04dd421492fbe3c0 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 3 Feb 2016 17:29:01 +0000
Subject: [PATCH 073/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 4944c2f..f8f667a 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.2.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -203,6 +203,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Tue Jan 26 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.4-2
 - Remove unnecessary %%defattr
 

From e7beca2373f6373d2631c5b404496dd33b3c1204 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Mon, 18 Apr 2016 16:51:41 +0300
Subject: [PATCH 074/153] Update to 3.2.5

---
 ccache.spec | 8 +++++---
 sources     | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index f8f667a..77c1645 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.2.4
-Release:        3%{?dist}
+Version:        3.2.5
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -192,7 +192,6 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %files -f %{name}-%{version}.compilers
-%{!?_licensedir:%global license %%doc}
 %license GPL-3.0.txt LICENSE.*
 %doc AUTHORS.*  MANUAL.* NEWS.* README.*
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
@@ -203,6 +202,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Apr 18 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.5-1
+- Update to 3.2.5
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 09e2998..e1707c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1781eec25073765828b874004d944c53  ccache-3.2.4.tar.xz
+270c9ad0631c6e34f5fa84f0d9385f95  ccache-3.2.5.tar.xz

From c02f3581ad4e381ed7fe0d6696a75a9484fc5d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 14 Jul 2016 10:48:35 +0300
Subject: [PATCH 075/153] Update to 3.2.6, fixes #1307367

---
 ccache.spec | 5 ++++-
 sources     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 77c1645..68d9161 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.2.5
+Version:        3.2.6
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -202,6 +202,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Jul 14 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.6-1
+- Update to 3.2.6, fixes #1307367
+
 * Mon Apr 18 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.5-1
 - Update to 3.2.5
 
diff --git a/sources b/sources
index e1707c8..6fd65df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-270c9ad0631c6e34f5fa84f0d9385f95  ccache-3.2.5.tar.xz
+aadbf109d1e52ec0cdc67112a517c75e  ccache-3.2.6.tar.xz

From 013a11b2fb53b87524e0d51a3d607e1c4ea08f3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Wed, 20 Jul 2016 19:27:54 +0300
Subject: [PATCH 076/153] Update to 3.2.7, fixes #1307367

- Add nacl*-gcc symlink triggers
---
 ccache.spec | 10 ++++++++--
 sources     |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 68d9161..7e52dac 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.2.6
+Version:        3.2.7
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -132,6 +132,8 @@ done\
 %ccache_trigger -p mingw64-gcc i686-w64-mingw32-gcc x86_64-w64-mingw32-gcc
 %ccache_trigger -p mingw64-gcc-c++ i686-w64-mingw32-c++ i686-w64-mingw32-g++ x86_64-w64-mingw32-c++ x86_64-w64-mingw32-g++
 %ccache_trigger -p msp430-gcc msp430-cc msp430-gcc
+%ccache_trigger -p nacl-arm-gcc arm-nacl-gcc
+%ccache_trigger -p nacl-gcc nacl-gcc nacl-c++ nacl-g++
 # cross-gcc
 %ccache_trigger -p gcc-aarch64-linux-gnu aarch64-linux-gnu-gcc
 %ccache_trigger -p gcc-c++-aarch64-linux-gnu aarch64-linux-gnu-c++ aarch64-linux-gnu-g++
@@ -202,8 +204,12 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 20 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.7-1
+- Update to 3.2.7, fixes #1307367
+- Add nacl*-gcc symlink triggers
+
 * Thu Jul 14 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.6-1
-- Update to 3.2.6, fixes #1307367
+- Update to 3.2.6
 
 * Mon Apr 18 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.5-1
 - Update to 3.2.5
diff --git a/sources b/sources
index 6fd65df..0778b91 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-aadbf109d1e52ec0cdc67112a517c75e  ccache-3.2.6.tar.xz
+d51bff83f656f6a3a58c7e9117d6d8fc  ccache-3.2.7.tar.xz

From 198ce86c203f75feebea2bfeb23d41286b184223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Tue, 26 Jul 2016 17:38:26 +0300
Subject: [PATCH 077/153] Turn on CCACHE_CPP2 by default, fixes #1350086

---
 ccache.csh.in | 3 +++
 ccache.sh.in  | 3 +++
 ccache.spec   | 5 ++++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ccache.csh.in b/ccache.csh.in
index 0f58940..7b2d26d 100644
--- a/ccache.csh.in
+++ b/ccache.csh.in
@@ -25,4 +25,7 @@ else if ( $uid != 0 ) then
     endif
 endif
 
+# CCACHE_HASHDIR: https://bugzilla.redhat.com/show_bug.cgi?id=759592
 setenv CCACHE_HASHDIR
+# CCACHE_CPP2: https://bugzilla.redhat.com/show_bug.cgi?id=1350086
+setenv CCACHE_CPP2
diff --git a/ccache.sh.in b/ccache.sh.in
index 29f8303..bc67069 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -26,4 +26,7 @@ elif [ "${EUID:-}" != 0 ] ; then
     fi
 fi
 
+# CCACHE_HASHDIR: https://bugzilla.redhat.com/show_bug.cgi?id=759592
 export CCACHE_HASHDIR=
+# CCACHE_CPP2: https://bugzilla.redhat.com/show_bug.cgi?id=1350086
+export CCACHE_CPP2=
diff --git a/ccache.spec b/ccache.spec
index 7e52dac..9d3d15b 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -204,6 +204,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Jul 26 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.7-2
+- Turn on CCACHE_CPP2 by default, fixes #1350086
+
 * Wed Jul 20 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.7-1
 - Update to 3.2.7, fixes #1307367
 - Add nacl*-gcc symlink triggers

From ecbe554db74897b93f333f0349324b6e8e31c567 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Wed, 10 Aug 2016 16:04:45 -0600
Subject: [PATCH 078/153] Add needed requires for groupadd

---
 ccache.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 9d3d15b..e203889 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.2.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -26,6 +26,8 @@ BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
 # coreutils for triggerin, triggerpostun
 Requires:       coreutils
+# For groupadd
+Requires(pre):  shadow-utils
 
 %description
 ccache is a compiler cache.  It speeds up recompilation of C/C++ code
@@ -204,6 +206,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Aug 10 2016 Orion Poplawski <orion@cora.nwra.com> - 3.2.7-3
+- Add needed requires for groupadd
+
 * Tue Jul 26 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.2.7-2
 - Turn on CCACHE_CPP2 by default, fixes #1350086
 

From 5cc6db5e26479cb7f94b034b9e6444dbe8654e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 28 Aug 2016 10:27:59 +0300
Subject: [PATCH 079/153] Update to 3.3

---
 ccache.csh.in | 5 -----
 ccache.sh.in  | 5 -----
 ccache.spec   | 8 ++++++--
 sources       | 2 +-
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/ccache.csh.in b/ccache.csh.in
index 7b2d26d..4edbb51 100644
--- a/ccache.csh.in
+++ b/ccache.csh.in
@@ -24,8 +24,3 @@ else if ( $uid != 0 ) then
         unsetenv CCACHE_HARDLINK
     endif
 endif
-
-# CCACHE_HASHDIR: https://bugzilla.redhat.com/show_bug.cgi?id=759592
-setenv CCACHE_HASHDIR
-# CCACHE_CPP2: https://bugzilla.redhat.com/show_bug.cgi?id=1350086
-setenv CCACHE_CPP2
diff --git a/ccache.sh.in b/ccache.sh.in
index bc67069..0ce4d64 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -25,8 +25,3 @@ elif [ "${EUID:-}" != 0 ] ; then
         unset CCACHE_HARDLINK
     fi
 fi
-
-# CCACHE_HASHDIR: https://bugzilla.redhat.com/show_bug.cgi?id=759592
-export CCACHE_HASHDIR=
-# CCACHE_CPP2: https://bugzilla.redhat.com/show_bug.cgi?id=1350086
-export CCACHE_CPP2=
diff --git a/ccache.spec b/ccache.spec
index e203889..a5d114f 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.2.7
-Release:        3%{?dist}
+Version:        3.3
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -123,6 +123,7 @@ done\
 %ccache_trigger -p compat-gcc-32-c++ c++32 g++32
 %ccache_trigger -p compat-gcc-34 cc34 gcc34
 %ccache_trigger -p compat-gcc-34-c++ c++34 g++34
+%ccache_trigger -p compat-gcc-34-g77 f77 g77
 %ccache_trigger -p gcc cc gcc
 %ccache_trigger -p gcc-c++ c++ g++
 %ccache_trigger -p gcc4 cc4 gcc4
@@ -206,6 +207,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Aug 28 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.3-1
+- Update to 3.3
+
 * Wed Aug 10 2016 Orion Poplawski <orion@cora.nwra.com> - 3.2.7-3
 - Add needed requires for groupadd
 
diff --git a/sources b/sources
index 0778b91..81cf1cb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d51bff83f656f6a3a58c7e9117d6d8fc  ccache-3.2.7.tar.xz
+012d68ee4701a5e6227d899f933cb340  ccache-3.3.tar.xz

From 216a049b093aa14a0f6c468d6dac0128c231562c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sun, 28 Aug 2016 10:28:11 +0300
Subject: [PATCH 080/153] Test with clang too

---
 ccache.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ccache.spec b/ccache.spec
index a5d114f..5c16c18 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -24,6 +24,8 @@ Source2:        %{name}.csh.in
 
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
+# clang for additional tests
+BuildRequires:  clang
 # coreutils for triggerin, triggerpostun
 Requires:       coreutils
 # For groupadd
@@ -90,6 +92,7 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
 
 %check
 make check
+make check CC=clang
 
 
 %define ccache_trigger(p:) \

From e79c20c6dee02c9ff8222f176af7fdc867794f9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 8 Sep 2016 10:37:29 +0300
Subject: [PATCH 081/153] Update to 3.3.1, fixes #1373295

---
 ccache.spec | 8 ++++++--
 sources     | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 5c16c18..b085470 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.3
+Version:        3.3.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -201,7 +201,7 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 %files -f %{name}-%{version}.compilers
 %license GPL-3.0.txt LICENSE.*
-%doc AUTHORS.*  MANUAL.* NEWS.* README.*
+%doc AUTHORS.*  MANUAL.* NEWS.* README.md
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
@@ -210,8 +210,12 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Sep  8 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.3.1-1
+- Update to 3.3.1, fixes #1373295
+
 * Sun Aug 28 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.3-1
 - Update to 3.3
+- Run tests with clang too
 
 * Wed Aug 10 2016 Orion Poplawski <orion@cora.nwra.com> - 3.2.7-3
 - Add needed requires for groupadd
diff --git a/sources b/sources
index 81cf1cb..d3f9154 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-012d68ee4701a5e6227d899f933cb340  ccache-3.3.tar.xz
+72a3db9788bcb615b251b4bde7247598  ccache-3.3.1.tar.xz

From 59519dfb90bf3066834c5f1a72d00aebe8a22526 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Thu, 29 Sep 2016 07:20:51 +0300
Subject: [PATCH 082/153] Update to 3.3.2

---
 ccache.spec | 5 ++++-
 sources     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index b085470..0833cce 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.3.1
+Version:        3.3.2
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -210,6 +210,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Sep 29 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.3.2-1
+- Update to 3.3.2
+
 * Thu Sep  8 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.3.1-1
 - Update to 3.3.1, fixes #1373295
 
diff --git a/sources b/sources
index d3f9154..17c641f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72a3db9788bcb615b251b4bde7247598  ccache-3.3.1.tar.xz
+2767d8f88f5ec218983a2f05c9e20df2  ccache-3.3.2.tar.xz

From d590135504c9cf180750c03b4296ad999420603e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Fri, 28 Oct 2016 09:35:33 +0300
Subject: [PATCH 083/153] Update to 3.3.3

---
 ccache.spec | 5 ++++-
 sources     | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 0833cce..92d397f 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.3.2
+Version:        3.3.3
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -210,6 +210,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Oct 28 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.3.3-1
+- Update to 3.3.3
+
 * Thu Sep 29 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.3.2-1
 - Update to 3.3.2
 
diff --git a/sources b/sources
index 17c641f..0b4a027 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2767d8f88f5ec218983a2f05c9e20df2  ccache-3.3.2.tar.xz
+6918b36301a0b8ffdc96549f609a4ebc  ccache-3.3.3.tar.xz

From 213fc049892bf403efdef641d9800f69e2c26cff Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 07:20:01 +0000
Subject: [PATCH 084/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 92d397f..fe43df3 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.3.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -210,6 +210,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Fri Oct 28 2016 Ville Skyttä <ville.skytta@iki.fi> - 3.3.3-1
 - Update to 3.3.3
 

From 1378d94b18ddef5b252d2eeefc18b68d75b9087a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
Date: Sat, 18 Feb 2017 20:45:53 +0200
Subject: [PATCH 085/153] Update to 3.3.4

---
 ccache.spec | 7 +++++--
 sources     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index fe43df3..29a100c 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.3.3
-Release:        2%{?dist}
+Version:        3.3.4
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -210,6 +210,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Feb 18 2017 Ville Skyttä <ville.skytta@iki.fi> - 3.3.4-1
+- Update to 3.3.4
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
diff --git a/sources b/sources
index 0b4a027..b6775e1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6918b36301a0b8ffdc96549f609a4ebc  ccache-3.3.3.tar.xz
+SHA512 (ccache-3.3.4.tar.xz) = 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c

From bebb2b51709366a828abf0b98e9b75d7a155bc22 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Fri, 31 Mar 2017 15:58:41 -0600
Subject: [PATCH 086/153] clang tests fail on EL7, ignore for now

---
 ccache.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 29a100c..3c2de53 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -92,7 +92,8 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
 
 %check
 make check
-make check CC=clang
+# Fails with clang 3.4.2 in EL7
+make check CC=clang %{?el7:|| :}
 
 
 %define ccache_trigger(p:) \

From 65ea6e514fcc7491e8ce11b2464be3728d6af340 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 04:34:30 +0000
Subject: [PATCH 087/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 3c2de53..0387414 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.3.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -211,6 +211,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Sat Feb 18 2017 Ville Skyttä <ville.skytta@iki.fi> - 3.3.4-1
 - Update to 3.3.4
 

From d1ce56c607aa0e5b6a59ff5ce02520d6de1bb7ed Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 2 Aug 2017 18:38:44 +0000
Subject: [PATCH 088/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 0387414..753fbd9 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -211,6 +211,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 9d0234dbe9a6d9199a326fae457ac9de93091055 Mon Sep 17 00:00:00 2001
From: Michael Cullen <michael@cullen-online.com>
Date: Sun, 14 Jan 2018 13:35:08 +0000
Subject: [PATCH 089/153] Update to new version

---
 ccache.spec | 7 +++++--
 sources     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 753fbd9..03933f5 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.3.4
-Release:        3%{?dist}
+Version:        3.3.5
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -211,6 +211,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Jan 14 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.3.5-1
+- Update to new version
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index b6775e1..fb0af9e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.3.4.tar.xz) = 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
+SHA512 (ccache-3.3.5.tar.xz) = 808fa2a72a5e2f4c91d9cee00de9b9691cbb5c6f1350081bdd10cdd34423bc6f3fbc064ed4aa0e5923e585304c287034b452fbc4978e3582bf43f6574666a78b

From 0538fb54acfbe6820bc91a6dfc9f2435c032bd78 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 04:37:52 +0000
Subject: [PATCH 090/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 03933f5..5f02cad 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -211,6 +211,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Sun Jan 14 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.3.5-1
 - Update to new version
 

From 797e3ac73d511df9b978784577aab69bafabcc38 Mon Sep 17 00:00:00 2001
From: Michael Cullen <michael@cullen-online.com>
Date: Fri, 16 Feb 2018 09:04:03 +0000
Subject: [PATCH 091/153] Update to new version

---
 ccache.spec | 9 ++++++---
 sources     | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 5f02cad..1dbc857 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.3.5
-Release:        2%{?dist}
+Version:        3.4.1
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -45,7 +45,7 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE2} > %{name}.csh
 # Make sure system zlib is used
-rm -r zlib
+rm -r src/zlib
 
 
 %build
@@ -211,6 +211,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Feb 16 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.4.1-1
+- Update to new version
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sources b/sources
index fb0af9e..7712f6a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.3.5.tar.xz) = 808fa2a72a5e2f4c91d9cee00de9b9691cbb5c6f1350081bdd10cdd34423bc6f3fbc064ed4aa0e5923e585304c287034b452fbc4978e3582bf43f6574666a78b
+SHA512 (ccache-3.4.1.tar.xz) = ebfa65888c2d8ef87c2e86889723afcc88103af0e73e386ba39f474a7f542712b705a553611a5f51a057c5f056925f10492bb1f3d9b837c9d578d7a913a845de

From b62e36decbdccc7d5e2540787c93e163acdf530e Mon Sep 17 00:00:00 2001
From: Michael Cullen <michael@cullen-online.com>
Date: Wed, 11 Apr 2018 02:43:56 +0100
Subject: [PATCH 092/153] Update to new version

---
 ccache.spec | 7 +++++--
 sources     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 1dbc857..b2a74cf 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.4.1
+Version:        3.4.2
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -202,7 +202,7 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 %files -f %{name}-%{version}.compilers
 %license GPL-3.0.txt LICENSE.*
-%doc AUTHORS.*  MANUAL.* NEWS.* README.md
+%doc doc/AUTHORS.*  doc/MANUAL.* doc/NEWS.* README.md
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
@@ -211,6 +211,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Apr 11 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.4.2-1
+- Update to new version
+
 * Fri Feb 16 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.4.1-1
 - Update to new version
 
diff --git a/sources b/sources
index 7712f6a..1714abc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.4.1.tar.xz) = ebfa65888c2d8ef87c2e86889723afcc88103af0e73e386ba39f474a7f542712b705a553611a5f51a057c5f056925f10492bb1f3d9b837c9d578d7a913a845de
+SHA512 (ccache-3.4.2.tar.xz) = 9bf07269df6785bb92758093f46f3be4df45de532e431e0bc3a68a7170d1782376a9b4495acf77569549062c84f61621c21c5d200e271cd064dbda4a73276f8e

From fc62aad5e1efb81c8890cf60f39b0bbc7aec4b90 Mon Sep 17 00:00:00 2001
From: Michael Cullen <michael.cullen@youview.com>
Date: Mon, 16 Apr 2018 15:55:59 +0100
Subject: [PATCH 093/153] Fix i386 build error

---
 ...am-headless-commit-7091db4cc0286a325.patch | 63 +++++++++++++++++++
 ccache.spec                                   |  9 ++-
 2 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch

diff --git a/0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch b/0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch
new file mode 100644
index 0000000..1317635
--- /dev/null
+++ b/0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch
@@ -0,0 +1,63 @@
+From 5fb7b910512226c487c7cc1fcb546618999e0776 Mon Sep 17 00:00:00 2001
+From: Michael Cullen <michael.cullen@youview.com>
+Date: Mon, 16 Apr 2018 15:39:00 +0100
+Subject: [PATCH] Recreated upstream headless commit
+ 7091db4cc0286a3254107c4f29e3f9b8d183fca1
+
+Upstream referenced a headless commit in https://github.com/ccache/ccache/issues/248
+This recreates it so I can make a patch of it
+---
+ src/cleanup.c            | 7 +++++--
+ test/suites/cleanup.bash | 4 ++--
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/cleanup.c b/src/cleanup.c
+index 8c46eac..a86e1ea 100644
+--- a/src/cleanup.c
++++ b/src/cleanup.c
+@@ -17,6 +17,9 @@
+ 
+ #include "ccache.h"
+ 
++#include <float.h>
++#include <math.h>
++
+ static struct files {
+ 	char *fname;
+ 	time_t mtime;
+@@ -162,8 +165,8 @@ clean_up_dir(struct conf *conf, const char *dir, float limit_multiple)
+ 	// When "max files" or "max cache size" is reached, one of the 16 cache
+ 	// subdirectories is cleaned up. When doing so, files are deleted (in LRU
+ 	// order) until the levels are below limit_multiple.
+-	cache_size_threshold = conf->max_size * limit_multiple / 16;
+-	files_in_cache_threshold = conf->max_files * limit_multiple / 16;
++	cache_size_threshold = roundf(conf->max_size * limit_multiple / 16);
++	files_in_cache_threshold = roundf(conf->max_files * limit_multiple / 16);
+ 
+ 	num_files = 0;
+ 	cache_size = 0;
+diff --git a/test/suites/cleanup.bash b/test/suites/cleanup.bash
+index 8eaac4f..45dccb0 100644
+--- a/test/suites/cleanup.bash
++++ b/test/suites/cleanup.bash
+@@ -152,7 +152,7 @@ SUITE_cleanup() {
+     TEST ".o file is removed before .stderr"
+ 
+     prepare_cleanup_test_dir $CCACHE_DIR/a
+-    $CCACHE -F 474 -M 0 >/dev/null
++    $CCACHE -F 464 -M 0 >/dev/null
+     backdate 0 $CCACHE_DIR/a/result9-4017.stderr
+     $CCACHE -c >/dev/null
+     expect_file_missing $CCACHE_DIR/a/result9-4017.stderr
+@@ -167,7 +167,7 @@ SUITE_cleanup() {
+     TEST ".stderr file is not removed before .o"
+ 
+     prepare_cleanup_test_dir $CCACHE_DIR/a
+-    $CCACHE -F 474 -M 0 >/dev/null
++    $CCACHE -F 464 -M 0 >/dev/null
+     backdate 0 $CCACHE_DIR/a/result9-4017.o
+     $CCACHE -c >/dev/null
+     expect_file_exists $CCACHE_DIR/a/result9-4017.stderr
+-- 
+2.14.3
+
diff --git a/ccache.spec b/ccache.spec
index b2a74cf..7736cce 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.4.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -22,6 +22,9 @@ Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.xz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 
+# Fix 32-bit build error: See https://github.com/ccache/ccache/issues/248
+Patch0:		0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch
+
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
 # clang for additional tests
@@ -40,6 +43,7 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
+%patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -211,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Apr 16 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.4.2-2
+- Fix i386 build error
+
 * Wed Apr 11 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.4.2-1
 - Update to new version
 

From ed0a29f2a06d5b843be5c25f2a8c93d5104eb723 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 12 Jul 2018 21:36:51 +0000
Subject: [PATCH 094/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 7736cce..390c0f1 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.4.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Mon Apr 16 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.4.2-2
 - Fix i386 build error
 

From abaff877b9c2b7ad2acb5c2f9a73a59c38a15420 Mon Sep 17 00:00:00 2001
From: Major Hayden <major@redhat.com>
Date: Tue, 28 Aug 2018 11:49:48 -0500
Subject: [PATCH 095/153] ccache_trigger: Add powerpc64le/ppc64le

Create symlinks for powerpc64le and ppc64le cross compilers.

Signed-off-by: Major Hayden <major@redhat.com>
---
 ccache.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 390c0f1..9ca4b12 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -75,8 +75,8 @@ for n in cc gcc g++ c++ ; do
         ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$p-$n
     done
     for p in aarch64 alpha arm avr32 bfin c6x cris frv h8300 hppa hppa64 ia64 m32r \
-        m68k microblaze mips64 mn10300 nios2 powerpc64 ppc64 s390x sh sh64 sparc64 \
-        tile x86_64 xtensa ; do
+        m68k microblaze mips64 mn10300 nios2 powerpc64 powerpc64le ppc64 ppc64le \
+        s390x sh sh64 sparc64 tile x86_64 xtensa ; do
         ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$p-linux-gnu-$n
     done
     for s in 32 34 4 44 ; do
@@ -183,8 +183,12 @@ done\
 %ccache_trigger -p gcc-c++-nios2-linux-gnu nios2-linux-gnu-c++ nios2-linux-gnu-g++
 %ccache_trigger -p gcc-powerpc64-linux-gnu powerpc64-linux-gnu-gcc
 %ccache_trigger -p gcc-c++-powerpc64-linux-gnu powerpc64-linux-gnu-c++ powerpc64-linux-gnu-g++
+%ccache_trigger -p gcc-powerpc64le-linux-gnu powerpc64le-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-powerpc64le-linux-gnu powerpc64le-linux-gnu-c++ powerpc64le-linux-gnu-g++
 %ccache_trigger -p gcc-ppc64-linux-gnu ppc64-linux-gnu-gcc
 %ccache_trigger -p gcc-c++-ppc64-linux-gnu ppc64-linux-gnu-c++ ppc64-linux-gnu-g++
+%ccache_trigger -p gcc-ppc64le-linux-gnu ppc64le-linux-gnu-gcc
+%ccache_trigger -p gcc-c++-ppc64le-linux-gnu ppc64le-linux-gnu-c++ ppc64le-linux-gnu-g++
 %ccache_trigger -p gcc-s390x-linux-gnu s390x-linux-gnu-gcc
 %ccache_trigger -p gcc-c++-s390x-linux-gnu s390x-linux-gnu-c++ s390x-linux-gnu-g++
 %ccache_trigger -p gcc-sh-linux-gnu sh-linux-gnu-gcc
@@ -215,6 +219,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Aug 28 2018 Major Hayden <major@redhat.com> - 3.4.2-4
+- Added powerpc64le/ppc64le to ccache_trigger list
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 992b28ea699b053bd2b2ad7435b89f30955dc7e1 Mon Sep 17 00:00:00 2001
From: Michael Cullen <michael@cullen-online.com>
Date: Mon, 24 Sep 2018 11:50:41 +0100
Subject: [PATCH 096/153] Update to 3.4.3 (bugfix release)

---
 ccache.spec | 11 +++++------
 sources     |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 9ca4b12..1446787 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.4.2
-Release:        4%{?dist}
+Version:        3.4.3
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -22,9 +22,6 @@ Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.xz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 
-# Fix 32-bit build error: See https://github.com/ccache/ccache/issues/248
-Patch0:		0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch
-
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
 # clang for additional tests
@@ -43,7 +40,6 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
-%patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -219,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Sep 24 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.4.3-1
+- Update to 3.4.3 (bugfix release)
+
 * Tue Aug 28 2018 Major Hayden <major@redhat.com> - 3.4.2-4
 - Added powerpc64le/ppc64le to ccache_trigger list
 
diff --git a/sources b/sources
index 1714abc..e14e7eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.4.2.tar.xz) = 9bf07269df6785bb92758093f46f3be4df45de532e431e0bc3a68a7170d1782376a9b4495acf77569549062c84f61621c21c5d200e271cd064dbda4a73276f8e
+SHA512 (ccache-3.4.3.tar.xz) = 8a92ef3f3b3688bb4c0b39106bea387ec3065a074327c1fa793e511192acd5cf9aeb5c0065ee8868a944ec63463c2b59fb84edd952102468cd12fcbb1ee16c49

From dabcd7b42f00109190f39e3742ed8ea4cee9ceee Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 31 Jan 2019 15:20:23 +0000
Subject: [PATCH 097/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 1446787..788f381 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Sep 24 2018 Michael Cullen <mich181189@fedoraproject.org> - 3.4.3-1
 - Update to 3.4.3 (bugfix release)
 

From d6bd18154fc325e85e3d9396292d6ecb05a807df Mon Sep 17 00:00:00 2001
From: Michael Cullen <michael@cullen-online.com>
Date: Mon, 20 May 2019 20:44:41 +0100
Subject: [PATCH 098/153] Updated to 3.7.1

---
 .gitignore  | 1 +
 ccache.spec | 9 ++++++---
 sources     | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9452199..5a2b3a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /*.tar.xz
+/ccache-3.7.1.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 788f381..8b31e18 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,13 +12,13 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.4.3
-Release:        2%{?dist}
+Version:        3.7.1
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
 URL:            http://ccache.samba.org/
-Source0:        http://samba.org/ftp/ccache/%{name}-%{version}.tar.xz
+Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon May 20 2019 Michael Cullen <mich181189@fedoraproject.org> - 3.7.1-1
+- Updated to 3.7.1
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.4.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index e14e7eb..2f25323 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.4.3.tar.xz) = 8a92ef3f3b3688bb4c0b39106bea387ec3065a074327c1fa793e511192acd5cf9aeb5c0065ee8868a944ec63463c2b59fb84edd952102468cd12fcbb1ee16c49
+SHA512 (ccache-3.7.1.tar.gz) = b4fc8f9efb973881b6732a0fcb22c1fa50799984e08030327ded7678fe204fb389ab06d75fb2d8e90bc88e4c00c55f68d42cb8acddb75056b8c67c790ecf0446

From b82af359464a364a1732122215178f7e3e527b16 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 24 Jul 2019 19:59:35 +0000
Subject: [PATCH 099/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 8b31e18..b0ff93c 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Mon May 20 2019 Michael Cullen <mich181189@fedoraproject.org> - 3.7.1-1
 - Updated to 3.7.1
 

From 89b2f4277a406d239322e4cad3575ed0cede6347 Mon Sep 17 00:00:00 2001
From: Michael Cullen <michael@cullen-online.com>
Date: Thu, 24 Oct 2019 17:20:59 +0100
Subject: [PATCH 100/153] Updated to 3.7.5 Updated upstream URL

---
 .gitignore  |  1 +
 ccache.spec | 10 +++++++---
 sources     |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5a2b3a7..3e2d187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /*.tar.xz
 /ccache-3.7.1.tar.gz
+/ccache-3.7.5.tar.gz
diff --git a/ccache.spec b/ccache.spec
index b0ff93c..49992af 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,12 +12,12 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.7.1
-Release:        2%{?dist}
+Version:        3.7.5
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
-URL:            http://ccache.samba.org/
+URL:            http://ccache.dev/
 Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
@@ -215,6 +215,10 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Oct 24 2019 Michael Cullen <mich181189@fedoraproject.org> - 3.7.5-1
+- Updated to 3.7.5
+- Updated upstream URL
+
 * Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 2f25323..b2cfda9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.7.1.tar.gz) = b4fc8f9efb973881b6732a0fcb22c1fa50799984e08030327ded7678fe204fb389ab06d75fb2d8e90bc88e4c00c55f68d42cb8acddb75056b8c67c790ecf0446
+SHA512 (ccache-3.7.5.tar.gz) = 53a47aaf904474ad350a14b01183042eb6215c8e6f5752ccc2920aa32529df7acf8fd8c0308940feafae55131810c2f46f2357a4fbed17b09ae8a6d6d2a62872

From 8a602449011df1a99208f07330afe10b670d91dd Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Thu, 21 Nov 2019 10:18:53 +0100
Subject: [PATCH 101/153] Update to 3.7.6

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 49992af..d155b2f 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.7.5
+Version:        3.7.6
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Nov 21 2019 LuK1337 <priv.luk@gmail.com> - 3.7.6-1
+- Updated to 3.7.6
+
 * Thu Oct 24 2019 Michael Cullen <mich181189@fedoraproject.org> - 3.7.5-1
 - Updated to 3.7.5
 - Updated upstream URL

From 2f53b4b76009628b29f1cd2e97a46fb7ec97e5b9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Mon, 25 Nov 2019 07:35:44 -0700
Subject: [PATCH 102/153] Upload new source

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3e2d187..ce192b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /*.tar.xz
 /ccache-3.7.1.tar.gz
 /ccache-3.7.5.tar.gz
+/ccache-3.7.6.tar.gz
diff --git a/sources b/sources
index b2cfda9..8bd0db4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.7.5.tar.gz) = 53a47aaf904474ad350a14b01183042eb6215c8e6f5752ccc2920aa32529df7acf8fd8c0308940feafae55131810c2f46f2357a4fbed17b09ae8a6d6d2a62872
+SHA512 (ccache-3.7.6.tar.gz) = eb39fcc50ce23dcda73e83e4fb5e64337924890969521d7dbbb4128704097bc5d51cb739bcef0695c9dfa56c3224788f680bc62bf1f060a136462daed3c9eb1b

From f56e5e6bb184e5db7bb35db7b6e63078c87dabd0 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 28 Jan 2020 13:44:53 +0000
Subject: [PATCH 103/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index d155b2f..7232cb4 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.7.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Nov 21 2019 LuK1337 <priv.luk@gmail.com> - 3.7.6-1
 - Updated to 3.7.6
 

From 9cbf3eb42632c0e91a56eceb474d116ce237872f Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@cora.nwra.com>
Date: Tue, 18 Feb 2020 21:41:29 -0700
Subject: [PATCH 104/153] Update to 3.7.7

---
 .gitignore  | 1 +
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index ce192b6..524e337 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /ccache-3.7.1.tar.gz
 /ccache-3.7.5.tar.gz
 /ccache-3.7.6.tar.gz
+/ccache-3.7.7.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 7232cb4..c8b775b 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.7.6
-Release:        2%{?dist}
+Version:        3.7.7
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Feb 18 2020 Orion Poplawski <orion@nwra.com> - 3.7.7-1
+- Update to 3.7.7
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.6-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 8bd0db4..1dd906c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.7.6.tar.gz) = eb39fcc50ce23dcda73e83e4fb5e64337924890969521d7dbbb4128704097bc5d51cb739bcef0695c9dfa56c3224788f680bc62bf1f060a136462daed3c9eb1b
+SHA512 (ccache-3.7.7.tar.gz) = c079c94bc7edb7e17eb2650f4775fa53e1f6807fd2e1ce1f3b0dfc96b5de658787688876aaeacde2648dd8972191f1a1a99aaf4ab9114ae85ffbcff73445a99f

From 61aac70249c20d366cfd34845f853066d622a3ff Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Thu, 26 Mar 2020 10:55:51 +0100
Subject: [PATCH 105/153] Update to 3.7.8

* Also remove unused patch file while at it.
---
 .gitignore                                    |  1 +
 ...am-headless-commit-7091db4cc0286a325.patch | 63 -------------------
 ...ove-incorrect-result-check-in-format.patch | 38 +++++++++++
 ccache.spec                                   |  9 ++-
 sources                                       |  2 +-
 5 files changed, 48 insertions(+), 65 deletions(-)
 delete mode 100644 0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch
 create mode 100644 0001-Remove-incorrect-result-check-in-format.patch

diff --git a/.gitignore b/.gitignore
index 524e337..02d46e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /ccache-3.7.5.tar.gz
 /ccache-3.7.6.tar.gz
 /ccache-3.7.7.tar.gz
+/ccache-3.7.8.tar.gz
diff --git a/0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch b/0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch
deleted file mode 100644
index 1317635..0000000
--- a/0001-Recreated-upstream-headless-commit-7091db4cc0286a325.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 5fb7b910512226c487c7cc1fcb546618999e0776 Mon Sep 17 00:00:00 2001
-From: Michael Cullen <michael.cullen@youview.com>
-Date: Mon, 16 Apr 2018 15:39:00 +0100
-Subject: [PATCH] Recreated upstream headless commit
- 7091db4cc0286a3254107c4f29e3f9b8d183fca1
-
-Upstream referenced a headless commit in https://github.com/ccache/ccache/issues/248
-This recreates it so I can make a patch of it
----
- src/cleanup.c            | 7 +++++--
- test/suites/cleanup.bash | 4 ++--
- 2 files changed, 7 insertions(+), 4 deletions(-)
-
-diff --git a/src/cleanup.c b/src/cleanup.c
-index 8c46eac..a86e1ea 100644
---- a/src/cleanup.c
-+++ b/src/cleanup.c
-@@ -17,6 +17,9 @@
- 
- #include "ccache.h"
- 
-+#include <float.h>
-+#include <math.h>
-+
- static struct files {
- 	char *fname;
- 	time_t mtime;
-@@ -162,8 +165,8 @@ clean_up_dir(struct conf *conf, const char *dir, float limit_multiple)
- 	// When "max files" or "max cache size" is reached, one of the 16 cache
- 	// subdirectories is cleaned up. When doing so, files are deleted (in LRU
- 	// order) until the levels are below limit_multiple.
--	cache_size_threshold = conf->max_size * limit_multiple / 16;
--	files_in_cache_threshold = conf->max_files * limit_multiple / 16;
-+	cache_size_threshold = roundf(conf->max_size * limit_multiple / 16);
-+	files_in_cache_threshold = roundf(conf->max_files * limit_multiple / 16);
- 
- 	num_files = 0;
- 	cache_size = 0;
-diff --git a/test/suites/cleanup.bash b/test/suites/cleanup.bash
-index 8eaac4f..45dccb0 100644
---- a/test/suites/cleanup.bash
-+++ b/test/suites/cleanup.bash
-@@ -152,7 +152,7 @@ SUITE_cleanup() {
-     TEST ".o file is removed before .stderr"
- 
-     prepare_cleanup_test_dir $CCACHE_DIR/a
--    $CCACHE -F 474 -M 0 >/dev/null
-+    $CCACHE -F 464 -M 0 >/dev/null
-     backdate 0 $CCACHE_DIR/a/result9-4017.stderr
-     $CCACHE -c >/dev/null
-     expect_file_missing $CCACHE_DIR/a/result9-4017.stderr
-@@ -167,7 +167,7 @@ SUITE_cleanup() {
-     TEST ".stderr file is not removed before .o"
- 
-     prepare_cleanup_test_dir $CCACHE_DIR/a
--    $CCACHE -F 474 -M 0 >/dev/null
-+    $CCACHE -F 464 -M 0 >/dev/null
-     backdate 0 $CCACHE_DIR/a/result9-4017.o
-     $CCACHE -c >/dev/null
-     expect_file_exists $CCACHE_DIR/a/result9-4017.stderr
--- 
-2.14.3
-
diff --git a/0001-Remove-incorrect-result-check-in-format.patch b/0001-Remove-incorrect-result-check-in-format.patch
new file mode 100644
index 0000000..8d07184
--- /dev/null
+++ b/0001-Remove-incorrect-result-check-in-format.patch
@@ -0,0 +1,38 @@
+From 0b1a0d78bfaac9321fc077464002bd42e6f15e5e Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Tue, 24 Mar 2020 21:33:56 +0100
+Subject: [PATCH] Remove incorrect result check in `format`
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+`format` considers a zero-length result (e.g. from `format("%s", "")`)
+to be a fatal error. The check originates from 0a7cea64 where it was
+appropriate but become incorrect later when refactoring the original
+`x_asprintf2` function to `format`.
+
+I can’t find any call to `format` that would trigger this edge case, but
+let’s remove the erroneous check anyway.
+
+Related to #568.
+---
+ src/util.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/util.c b/src/util.c
+index b6cce75..0fd3f0f 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -703,9 +703,6 @@ format(const char *format, ...)
+ 	}
+ 	va_end(ap);
+ 
+-	if (!*ptr) {
+-		fatal("Internal error in format");
+-	}
+ 	return ptr;
+ }
+ 
+-- 
+2.25.1
+
diff --git a/ccache.spec b/ccache.spec
index c8b775b..32689aa 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.7.7
+Version:        3.7.8
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -22,6 +22,9 @@ Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 
+# Fix AOSP build error: See https://github.com/ccache/ccache/issues/568
+Patch0:         0001-Remove-incorrect-result-check-in-format.patch
+
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
 # clang for additional tests
@@ -40,6 +43,7 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
+%patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -215,6 +219,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Mar 26 2020 LuK1337 <priv.luk@gmail.com> - 3.7.8-1
+- Update to 3.7.8
+
 * Tue Feb 18 2020 Orion Poplawski <orion@nwra.com> - 3.7.7-1
 - Update to 3.7.7
 
diff --git a/sources b/sources
index 1dd906c..08997f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.7.7.tar.gz) = c079c94bc7edb7e17eb2650f4775fa53e1f6807fd2e1ce1f3b0dfc96b5de658787688876aaeacde2648dd8972191f1a1a99aaf4ab9114ae85ffbcff73445a99f
+SHA512 (ccache-3.7.8.tar.gz) = 1de67ddf453dd8d46d33d82c120107e915da32cb0f96e8554f159203f60ebe9695c1bde9145294048520c4c562149a050b9d687901582bafb4d55e0d635a609e

From 14892db16df4d9a5917f033d786e552d9e7b70b3 Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Mon, 30 Mar 2020 21:02:34 +0200
Subject: [PATCH 106/153] Update to 3.7.9

---
 .gitignore                                    |  1 +
 ...ove-incorrect-result-check-in-format.patch | 38 -------------------
 ccache.spec                                   |  9 ++---
 sources                                       |  2 +-
 4 files changed, 6 insertions(+), 44 deletions(-)
 delete mode 100644 0001-Remove-incorrect-result-check-in-format.patch

diff --git a/.gitignore b/.gitignore
index 02d46e5..cf5253c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /ccache-3.7.6.tar.gz
 /ccache-3.7.7.tar.gz
 /ccache-3.7.8.tar.gz
+/ccache-3.7.9.tar.gz
diff --git a/0001-Remove-incorrect-result-check-in-format.patch b/0001-Remove-incorrect-result-check-in-format.patch
deleted file mode 100644
index 8d07184..0000000
--- a/0001-Remove-incorrect-result-check-in-format.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0b1a0d78bfaac9321fc077464002bd42e6f15e5e Mon Sep 17 00:00:00 2001
-From: Joel Rosdahl <joel@rosdahl.net>
-Date: Tue, 24 Mar 2020 21:33:56 +0100
-Subject: [PATCH] Remove incorrect result check in `format`
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-`format` considers a zero-length result (e.g. from `format("%s", "")`)
-to be a fatal error. The check originates from 0a7cea64 where it was
-appropriate but become incorrect later when refactoring the original
-`x_asprintf2` function to `format`.
-
-I can’t find any call to `format` that would trigger this edge case, but
-let’s remove the erroneous check anyway.
-
-Related to #568.
----
- src/util.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/util.c b/src/util.c
-index b6cce75..0fd3f0f 100644
---- a/src/util.c
-+++ b/src/util.c
-@@ -703,9 +703,6 @@ format(const char *format, ...)
- 	}
- 	va_end(ap);
- 
--	if (!*ptr) {
--		fatal("Internal error in format");
--	}
- 	return ptr;
- }
- 
--- 
-2.25.1
-
diff --git a/ccache.spec b/ccache.spec
index 32689aa..f48241c 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.7.8
+Version:        3.7.9
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -22,9 +22,6 @@ Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 
-# Fix AOSP build error: See https://github.com/ccache/ccache/issues/568
-Patch0:         0001-Remove-incorrect-result-check-in-format.patch
-
 BuildRequires:  perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
 # clang for additional tests
@@ -43,7 +40,6 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
-%patch0 -p1
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -219,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Mar 30 2020 LuK1337 <priv.luk@gmail.com> - 3.7.9-1
+- Update to 3.7.9
+
 * Thu Mar 26 2020 LuK1337 <priv.luk@gmail.com> - 3.7.8-1
 - Update to 3.7.8
 
diff --git a/sources b/sources
index 08997f5..80c8a0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.7.8.tar.gz) = 1de67ddf453dd8d46d33d82c120107e915da32cb0f96e8554f159203f60ebe9695c1bde9145294048520c4c562149a050b9d687901582bafb4d55e0d635a609e
+SHA512 (ccache-3.7.9.tar.gz) = c5af4dcbd0d0b768700780ad0706abb94bffe333fa6f1801de19aa925f3d33e3206d4bd96561ed9e8ce3761dfa8a2bb380c346d1638c030b82afd8c3ce3d8817

From 7e4de06e6d6d8ad55ec5613d6ab76592e62ee3cd Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Mon, 27 Jul 2020 13:44:22 +0000
Subject: [PATCH 107/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index f48241c..d88bc1d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.7.9
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Mon Mar 30 2020 LuK1337 <priv.luk@gmail.com> - 3.7.9-1
 - Update to 3.7.9
 

From 241a0cb76ea7a7f6bfe72bde27b134a0b8cd8f4e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 1 Aug 2020 00:19:33 +0000
Subject: [PATCH 108/153] - Second attempt - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index d88bc1d..79aa02f 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.7.9
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -215,6 +215,10 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.9-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

From c51b18141c140c9c2cb1a506af7d30e94b3bedb1 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Fri, 7 Aug 2020 14:39:02 -0600
Subject: [PATCH 109/153] Depend on perl

---
 ccache.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 79aa02f..3ce1e74 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        3.7.9
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -22,7 +22,7 @@ Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 
-BuildRequires:  perl(File::Spec)
+BuildRequires:  perl perl(File::Spec)
 BuildRequires:  zlib-devel >= 1.2.3
 # clang for additional tests
 BuildRequires:  clang
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Aug 07 2020 Jeff Law <law@redhat.com> - 3.7.9-4
+- Depend on perl
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.7.9-3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

From ab2b3dc2d7583868b564ca8d1a72825bef150e0e Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sat, 15 Aug 2020 16:49:24 -0600
Subject: [PATCH 110/153] Update to 3.7.11

---
 .gitignore  | 1 +
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index cf5253c..1c8fedd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /ccache-3.7.7.tar.gz
 /ccache-3.7.8.tar.gz
 /ccache-3.7.9.tar.gz
+/ccache-3.7.11.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 3ce1e74..ead7fd6 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.7.9
-Release:        4%{?dist}
+Version:        3.7.11
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Aug 15 2020 Orion Poplawski <orion@nwra.com> - 3.7.11-1
+- Update to 3.7.11
+
 * Fri Aug 07 2020 Jeff Law <law@redhat.com> - 3.7.9-4
 - Depend on perl
 
diff --git a/sources b/sources
index 80c8a0f..73de9eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.7.9.tar.gz) = c5af4dcbd0d0b768700780ad0706abb94bffe333fa6f1801de19aa925f3d33e3206d4bd96561ed9e8ce3761dfa8a2bb380c346d1638c030b82afd8c3ce3d8817
+SHA512 (ccache-3.7.11.tar.gz) = afcd247b64f21cd62bd9a1ff99b1741f4350780db237366c3bd73b8db4acc95f553a935d12e529e82531f5cb999dbbd98d022c4447b707f5756eadcfab4901d0

From d1960b2cb8a7755932a1cdc99332299b9940382e Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 1 Oct 2020 20:00:06 -0600
Subject: [PATCH 111/153] Update to 3.7.12

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c8fedd..8df6779 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /ccache-3.7.8.tar.gz
 /ccache-3.7.9.tar.gz
 /ccache-3.7.11.tar.gz
+/ccache-3.7.12.tar.gz
diff --git a/ccache.spec b/ccache.spec
index ead7fd6..0879a44 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.7.11
+Version:        3.7.12
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -215,6 +215,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Oct  1 2020 Orion Poplawski <orion@nwra.com> - 3.7.12-1
+- Update to 3.7.12
+
 * Sat Aug 15 2020 Orion Poplawski <orion@nwra.com> - 3.7.11-1
 - Update to 3.7.11
 
diff --git a/sources b/sources
index 73de9eb..891ad0f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.7.11.tar.gz) = afcd247b64f21cd62bd9a1ff99b1741f4350780db237366c3bd73b8db4acc95f553a935d12e529e82531f5cb999dbbd98d022c4447b707f5756eadcfab4901d0
+SHA512 (ccache-3.7.12.tar.gz) = 1de2dcb6568486d82b589e35f46e7f24306821545617cb9e991c1122b257d2872c1f342fd941f98777ebfd5b0b0babc45a33d824925759478f1f67370db3dd3c

From a1bac92a9c6992a31c1881dac3c1ceb63976b7ca Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Tue, 27 Oct 2020 21:08:39 +0100
Subject: [PATCH 112/153] Update to 4.0

---
 ccache.spec | 26 +++++++++++++++-----------
 sources     |  2 +-
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 0879a44..324c910 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.7.12
+Version:        4.0
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -22,10 +22,12 @@ Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 
+BuildRequires:  asciidoc
+BuildRequires:  cmake
+BuildRequires:  libzstd-devel
 BuildRequires:  perl perl(File::Spec)
-BuildRequires:  zlib-devel >= 1.2.3
 # clang for additional tests
-BuildRequires:  clang
+BuildRequires:  clang clang-tools-extra
 # coreutils for triggerin, triggerpostun
 Requires:       coreutils
 # For groupadd
@@ -44,19 +46,20 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE2} > %{name}.csh
-# Make sure system zlib is used
-rm -r src/zlib
 
 
 %build
-%configure
-make %{?_smp_mflags}
+%cmake
+%cmake_build
+%cmake_build --target doc
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%make_install
+%cmake_install
+
+install -Dpm 644 %{__cmake_builddir}/doc/Ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -91,9 +94,7 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
 
 
 %check
-make check
-# Fails with clang 3.4.2 in EL7
-make check CC=clang %{?el7:|| :}
+%ctest
 
 
 %define ccache_trigger(p:) \
@@ -215,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Oct 27 2020 Łukasz Patron <priv.luk@gmail.com> - 4.0-1
+- Update to 4.0
+
 * Thu Oct  1 2020 Orion Poplawski <orion@nwra.com> - 3.7.12-1
 - Update to 3.7.12
 
diff --git a/sources b/sources
index 891ad0f..9bc48ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-3.7.12.tar.gz) = 1de2dcb6568486d82b589e35f46e7f24306821545617cb9e991c1122b257d2872c1f342fd941f98777ebfd5b0b0babc45a33d824925759478f1f67370db3dd3c
+SHA512 (ccache-4.0.tar.gz) = b87d8f2bc349f764ae77e4994409e38bbe1cbe3ecfd66e7af445c5aed28dde701cec2bc31b41cacaa20336c9299b0bb4c4a94f806e8473ceb115f591a03bbab3

From 6d2e085d4ef295f75bc2e2e1103e564f5e6903b3 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 24 Jan 2021 12:24:16 -0700
Subject: [PATCH 113/153] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 8df6779..71c3907 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /ccache-3.7.9.tar.gz
 /ccache-3.7.11.tar.gz
 /ccache-3.7.12.tar.gz
+/ccache-4.0.tar.gz

From 5a2b8eb5c74547241f010d05522df37045aef13f Mon Sep 17 00:00:00 2001
From: LuK1337 <priv.luk@gmail.com>
Date: Sat, 2 Jan 2021 13:47:19 +0100
Subject: [PATCH 114/153] Update to 4.1

---
 ccache.spec | 7 +++++--
 sources     | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 324c910..425ddab 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.0
+Version:        4.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -59,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %cmake_install
 
-install -Dpm 644 %{__cmake_builddir}/doc/Ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1
+install -Dpm 644 %{__cmake_builddir}/doc/ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Jan 02 2021 Łukasz Patron <priv.luk@gmail.com> - 4.1-1
+- Update to 4.1
+
 * Tue Oct 27 2020 Łukasz Patron <priv.luk@gmail.com> - 4.0-1
 - Update to 4.0
 
diff --git a/sources b/sources
index 9bc48ad..a64075e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.0.tar.gz) = b87d8f2bc349f764ae77e4994409e38bbe1cbe3ecfd66e7af445c5aed28dde701cec2bc31b41cacaa20336c9299b0bb4c4a94f806e8473ceb115f591a03bbab3
+SHA512 (ccache-4.1.tar.gz) = 3750d1decee3bfbf2ebadc11db57e03bee5ec4ce3be75a035d795898992572f98178dca639acdd9c6e48759a1819bf8a0294126a9de58784bc9eecfb119f3423

From f86bb4a527805c049a7d6f5bd5c3531586cc0129 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 24 Jan 2021 12:27:07 -0700
Subject: [PATCH 115/153] Update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 71c3907..8738696 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /ccache-3.7.11.tar.gz
 /ccache-3.7.12.tar.gz
 /ccache-4.0.tar.gz
+/ccache-4.1.tar.gz

From 902d1537033e6d6190ea366864e0148a5b93a84f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 26 Jan 2021 01:44:29 +0000
Subject: [PATCH 116/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 425ddab..d96225d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Sat Jan 02 2021 Łukasz Patron <priv.luk@gmail.com> - 4.1-1
 - Update to 4.1
 

From 567b2baa7f9e02f9995bb6511828edf426994ad0 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Tue, 2 Feb 2021 19:42:43 -0700
Subject: [PATCH 117/153] Update to 4.2

---
 .gitignore  | 1 +
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8738696..faa8a5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /ccache-3.7.12.tar.gz
 /ccache-4.0.tar.gz
 /ccache-4.1.tar.gz
+/ccache-4.2.tar.gz
diff --git a/ccache.spec b/ccache.spec
index d96225d..9068e9d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.1
-Release:        2%{?dist}
+Version:        4.2
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Feb 03 2021 Orion Poplawski <orion@nwra.com> - 4.2-1
+- Update to 4.2
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index a64075e..e7aeb70 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.1.tar.gz) = 3750d1decee3bfbf2ebadc11db57e03bee5ec4ce3be75a035d795898992572f98178dca639acdd9c6e48759a1819bf8a0294126a9de58784bc9eecfb119f3423
+SHA512 (ccache-4.2.tar.gz) = 013ae253e8613ce6d9bfc760424a36f7b70e7f003275f2d0dd6f365bcd9fc5e502fd25892f8c7f4cbf9eb0fc837f7f05baca9d2d8ba7c4dea615cab03302744b

From 520cf67553880b7ad5ec04a76a3de6200d92d6d1 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 1 Apr 2021 21:41:10 -0600
Subject: [PATCH 118/153] Update to 4.2.1

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index faa8a5a..976667d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /ccache-4.0.tar.gz
 /ccache-4.1.tar.gz
 /ccache-4.2.tar.gz
+/ccache-4.2.1.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 9068e9d..746f0e7 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.2
+Version:        4.2.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Apr 02 2021 Orion Poplawski <orion@nwra.com> - 4.2.1-1
+- Update to 4.2.1
+
 * Wed Feb 03 2021 Orion Poplawski <orion@nwra.com> - 4.2-1
 - Update to 4.2
 
diff --git a/sources b/sources
index e7aeb70..93697e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.2.tar.gz) = 013ae253e8613ce6d9bfc760424a36f7b70e7f003275f2d0dd6f365bcd9fc5e502fd25892f8c7f4cbf9eb0fc837f7f05baca9d2d8ba7c4dea615cab03302744b
+SHA512 (ccache-4.2.1.tar.gz) = 0e0e0de9401000be06ee1d728348dfbc70b8f228186fd065f5ae8b6100c5cebc9bae6d187a21fcb0fb0263fcfc9415832ee473ca383710bdbdb664baac6d54c2

From fc38991e1a3f2aa02d8d6a9eeb8cfe9f4c6c013d Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 14:16:37 +0000
Subject: [PATCH 119/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

From c7749c300167434a57698325529daa21dc0fcaa6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 21 Jul 2021 19:14:02 +0000
Subject: [PATCH 120/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 746f0e7..3c107eb 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -216,6 +216,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Fri Apr 02 2021 Orion Poplawski <orion@nwra.com> - 4.2.1-1
 - Update to 4.2.1
 

From 78add71f2109ac05b68568ff6b9becde0de6e704 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 27 Oct 2021 08:47:21 -0600
Subject: [PATCH 121/153] Update to 4.4.2

---
 .gitignore  |  1 +
 ccache.spec | 10 +++++++---
 sources     |  2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 976667d..5308c65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /ccache-4.1.tar.gz
 /ccache-4.2.tar.gz
 /ccache-4.2.1.tar.gz
+/ccache-4.4.2.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 3c107eb..cd6dde5 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.2.1
-Release:        2%{?dist}
+Version:        4.4.2
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -22,8 +22,9 @@ Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
 
-BuildRequires:  asciidoc
+BuildRequires:  /usr/bin/asciidoctor
 BuildRequires:  cmake
+BuildRequires:  hiredis-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl perl(File::Spec)
 # clang for additional tests
@@ -216,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Oct 27 2021 Orion Poplawski <orion@nwra.com> - 4.4.2-1
+- Update to 4.4.2
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index 93697e2..aedd318 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.2.1.tar.gz) = 0e0e0de9401000be06ee1d728348dfbc70b8f228186fd065f5ae8b6100c5cebc9bae6d187a21fcb0fb0263fcfc9415832ee473ca383710bdbdb664baac6d54c2
+SHA512 (ccache-4.4.2.tar.gz) = e99f622aa79f9d7e4cc079dbbc2b12a66ff26425495af30d7db2073cad79506e839dff20aada5198d076015c98f1a04b1e70b4720016aed6163383978bb8401a

From 6aabb7df35b3297e5fb6e143d26f6632456f41e9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 5 Dec 2021 15:46:56 -0700
Subject: [PATCH 122/153] Update to 4.5.1

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5308c65..21a8290 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /ccache-4.2.tar.gz
 /ccache-4.2.1.tar.gz
 /ccache-4.4.2.tar.gz
+/ccache-4.5.1.tar.gz
diff --git a/ccache.spec b/ccache.spec
index cd6dde5..a5034ab 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.4.2
+Version:        4.5.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Dec 05 2021 Orion Poplawski <orion@nwra.com> - 4.5.1-1
+- Update to 4.5.1
+
 * Wed Oct 27 2021 Orion Poplawski <orion@nwra.com> - 4.4.2-1
 - Update to 4.4.2
 
diff --git a/sources b/sources
index aedd318..1f2d067 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.4.2.tar.gz) = e99f622aa79f9d7e4cc079dbbc2b12a66ff26425495af30d7db2073cad79506e839dff20aada5198d076015c98f1a04b1e70b4720016aed6163383978bb8401a
+SHA512 (ccache-4.5.1.tar.gz) = b59ea1811ea6105f4d7a844075d3e5e49ee3aadf81effacd3540bc04f786ee03f5eab4132020964609738afc2af3f0deee33f05949209a00d366c355cfb9795b

From 044bc21dffd4f3acc74d9a9bc975502271e394ab Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 17 Jan 2022 13:42:48 -0800
Subject: [PATCH 123/153] Rebuild for hiredis 1.0.2

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index a5034ab..fde40e1 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.5.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Jan 17 2022 Kevin Fenzi <kevin@scrye.com> - 4.5.1-2
+- Rebuild for hiredis 1.0.2
+
 * Sun Dec 05 2021 Orion Poplawski <orion@nwra.com> - 4.5.1-1
 - Update to 4.5.1
 

From 09110f3bca88a8ed371c48022632747c375955a1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jan 2022 22:58:37 +0000
Subject: [PATCH 124/153] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index fde40e1..8965f87 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Mon Jan 17 2022 Kevin Fenzi <kevin@scrye.com> - 4.5.1-2
 - Rebuild for hiredis 1.0.2
 

From 52014a44f69bd5a1b3f831da185358afbbc86fab Mon Sep 17 00:00:00 2001
From: Troy Dawson <tdawson@redhat.com>
Date: Mon, 31 Jan 2022 09:15:14 -0800
Subject: [PATCH 125/153] epel8-playground decommissioned :
 https://pagure.io/epel/issue/136

---
 .cvsignore   |  0
 Makefile     | 21 ---------------------
 dead.package |  1 +
 sources      |  0
 4 files changed, 1 insertion(+), 21 deletions(-)
 delete mode 100644 .cvsignore
 delete mode 100644 Makefile
 create mode 100644 dead.package
 delete mode 100644 sources

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index e69de29..0000000
diff --git a/Makefile b/Makefile
deleted file mode 100644
index ee92723..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: ccache
-# $Id$
-NAME := ccache
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..a72aec0
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+epel8-playground decommissioned : https://pagure.io/epel/issue/136
diff --git a/sources b/sources
deleted file mode 100644
index e69de29..0000000

From 447d5e23c2d0ff2c001d6d43e584e7c58f4b7a5f Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 15 May 2022 19:52:18 -0600
Subject: [PATCH 126/153] Update to 4.6.1

---
 .gitignore  | 1 +
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21a8290..d5bbac5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 /ccache-4.2.1.tar.gz
 /ccache-4.4.2.tar.gz
 /ccache-4.5.1.tar.gz
+/ccache-4.6.1.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 8965f87..712680d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.5.1
-Release:        3%{?dist}
+Version:        4.6.1
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon May 16 2022 Orion Poplawski <orion@nwra.com> - 4.6.1-1
+- Update to 4.6.1
+
 * Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.5.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index 1f2d067..f27d3e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.5.1.tar.gz) = b59ea1811ea6105f4d7a844075d3e5e49ee3aadf81effacd3540bc04f786ee03f5eab4132020964609738afc2af3f0deee33f05949209a00d366c355cfb9795b
+SHA512 (ccache-4.6.1.tar.gz) = 0d0603367805df0c4b909e1aab6a8c91832ca037c68d59862c7b69b067577f4bed524db6a88d798cc392433250c30e3379d2b8f26f3672371c76007db58dd8c0

From 667c5bf917bc2f86e55f5a1e2e3295149b74f706 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 20 Jul 2022 22:40:03 +0000
Subject: [PATCH 127/153] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 712680d..08d6221 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Mon May 16 2022 Orion Poplawski <orion@nwra.com> - 4.6.1-1
 - Update to 4.6.1
 

From 5d78b1089be7c24fa54b51efcdc63a05fd9a7527 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sat, 1 Oct 2022 16:29:23 -0600
Subject: [PATCH 128/153] Update to 4.6.3

---
 .gitignore  | 1 +
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d5bbac5..5b203db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
 /ccache-4.4.2.tar.gz
 /ccache-4.5.1.tar.gz
 /ccache-4.6.1.tar.gz
+/ccache-4.6.3.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 08d6221..8c9896a 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.6.1
-Release:        2%{?dist}
+Version:        4.6.3
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Oct 01 2022 Orion Poplawski <orion@nwra.com> - 4.6.3-1
+- Update to 4.6.3
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.6.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index f27d3e2..f7e0be1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.6.1.tar.gz) = 0d0603367805df0c4b909e1aab6a8c91832ca037c68d59862c7b69b067577f4bed524db6a88d798cc392433250c30e3379d2b8f26f3672371c76007db58dd8c0
+SHA512 (ccache-4.6.3.tar.gz) = e6754a0c02c375745744db5bf9fe7d576d68e0068f3bb77b5abc619340daf47c536d624a1a6954df4952462c5bfe820a12796111441487525ca822b68f0b1d8b

From 648295049a2465b4e3a83189f5b870cc409bf6d4 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 6 Nov 2022 20:47:07 -0700
Subject: [PATCH 129/153] Update to 4.7.3

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5b203db..028764b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@
 /ccache-4.5.1.tar.gz
 /ccache-4.6.1.tar.gz
 /ccache-4.6.3.tar.gz
+/ccache-4.7.3.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 8c9896a..8744ba3 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.6.3
+Version:        4.7.3
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Mon Nov 07 2022 Orion Poplawski <orion@nwra.com> - 4.7.3-1
+- Update to 4.7.3
+
 * Sat Oct 01 2022 Orion Poplawski <orion@nwra.com> - 4.6.3-1
 - Update to 4.6.3
 
diff --git a/sources b/sources
index f7e0be1..4108bd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.6.3.tar.gz) = e6754a0c02c375745744db5bf9fe7d576d68e0068f3bb77b5abc619340daf47c536d624a1a6954df4952462c5bfe820a12796111441487525ca822b68f0b1d8b
+SHA512 (ccache-4.7.3.tar.gz) = 9839c0f1eef60136b6f55e04971e732dc25066f74777cf008bc7fe669b0c2e74ced8664bcaab0e0f035f12eff583a592a853eb57abfff62fc97b0e14f0a144f0

From 76f17c59b1025fb1b182270383e1c798b352f869 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Fri, 9 Dec 2022 20:06:57 -0700
Subject: [PATCH 130/153] Update to 4.7.4

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 028764b..bdbc7ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@
 /ccache-4.6.1.tar.gz
 /ccache-4.6.3.tar.gz
 /ccache-4.7.3.tar.gz
+/ccache-4.7.4.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 8744ba3..f1e356c 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.7.3
+Version:        4.7.4
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat Dec 10 2022 Orion Poplawski <orion@nwra.com> - 4.7.4-1
+- Update to 4.7.4
+
 * Mon Nov 07 2022 Orion Poplawski <orion@nwra.com> - 4.7.3-1
 - Update to 4.7.3
 
diff --git a/sources b/sources
index 4108bd2..1ecbb4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.7.3.tar.gz) = 9839c0f1eef60136b6f55e04971e732dc25066f74777cf008bc7fe669b0c2e74ced8664bcaab0e0f035f12eff583a592a853eb57abfff62fc97b0e14f0a144f0
+SHA512 (ccache-4.7.4.tar.gz) = 58faceb3d3b566d53000ac81bf27a52502ff3cb163f29506eccb7831bfcfdde3601102fe8b57530b8900e1d5e050374364c4df3c88ff825f0132e94b90441de9

From 13918638390b52772d1e84d52454cbbd40579d22 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 18 Jan 2023 23:35:44 +0000
Subject: [PATCH 131/153] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index f1e356c..77e7f95 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Sat Dec 10 2022 Orion Poplawski <orion@nwra.com> - 4.7.4-1
 - Update to 4.7.4
 

From 5762ce643cdd27df705a30b5bd26657ed3041863 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Tue, 21 Mar 2023 19:39:31 -0600
Subject: [PATCH 132/153] Update to 4.7.5

---
 .gitignore  | 1 +
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bdbc7ad..21e48e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
 /ccache-4.6.3.tar.gz
 /ccache-4.7.3.tar.gz
 /ccache-4.7.4.tar.gz
+/ccache-4.7.5.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 77e7f95..fda40fa 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.7.4
-Release:        2%{?dist}
+Version:        4.7.5
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Mar 22 2023 Orion Poplawski <orion@nwra.com> - 4.7.5-1
+- Update to 4.7.5
+
 * Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.7.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sources b/sources
index 1ecbb4b..7c6a36b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.7.4.tar.gz) = 58faceb3d3b566d53000ac81bf27a52502ff3cb163f29506eccb7831bfcfdde3601102fe8b57530b8900e1d5e050374364c4df3c88ff825f0132e94b90441de9
+SHA512 (ccache-4.7.5.tar.gz) = 49c3e8877d8dc4f5cb58f8d67d9d14c2009a23e21b45a9f367ebc58f7acc74d0a4b39de32d9a20642ad145a867b255230e101d6c90b8f98da8be8b698accd5a9

From bad1f3b08679fcd5ef23dce6522648e67f9afb18 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 5 Apr 2023 20:55:25 -0600
Subject: [PATCH 133/153] Update to 4.8 (fixes bz#2160275)

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 21e48e0..2383c47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /ccache-4.7.3.tar.gz
 /ccache-4.7.4.tar.gz
 /ccache-4.7.5.tar.gz
+/ccache-4.8.tar.gz
diff --git a/ccache.spec b/ccache.spec
index fda40fa..8d27fff 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.7.5
+Version:        4.8
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Apr 05 2023 Orion Poplawski <orion@nwra.com> - 4.8-1
+- Update to 4.8 (fixes bz#2160275)
+
 * Wed Mar 22 2023 Orion Poplawski <orion@nwra.com> - 4.7.5-1
 - Update to 4.7.5
 
diff --git a/sources b/sources
index 7c6a36b..67ee807 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.7.5.tar.gz) = 49c3e8877d8dc4f5cb58f8d67d9d14c2009a23e21b45a9f367ebc58f7acc74d0a4b39de32d9a20642ad145a867b255230e101d6c90b8f98da8be8b698accd5a9
+SHA512 (ccache-4.8.tar.gz) = d4880e8e176c4a22a088dd0c35e20f19c9c3134292b18183e7e87f32ebb4adb523831479d8c67fa8c50de8ec0b95ab956c612e2c525de58ba175a756264a9d08

From dafdc69b15089576e600119ea35bdb28ca7264f6 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Fri, 16 Jun 2023 07:44:13 -0600
Subject: [PATCH 134/153] Update to 4.8.2

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2383c47..9159c6c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@
 /ccache-4.7.4.tar.gz
 /ccache-4.7.5.tar.gz
 /ccache-4.8.tar.gz
+/ccache-4.8.2.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 8d27fff..233e204 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.8
+Version:        4.8.2
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Jun 16 2023 Orion Poplawski <orion@nwra.com> - 4.8.2-1
+- Update to 4.8.2
+
 * Wed Apr 05 2023 Orion Poplawski <orion@nwra.com> - 4.8-1
 - Update to 4.8 (fixes bz#2160275)
 
diff --git a/sources b/sources
index 67ee807..ab6a16a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.8.tar.gz) = d4880e8e176c4a22a088dd0c35e20f19c9c3134292b18183e7e87f32ebb4adb523831479d8c67fa8c50de8ec0b95ab956c612e2c525de58ba175a756264a9d08
+SHA512 (ccache-4.8.2.tar.gz) = 61841b2ae307d99aeae2a21be66f56fa58f72b56a51c830f686218c03e04314757b7d38af4ac501a8280c9a67b0ca0f95ffc53b19543957d103223f990b97d4c

From 5afc22e5d71d39296cbf7e1754efdc177eddd712 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 19 Jul 2023 15:23:29 +0000
Subject: [PATCH 135/153] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 233e204..28cbc7d 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Fri Jun 16 2023 Orion Poplawski <orion@nwra.com> - 4.8.2-1
 - Update to 4.8.2
 

From 60cfed36015ca588b6e1577bddf14b3f0b87a006 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Fri, 1 Sep 2023 17:57:34 -0600
Subject: [PATCH 136/153] Update to 4.8.3

---
 .gitignore  | 1 +
 ccache.spec | 7 +++++--
 sources     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9159c6c..fb9bf0c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /ccache-4.7.5.tar.gz
 /ccache-4.8.tar.gz
 /ccache-4.8.2.tar.gz
+/ccache-4.8.3.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 28cbc7d..5e4d54f 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.8.2
-Release:        2%{?dist}
+Version:        4.8.3
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Sep 01 2023 Orion Poplawski <orion@nwra.com> - 4.8.3-1
+- Update to 4.8.3
+
 * Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index ab6a16a..ea72bbd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.8.2.tar.gz) = 61841b2ae307d99aeae2a21be66f56fa58f72b56a51c830f686218c03e04314757b7d38af4ac501a8280c9a67b0ca0f95ffc53b19543957d103223f990b97d4c
+SHA512 (ccache-4.8.3.tar.gz) = 65c870c25dff1a88c92b99e697312fcc2d61f6718fc1f20203ac2bc16975ff376d943bdb4462716a5b2d84081502fb18a93caac7739f75f37f3acc66fa468498

From 0f8218cb77555fd986f05e359f0ca4c4d4769916 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 19 Jan 2024 15:09:31 +0000
Subject: [PATCH 137/153] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 5e4d54f..a8096be 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Sep 01 2023 Orion Poplawski <orion@nwra.com> - 4.8.3-1
 - Update to 4.8.3
 

From c300ebc9d59791e94371edae7284f34191cfea78 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 23 Jan 2024 01:19:10 +0000
Subject: [PATCH 138/153] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index a8096be..1d3ffed 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 License:        GPLv3+
@@ -217,6 +217,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From bd1676367fa1e85580ec493d5b3a51a44b9415e5 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Mon, 5 Feb 2024 09:42:45 -0700
Subject: [PATCH 139/153] Update to 4.9.1

Use SPDX license, and license for bundled libraries
Unbundle libraries
Add bundled provides
---
 .gitignore            |   2 +
 ccache-unbundle.patch | 182 ++++++++++++++++++++++++++++++++++++++++++
 ccache.spec           |  35 ++++++--
 sources               |   2 +-
 4 files changed, 215 insertions(+), 6 deletions(-)
 create mode 100644 ccache-unbundle.patch

diff --git a/.gitignore b/.gitignore
index fb9bf0c..be4f5f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@
 /ccache-4.8.tar.gz
 /ccache-4.8.2.tar.gz
 /ccache-4.8.3.tar.gz
+/ccache-4.9.tar.gz
+/ccache-4.9.1.tar.gz
diff --git a/ccache-unbundle.patch b/ccache-unbundle.patch
new file mode 100644
index 0000000..3c85c02
--- /dev/null
+++ b/ccache-unbundle.patch
@@ -0,0 +1,182 @@
+diff -up ccache-4.9.1/CMakeLists.txt.unbundle ccache-4.9.1/CMakeLists.txt
+--- ccache-4.9.1/CMakeLists.txt.unbundle	2024-02-05 12:29:52.000000000 -0700
++++ ccache-4.9.1/CMakeLists.txt	2024-02-08 08:24:25.196673454 -0700
+@@ -86,6 +86,10 @@ include(GenerateVersionFile)
+ # Third party
+ #
+ 
++find_package(PkgConfig REQUIRED)
++
++pkg_check_modules(xxhash REQUIRED IMPORTED_TARGET libxxhash)
++
+ set(ZSTD_FROM_INTERNET AUTO CACHE STRING "Download and use libzstd from the Internet")
+ set_property(CACHE ZSTD_FROM_INTERNET PROPERTY STRINGS AUTO ON OFF)
+ 
+diff -up ccache-4.9.1/src/CMakeLists.txt.unbundle ccache-4.9.1/src/CMakeLists.txt
+--- ccache-4.9.1/src/CMakeLists.txt.unbundle	2024-02-05 12:29:52.000000000 -0700
++++ ccache-4.9.1/src/CMakeLists.txt	2024-02-08 08:27:10.324913588 -0700
+@@ -14,6 +14,7 @@ set(
+   hashutil.cpp
+   language.cpp
+   version.cpp
++  third_party/url.cpp
+ )
+ 
+ if(INODE_CACHE_SUPPORTED)
+@@ -45,10 +46,11 @@ if(CCACHE_EXTRA_LIBS)
+ endif()
+ 
+ set(THREADS_PREFER_PTHREAD_FLAG ON)
++find_package(fmt REQUIRED)
+ find_package(Threads REQUIRED)
+ target_link_libraries(
+   ccache_framework
+-  PRIVATE standard_settings standard_warnings ZSTD::ZSTD Threads::Threads third_party
++  PRIVATE standard_settings standard_warnings blake3 fmt::fmt ZSTD::ZSTD Threads::Threads PkgConfig::xxhash
+ )
+ 
+ target_include_directories(ccache_framework PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+@@ -57,7 +59,7 @@ if(REDIS_STORAGE_BACKEND)
+   target_compile_definitions(ccache_framework PUBLIC -DHAVE_REDIS_STORAGE_BACKEND)
+   target_link_libraries(
+     ccache_framework
+-    PUBLIC standard_settings standard_warnings HIREDIS::HIREDIS third_party
++    PUBLIC standard_settings standard_warnings HIREDIS::HIREDIS
+   )
+ endif()
+ 
+diff -up ccache-4.9.1/src/hashutil.cpp.unbundle ccache-4.9.1/src/hashutil.cpp
+--- ccache-4.9.1/src/hashutil.cpp.unbundle	2024-02-05 12:29:52.000000000 -0700
++++ ccache-4.9.1/src/hashutil.cpp	2024-02-08 08:24:25.200673484 -0700
+@@ -37,7 +37,9 @@
+ #  include "InodeCache.hpp"
+ #endif
+ 
+-#include "third_party/blake3/blake3_cpu_supports_avx2.h"
++#ifdef HAVE_AVX2
++#  include "third_party/blake3/blake3_cpu_supports_avx2.h"
++#endif
+ 
+ #ifdef HAVE_UNISTD_H
+ #  include <unistd.h>
+diff -up ccache-4.9.1/src/third_party/CMakeLists.txt.unbundle ccache-4.9.1/src/third_party/CMakeLists.txt
+--- ccache-4.9.1/src/third_party/CMakeLists.txt.unbundle	2024-02-05 12:29:52.000000000 -0700
++++ ccache-4.9.1/src/third_party/CMakeLists.txt	2024-02-08 08:26:04.233417232 -0700
+@@ -1,58 +1,59 @@
+-add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c)
+-if(NOT MSVC)
+-  target_sources(third_party PRIVATE getopt_long.c)
+-else()
+-  target_sources(third_party PRIVATE win32/getopt.c)
+-  target_compile_definitions(third_party PUBLIC -DSTATIC_GETOPT)
+-endif()
++if(0)
++  add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c)
++  if(NOT MSVC)
++    target_sources(third_party PRIVATE getopt_long.c)
++  else()
++    target_sources(third_party PRIVATE win32/getopt.c)
++    target_compile_definitions(third_party PUBLIC -DSTATIC_GETOPT)
++  endif()
++  file(GLOB headers *.h fmt/*.h nonstd/*.hpp)
++  target_sources(third_party PRIVATE ${headers})
++
++  set(xxhdispatchtest [=[
++  #include "xxh_x86dispatch.c"
++
++  int main()
++  {
++    XXH3_64bits_dispatch("foo", 3);
++    return 1;
++  }
++  ]=])
++
++  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}")
++
++  try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR}
++    "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c"
++    CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}"
++    COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY")
++
++  target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY")
++  if(USE_XXH_DISPATCH)
++    target_sources(third_party PRIVATE xxh_x86dispatch.c)
++    target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH")
++  endif()
++
++  # Treat third party headers as system files (no warning for those headers).
++  target_include_directories(
++    third_party
++    PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SYSTEM
++  )
++
++  target_link_libraries(third_party PRIVATE standard_settings)
++endif ()
++
+ 
+ if(WIN32)
+   target_sources(third_party PRIVATE win32/mktemp.c)
++  file(GLOB headers win32/*.h)
++  target_sources(third_party PRIVATE ${headers})
++
++  target_link_libraries(third_party PRIVATE ws2_32)
+ endif ()
+ 
+ if(ENABLE_TRACING)
+   target_sources(third_party PRIVATE minitrace.c)
+ endif()
+ 
+-file(GLOB headers *.h fmt/*.h nonstd/*.hpp win32/*.h)
+-target_sources(third_party PRIVATE ${headers})
+-
+-set(xxhdispatchtest [=[
+-#include "xxh_x86dispatch.c"
+-
+-int main()
+-{
+-  XXH3_64bits_dispatch("foo", 3);
+-  return 1;
+-}
+-]=])
+-
+-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}")
+-
+-try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR}
+-  "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c"
+-  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}"
+-  COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY")
+-
+-target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY")
+-if(USE_XXH_DISPATCH)
+-  target_sources(third_party PRIVATE xxh_x86dispatch.c)
+-  target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH")
+-endif()
+-
+-# Treat third party headers as system files (no warning for those headers).
+-target_include_directories(
+-  third_party
+-  PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SYSTEM
+-)
+-
+-target_link_libraries(third_party PRIVATE standard_settings)
+-target_link_libraries(third_party INTERFACE blake3)
+-
+-if(WIN32)
+-  target_link_libraries(third_party PRIVATE ws2_32)
+-endif()
+-
+ # Silence warning from winbase.h due to /Zc:preprocessor.
+ if(MSVC)
+   target_compile_options(third_party PRIVATE /wd5105)
+diff -up ccache-4.9.1/unittest/CMakeLists.txt.unbundle ccache-4.9.1/unittest/CMakeLists.txt
+--- ccache-4.9.1/unittest/CMakeLists.txt.unbundle	2024-02-05 12:29:52.000000000 -0700
++++ ccache-4.9.1/unittest/CMakeLists.txt	2024-02-08 08:24:25.196673454 -0700
+@@ -59,7 +59,7 @@ endif()
+ 
+ target_link_libraries(
+   unittest
+-  PRIVATE standard_settings standard_warnings ccache_framework third_party)
++  PRIVATE standard_settings standard_warnings ccache_framework PkgConfig::xxhash)
+ 
+ target_include_directories(unittest PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${ccache_SOURCE_DIR}/src)
+ 
diff --git a/ccache.spec b/ccache.spec
index 1d3ffed..83c2a97 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,27 +12,43 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.8.3
-Release:        3%{?dist}
+Version:        4.9.1
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
-License:        GPLv3+
+# See LICENSE.adoc for licenses of bundled codes
+# blake3 is Apache-2.0
+# minitrace.h is MIT
+# span.hpp is BSL-1.0
+# url.cpp/hpp is MIT
+License:        GPL-3.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT
 URL:            http://ccache.dev/
 Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
+Patch1:         ccache-unbundle.patch
 
 BuildRequires:  /usr/bin/asciidoctor
 BuildRequires:  cmake
+# Uses a patched version and is missing on i686 in Fedora
+#BuildRequires:  blake3-devel
+BuildRequires:  cpp-httplib-devel
+BuildRequires:  doctest-devel
+BuildRequires:  expected-devel
+BuildRequires:  fmt-devel
 BuildRequires:  hiredis-devel
 BuildRequires:  libzstd-devel
 BuildRequires:  perl perl(File::Spec)
+BuildRequires:  xxhash-devel
 # clang for additional tests
 BuildRequires:  clang clang-tools-extra
 # coreutils for triggerin, triggerpostun
 Requires:       coreutils
 # For groupadd
 Requires(pre):  shadow-utils
+Provides:       bundled(blake3) = 1.5.0
+Provides:       bundled(span-lite) = 0.10.3
+Provides:       bundled(cxxurl)
 
 %description
 ccache is a compiler cache.  It speeds up recompilation of C/C++ code
@@ -43,6 +59,11 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
+%patch -P1 -p1 -b .unbundle
+find -name \*.[hc]pp \
+  -exec sed -i -E -e 's,third_party/(fmt/|httplib.h|tl/expected.hpp|xxhash.h),\1,' \
+                  -e 's,third_party/doctest.h,doctest/doctest.h,' {} +
+rm -r src/third_party/[ac-lo-tv-z]* src/third_party/minitrace.c
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -56,8 +77,6 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 %cmake_install
 
 install -Dpm 644 %{__cmake_builddir}/doc/ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1
@@ -217,6 +236,12 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Tue Feb 06 2024 Orion Poplawski <orion@nwra.com> - 4.9.1-1
+- Update to 4.9.1
+- Unbundle some libraries
+- Use SPDX license
+- Add licenses for bundled code
+
 * Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.3-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index ea72bbd..bcee6d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.8.3.tar.gz) = 65c870c25dff1a88c92b99e697312fcc2d61f6718fc1f20203ac2bc16975ff376d943bdb4462716a5b2d84081502fb18a93caac7739f75f37f3acc66fa468498
+SHA512 (ccache-4.9.1.tar.gz) = 0945d46aaa8f76098356bed0a1258d1c8b19564247acc34ca3d71e0bd12e7edf095ad43e23c7459c8174be8ca6569c671da09a864edc57b77113bc1d5602cd28

From 59331031eb2823b4777829ee270f76a21cb81720 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Sat, 11 May 2024 15:41:48 -0700
Subject: [PATCH 140/153] rebuild for hiredis soname bump

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 83c2a97..87f473b 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.9.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -236,6 +236,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sat May 11 2024 Kevin Fenzi <kevin@scrye.com> - 4.9.1-2
+- rebuild for hiredis soname bump
+
 * Tue Feb 06 2024 Orion Poplawski <orion@nwra.com> - 4.9.1-1
 - Update to 4.9.1
 - Unbundle some libraries

From 3454728c01de0fd492398b677c21e91202858a4b Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Sun, 2 Jun 2024 17:44:40 -0600
Subject: [PATCH 141/153] Update to. 4.10

---
 .gitignore            |   1 +
 ccache-unbundle.patch | 182 ------------------------------------------
 ccache.spec           |  20 +++--
 sources               |   2 +-
 4 files changed, 11 insertions(+), 194 deletions(-)
 delete mode 100644 ccache-unbundle.patch

diff --git a/.gitignore b/.gitignore
index be4f5f7..9b59100 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /ccache-4.8.3.tar.gz
 /ccache-4.9.tar.gz
 /ccache-4.9.1.tar.gz
+/ccache-4.10.tar.gz
diff --git a/ccache-unbundle.patch b/ccache-unbundle.patch
deleted file mode 100644
index 3c85c02..0000000
--- a/ccache-unbundle.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-diff -up ccache-4.9.1/CMakeLists.txt.unbundle ccache-4.9.1/CMakeLists.txt
---- ccache-4.9.1/CMakeLists.txt.unbundle	2024-02-05 12:29:52.000000000 -0700
-+++ ccache-4.9.1/CMakeLists.txt	2024-02-08 08:24:25.196673454 -0700
-@@ -86,6 +86,10 @@ include(GenerateVersionFile)
- # Third party
- #
- 
-+find_package(PkgConfig REQUIRED)
-+
-+pkg_check_modules(xxhash REQUIRED IMPORTED_TARGET libxxhash)
-+
- set(ZSTD_FROM_INTERNET AUTO CACHE STRING "Download and use libzstd from the Internet")
- set_property(CACHE ZSTD_FROM_INTERNET PROPERTY STRINGS AUTO ON OFF)
- 
-diff -up ccache-4.9.1/src/CMakeLists.txt.unbundle ccache-4.9.1/src/CMakeLists.txt
---- ccache-4.9.1/src/CMakeLists.txt.unbundle	2024-02-05 12:29:52.000000000 -0700
-+++ ccache-4.9.1/src/CMakeLists.txt	2024-02-08 08:27:10.324913588 -0700
-@@ -14,6 +14,7 @@ set(
-   hashutil.cpp
-   language.cpp
-   version.cpp
-+  third_party/url.cpp
- )
- 
- if(INODE_CACHE_SUPPORTED)
-@@ -45,10 +46,11 @@ if(CCACHE_EXTRA_LIBS)
- endif()
- 
- set(THREADS_PREFER_PTHREAD_FLAG ON)
-+find_package(fmt REQUIRED)
- find_package(Threads REQUIRED)
- target_link_libraries(
-   ccache_framework
--  PRIVATE standard_settings standard_warnings ZSTD::ZSTD Threads::Threads third_party
-+  PRIVATE standard_settings standard_warnings blake3 fmt::fmt ZSTD::ZSTD Threads::Threads PkgConfig::xxhash
- )
- 
- target_include_directories(ccache_framework PUBLIC ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-@@ -57,7 +59,7 @@ if(REDIS_STORAGE_BACKEND)
-   target_compile_definitions(ccache_framework PUBLIC -DHAVE_REDIS_STORAGE_BACKEND)
-   target_link_libraries(
-     ccache_framework
--    PUBLIC standard_settings standard_warnings HIREDIS::HIREDIS third_party
-+    PUBLIC standard_settings standard_warnings HIREDIS::HIREDIS
-   )
- endif()
- 
-diff -up ccache-4.9.1/src/hashutil.cpp.unbundle ccache-4.9.1/src/hashutil.cpp
---- ccache-4.9.1/src/hashutil.cpp.unbundle	2024-02-05 12:29:52.000000000 -0700
-+++ ccache-4.9.1/src/hashutil.cpp	2024-02-08 08:24:25.200673484 -0700
-@@ -37,7 +37,9 @@
- #  include "InodeCache.hpp"
- #endif
- 
--#include "third_party/blake3/blake3_cpu_supports_avx2.h"
-+#ifdef HAVE_AVX2
-+#  include "third_party/blake3/blake3_cpu_supports_avx2.h"
-+#endif
- 
- #ifdef HAVE_UNISTD_H
- #  include <unistd.h>
-diff -up ccache-4.9.1/src/third_party/CMakeLists.txt.unbundle ccache-4.9.1/src/third_party/CMakeLists.txt
---- ccache-4.9.1/src/third_party/CMakeLists.txt.unbundle	2024-02-05 12:29:52.000000000 -0700
-+++ ccache-4.9.1/src/third_party/CMakeLists.txt	2024-02-08 08:26:04.233417232 -0700
-@@ -1,58 +1,59 @@
--add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c)
--if(NOT MSVC)
--  target_sources(third_party PRIVATE getopt_long.c)
--else()
--  target_sources(third_party PRIVATE win32/getopt.c)
--  target_compile_definitions(third_party PUBLIC -DSTATIC_GETOPT)
--endif()
-+if(0)
-+  add_library(third_party STATIC format.cpp httplib.cpp url.cpp xxhash.c)
-+  if(NOT MSVC)
-+    target_sources(third_party PRIVATE getopt_long.c)
-+  else()
-+    target_sources(third_party PRIVATE win32/getopt.c)
-+    target_compile_definitions(third_party PUBLIC -DSTATIC_GETOPT)
-+  endif()
-+  file(GLOB headers *.h fmt/*.h nonstd/*.hpp)
-+  target_sources(third_party PRIVATE ${headers})
-+
-+  set(xxhdispatchtest [=[
-+  #include "xxh_x86dispatch.c"
-+
-+  int main()
-+  {
-+    XXH3_64bits_dispatch("foo", 3);
-+    return 1;
-+  }
-+  ]=])
-+
-+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}")
-+
-+  try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR}
-+    "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c"
-+    CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}"
-+    COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY")
-+
-+  target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY")
-+  if(USE_XXH_DISPATCH)
-+    target_sources(third_party PRIVATE xxh_x86dispatch.c)
-+    target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH")
-+  endif()
-+
-+  # Treat third party headers as system files (no warning for those headers).
-+  target_include_directories(
-+    third_party
-+    PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SYSTEM
-+  )
-+
-+  target_link_libraries(third_party PRIVATE standard_settings)
-+endif ()
-+
- 
- if(WIN32)
-   target_sources(third_party PRIVATE win32/mktemp.c)
-+  file(GLOB headers win32/*.h)
-+  target_sources(third_party PRIVATE ${headers})
-+
-+  target_link_libraries(third_party PRIVATE ws2_32)
- endif ()
- 
- if(ENABLE_TRACING)
-   target_sources(third_party PRIVATE minitrace.c)
- endif()
- 
--file(GLOB headers *.h fmt/*.h nonstd/*.hpp win32/*.h)
--target_sources(third_party PRIVATE ${headers})
--
--set(xxhdispatchtest [=[
--#include "xxh_x86dispatch.c"
--
--int main()
--{
--  XXH3_64bits_dispatch("foo", 3);
--  return 1;
--}
--]=])
--
--file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c" "${xxhdispatchtest}")
--
--try_compile(USE_XXH_DISPATCH ${CMAKE_CURRENT_BINARY_DIR}
--  "${CMAKE_CURRENT_BINARY_DIR}/xxhdispatchtest.c"
--  CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${CMAKE_CURRENT_SOURCE_DIR}"
--  COMPILE_DEFINITIONS "-DXXH_STATIC_LINKING_ONLY")
--
--target_compile_definitions(third_party INTERFACE "-DXXH_STATIC_LINKING_ONLY")
--if(USE_XXH_DISPATCH)
--  target_sources(third_party PRIVATE xxh_x86dispatch.c)
--  target_compile_definitions(third_party INTERFACE "-DUSE_XXH_DISPATCH")
--endif()
--
--# Treat third party headers as system files (no warning for those headers).
--target_include_directories(
--  third_party
--  PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} SYSTEM
--)
--
--target_link_libraries(third_party PRIVATE standard_settings)
--target_link_libraries(third_party INTERFACE blake3)
--
--if(WIN32)
--  target_link_libraries(third_party PRIVATE ws2_32)
--endif()
--
- # Silence warning from winbase.h due to /Zc:preprocessor.
- if(MSVC)
-   target_compile_options(third_party PRIVATE /wd5105)
-diff -up ccache-4.9.1/unittest/CMakeLists.txt.unbundle ccache-4.9.1/unittest/CMakeLists.txt
---- ccache-4.9.1/unittest/CMakeLists.txt.unbundle	2024-02-05 12:29:52.000000000 -0700
-+++ ccache-4.9.1/unittest/CMakeLists.txt	2024-02-08 08:24:25.196673454 -0700
-@@ -59,7 +59,7 @@ endif()
- 
- target_link_libraries(
-   unittest
--  PRIVATE standard_settings standard_warnings ccache_framework third_party)
-+  PRIVATE standard_settings standard_warnings ccache_framework PkgConfig::xxhash)
- 
- target_include_directories(unittest PRIVATE ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${ccache_SOURCE_DIR}/src)
- 
diff --git a/ccache.spec b/ccache.spec
index 87f473b..4acab09 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,13 +12,12 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.9.1
-Release:        2%{?dist}
+Version:        4.10
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
 # blake3 is Apache-2.0
-# minitrace.h is MIT
 # span.hpp is BSL-1.0
 # url.cpp/hpp is MIT
 License:        GPL-3.0-or-later AND Apache-2.0 AND BSL-1.0 AND MIT
@@ -26,7 +25,6 @@ URL:            http://ccache.dev/
 Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-Patch1:         ccache-unbundle.patch
 
 BuildRequires:  /usr/bin/asciidoctor
 BuildRequires:  cmake
@@ -46,8 +44,8 @@ BuildRequires:  clang clang-tools-extra
 Requires:       coreutils
 # For groupadd
 Requires(pre):  shadow-utils
-Provides:       bundled(blake3) = 1.5.0
-Provides:       bundled(span-lite) = 0.10.3
+Provides:       bundled(blake3) = 1.5.1
+Provides:       bundled(span-lite) = 0.11.0
 Provides:       bundled(cxxurl)
 
 %description
@@ -59,11 +57,8 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
-%patch -P1 -p1 -b .unbundle
-find -name \*.[hc]pp \
-  -exec sed -i -E -e 's,third_party/(fmt/|httplib.h|tl/expected.hpp|xxhash.h),\1,' \
-                  -e 's,third_party/doctest.h,doctest/doctest.h,' {} +
-rm -r src/third_party/[ac-lo-tv-z]* src/third_party/minitrace.c
+# win32-compat gets imported, but not used
+rm -r src/third_party/{[ad-lo-tvy-z]*,cpp-httplib}
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE1} > %{name}.sh
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -236,6 +231,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Jun 02 2024 Orion Poplawski <orion@nwra.com> - 4.10-1
+- Update to 4.10
+
 * Sat May 11 2024 Kevin Fenzi <kevin@scrye.com> - 4.9.1-2
 - rebuild for hiredis soname bump
 
diff --git a/sources b/sources
index bcee6d1..fab1821 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.9.1.tar.gz) = 0945d46aaa8f76098356bed0a1258d1c8b19564247acc34ca3d71e0bd12e7edf095ad43e23c7459c8174be8ca6569c671da09a864edc57b77113bc1d5602cd28
+SHA512 (ccache-4.10.tar.gz) = 3bc57436483e789fdbb12f7c1ca0e7fe2c3437cebff9450b34f4584786d18fa6cb5906aac1cb1530a7bf3bf01198dcf088696a1e6dcba5cf56ba529d9fd3af4c

From 07003a9da85eff3b212eda5dd253a6453aaf2f25 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 11 Jul 2024 21:12:58 -0600
Subject: [PATCH 142/153] Update to 4.10.1

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9b59100..474c3fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
 /ccache-4.9.tar.gz
 /ccache-4.9.1.tar.gz
 /ccache-4.10.tar.gz
+/ccache-4.10.1.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 4acab09..fe7fe1c 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.10
+Version:        4.10.1
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -231,6 +231,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Jul 12 2024 Orion Poplawski <orion@nwra.com> - 4.10.1-1
+- Update to 4.10.1
+
 * Sun Jun 02 2024 Orion Poplawski <orion@nwra.com> - 4.10-1
 - Update to 4.10
 
diff --git a/sources b/sources
index fab1821..f4ace0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.10.tar.gz) = 3bc57436483e789fdbb12f7c1ca0e7fe2c3437cebff9450b34f4584786d18fa6cb5906aac1cb1530a7bf3bf01198dcf088696a1e6dcba5cf56ba529d9fd3af4c
+SHA512 (ccache-4.10.1.tar.gz) = 28c91693e9a37eed494ff4fc8a98e12d566fa8510bab3587a7a67e94b80b8d9c146952ffe13c5b852adf5c2b91e70f073b70809f36fbbd8730fbbf900a7ddc55

From 474ace809b43786223fc706cb3f4a78ce39f88cc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 17 Jul 2024 19:02:42 +0000
Subject: [PATCH 143/153] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index fe7fe1c..9425e22 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.10.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -231,6 +231,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Fri Jul 12 2024 Orion Poplawski <orion@nwra.com> - 4.10.1-1
 - Update to 4.10.1
 

From fe012d61e0c40d955a1089e9b892a0abed30fb85 Mon Sep 17 00:00:00 2001
From: Kefu Chai <tchaikov@gmail.com>
Date: Fri, 26 Jul 2024 11:04:28 -0500
Subject: [PATCH 144/153] Rebuild for fmt 11

Signed-off-by: Kefu Chai <tchaikov@gmail.com>
Signed-off-by: Michel Lind <salimma@fedoraproject.org>
---
 0001-build-try-harder-to-determine-fmt.patch  | 40 +++++++++++++++++++
 0002-build-fix-detection-of-fmt-version.patch | 37 +++++++++++++++++
 ccache.spec                                   | 10 ++++-
 3 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100644 0001-build-try-harder-to-determine-fmt.patch
 create mode 100644 0002-build-fix-detection-of-fmt-version.patch

diff --git a/0001-build-try-harder-to-determine-fmt.patch b/0001-build-try-harder-to-determine-fmt.patch
new file mode 100644
index 0000000..4d1d099
--- /dev/null
+++ b/0001-build-try-harder-to-determine-fmt.patch
@@ -0,0 +1,40 @@
+From 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
+Date: Tue, 2 Jul 2024 15:46:44 +0200
+Subject: [PATCH] build: Try harder to determine FMT_VERSION (#1478)
+
+fmt-11.0 moved the FMT_VERSION from core.h to base.h, so try the
+new header first and then fall back to the old one.
+
+Closes: #1477
+---
+ cmake/FindFmt.cmake | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
+index 55126a3172..0619f4615e 100644
+--- a/cmake/FindFmt.cmake
++++ b/cmake/FindFmt.cmake
+@@ -3,11 +3,19 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
+ if(DEP_FMT STREQUAL "BUNDLED")
+   message(STATUS "Using bundled Fmt as requested")
+ else()
+-  find_path(FMT_INCLUDE_DIR fmt/core.h)
++  find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h)
+   find_library(FMT_LIBRARY fmt)
+   if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
+-    file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
+-    string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++    file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h)
++    string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}")
++    if("${CMAKE_MATCH_0}" STREQUAL "")
++      file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
++      string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++    endif()
++    if("${CMAKE_MATCH_0}" STREQUAL "")
++      message(FATAL_ERROR "FMT_VERSION not found")
++      return()
++    endif()
+     math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000")
+     math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100")
+     math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100")
diff --git a/0002-build-fix-detection-of-fmt-version.patch b/0002-build-fix-detection-of-fmt-version.patch
new file mode 100644
index 0000000..e67af78
--- /dev/null
+++ b/0002-build-fix-detection-of-fmt-version.patch
@@ -0,0 +1,37 @@
+From 3b09afc5f792f0bd0a15cf6b8408ea40eb069787 Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Tue, 2 Jul 2024 17:05:43 +0200
+Subject: [PATCH] build: Fix detection of Fmt version for Fmt<11
+
+Fixes regression in 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1.
+---
+ cmake/FindFmt.cmake | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
+index 0619f4615e..7c39291eca 100644
+--- a/cmake/FindFmt.cmake
++++ b/cmake/FindFmt.cmake
+@@ -3,15 +3,16 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
+ if(DEP_FMT STREQUAL "BUNDLED")
+   message(STATUS "Using bundled Fmt as requested")
+ else()
+-  find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h)
++  find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h)
+   find_library(FMT_LIBRARY fmt)
+   if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
+-    file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h)
+-    string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}")
+-    if("${CMAKE_MATCH_0}" STREQUAL "")
+-      file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
+-      string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
++    if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h")
++      set(_fmt_h base.h)
++    else()
++      set(_fmt_h core.h)
+     endif()
++    file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content)
++    string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}")
+     if("${CMAKE_MATCH_0}" STREQUAL "")
+       message(FATAL_ERROR "FMT_VERSION not found")
+       return()
diff --git a/ccache.spec b/ccache.spec
index 9425e22..265e0e3 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.10.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -25,6 +25,10 @@ URL:            http://ccache.dev/
 Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
+# https://github.com/ccache/ccache/commit/83190fff9ab7298b1c5332f7d1332440763998f7
+Patch0:         0001-build-try-harder-to-determine-fmt.patch
+# https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787
+Patch1:         0002-build-fix-detection-of-fmt-version.patch
 
 BuildRequires:  /usr/bin/asciidoctor
 BuildRequires:  cmake
@@ -57,6 +61,7 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 %prep
 %setup -q
+%autopatch -p1
 # win32-compat gets imported, but not used
 rm -r src/third_party/{[ad-lo-tvy-z]*,cpp-httplib}
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -231,6 +236,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Fri Jul 26 2024 Kefu Chai <tchaikov@gmail.com> - 4.10.1-3
+- Rebuilt for fmt 11
+
 * Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From be8ac5da39c34fefc7e58bada3b9f62ba18baf96 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Tue, 30 Jul 2024 21:25:16 -0600
Subject: [PATCH 145/153] Update to 4.10.2

---
 .gitignore                                    |  1 +
 0001-build-try-harder-to-determine-fmt.patch  | 40 -------------------
 0002-build-fix-detection-of-fmt-version.patch | 37 -----------------
 ccache.spec                                   | 11 +++--
 sources                                       |  2 +-
 5 files changed, 7 insertions(+), 84 deletions(-)
 delete mode 100644 0001-build-try-harder-to-determine-fmt.patch
 delete mode 100644 0002-build-fix-detection-of-fmt-version.patch

diff --git a/.gitignore b/.gitignore
index 474c3fb..71f8609 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,3 +25,4 @@
 /ccache-4.9.1.tar.gz
 /ccache-4.10.tar.gz
 /ccache-4.10.1.tar.gz
+/ccache-4.10.2.tar.gz
diff --git a/0001-build-try-harder-to-determine-fmt.patch b/0001-build-try-harder-to-determine-fmt.patch
deleted file mode 100644
index 4d1d099..0000000
--- a/0001-build-try-harder-to-determine-fmt.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Tue, 2 Jul 2024 15:46:44 +0200
-Subject: [PATCH] build: Try harder to determine FMT_VERSION (#1478)
-
-fmt-11.0 moved the FMT_VERSION from core.h to base.h, so try the
-new header first and then fall back to the old one.
-
-Closes: #1477
----
- cmake/FindFmt.cmake | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
-index 55126a3172..0619f4615e 100644
---- a/cmake/FindFmt.cmake
-+++ b/cmake/FindFmt.cmake
-@@ -3,11 +3,19 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
- if(DEP_FMT STREQUAL "BUNDLED")
-   message(STATUS "Using bundled Fmt as requested")
- else()
--  find_path(FMT_INCLUDE_DIR fmt/core.h)
-+  find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h)
-   find_library(FMT_LIBRARY fmt)
-   if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
--    file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
--    string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
-+    file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h)
-+    string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}")
-+    if("${CMAKE_MATCH_0}" STREQUAL "")
-+      file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
-+      string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
-+    endif()
-+    if("${CMAKE_MATCH_0}" STREQUAL "")
-+      message(FATAL_ERROR "FMT_VERSION not found")
-+      return()
-+    endif()
-     math(EXPR _fmt_major "${CMAKE_MATCH_1} / 10000")
-     math(EXPR _fmt_minor "${CMAKE_MATCH_1} / 100 % 100")
-     math(EXPR _fmt_patch "${CMAKE_MATCH_1} % 100")
diff --git a/0002-build-fix-detection-of-fmt-version.patch b/0002-build-fix-detection-of-fmt-version.patch
deleted file mode 100644
index e67af78..0000000
--- a/0002-build-fix-detection-of-fmt-version.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3b09afc5f792f0bd0a15cf6b8408ea40eb069787 Mon Sep 17 00:00:00 2001
-From: Joel Rosdahl <joel@rosdahl.net>
-Date: Tue, 2 Jul 2024 17:05:43 +0200
-Subject: [PATCH] build: Fix detection of Fmt version for Fmt<11
-
-Fixes regression in 71f772e9d3d4f8045cfa7bccd03bd21c1e8fbef1.
----
- cmake/FindFmt.cmake | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/cmake/FindFmt.cmake b/cmake/FindFmt.cmake
-index 0619f4615e..7c39291eca 100644
---- a/cmake/FindFmt.cmake
-+++ b/cmake/FindFmt.cmake
-@@ -3,15 +3,16 @@ mark_as_advanced(FMT_INCLUDE_DIR FMT_LIBRARY)
- if(DEP_FMT STREQUAL "BUNDLED")
-   message(STATUS "Using bundled Fmt as requested")
- else()
--  find_path(FMT_INCLUDE_DIR fmt/base.h fmt/core.h)
-+  find_path(FMT_INCLUDE_DIR NAMES fmt/base.h fmt/core.h)
-   find_library(FMT_LIBRARY fmt)
-   if(FMT_INCLUDE_DIR AND FMT_LIBRARY)
--    file(READ "${FMT_INCLUDE_DIR}/fmt/base.h" _fmt_base_h)
--    string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_base_h}")
--    if("${CMAKE_MATCH_0}" STREQUAL "")
--      file(READ "${FMT_INCLUDE_DIR}/fmt/core.h" _fmt_core_h)
--      string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_core_h}")
-+    if(EXISTS "${FMT_INCLUDE_DIR}/fmt/base.h")
-+      set(_fmt_h base.h)
-+    else()
-+      set(_fmt_h core.h)
-     endif()
-+    file(READ "${FMT_INCLUDE_DIR}/fmt/${_fmt_h}" _fmt_h_content)
-+    string(REGEX MATCH "#define FMT_VERSION ([0-9]+)" _ "${_fmt_h_content}")
-     if("${CMAKE_MATCH_0}" STREQUAL "")
-       message(FATAL_ERROR "FMT_VERSION not found")
-       return()
diff --git a/ccache.spec b/ccache.spec
index 265e0e3..0d161de 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.10.1
-Release:        3%{?dist}
+Version:        4.10.2
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -25,10 +25,6 @@ URL:            http://ccache.dev/
 Source0:        https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{name}.sh.in
 Source2:        %{name}.csh.in
-# https://github.com/ccache/ccache/commit/83190fff9ab7298b1c5332f7d1332440763998f7
-Patch0:         0001-build-try-harder-to-determine-fmt.patch
-# https://github.com/ccache/ccache/commit/3b09afc5f792f0bd0a15cf6b8408ea40eb069787
-Patch1:         0002-build-fix-detection-of-fmt-version.patch
 
 BuildRequires:  /usr/bin/asciidoctor
 BuildRequires:  cmake
@@ -236,6 +232,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Wed Jul 31 2024 Orion Poplawski <orion@nwra.com> - 4.10.2-1
+- Update to 4.10.2
+
 * Fri Jul 26 2024 Kefu Chai <tchaikov@gmail.com> - 4.10.1-3
 - Rebuilt for fmt 11
 
diff --git a/sources b/sources
index f4ace0a..dea28e4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.10.1.tar.gz) = 28c91693e9a37eed494ff4fc8a98e12d566fa8510bab3587a7a67e94b80b8d9c146952ffe13c5b852adf5c2b91e70f073b70809f36fbbd8730fbbf900a7ddc55
+SHA512 (ccache-4.10.2.tar.gz) = c6b66821372492b3e52cfaaad9a3167039aa943557ab2e1119fa68e3e983dcd022b839c54ef016802c0092209cae8122fcb8aa4dbe3bc03902183376bde2c4ef

From 593a6a35bd2472967db7414b706b53616a018427 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 16 Jan 2025 13:24:52 +0000
Subject: [PATCH 146/153] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index 0d161de..32d2ac7 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.10.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -232,6 +232,9 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Wed Jul 31 2024 Orion Poplawski <orion@nwra.com> - 4.10.2-1
 - Update to 4.10.2
 

From 8717617bacb36986d3732199a627895c26cc2a25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 11 Feb 2025 14:36:20 +0100
Subject: [PATCH 147/153] Add sysusers.d config file to allow rpm to create
 users/groups automatically

See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers.
---
 ccache.spec | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ccache.spec b/ccache.spec
index 32d2ac7..add086e 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.10.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -43,7 +43,6 @@ BuildRequires:  clang clang-tools-extra
 # coreutils for triggerin, triggerpostun
 Requires:       coreutils
 # For groupadd
-Requires(pre):  shadow-utils
 Provides:       bundled(blake3) = 1.5.1
 Provides:       bundled(span-lite) = 0.11.0
 Provides:       bundled(cxxurl)
@@ -65,6 +64,11 @@ sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
     %{SOURCE2} > %{name}.csh
 
+# Create a sysusers.d config file
+cat >ccache.sysusers.conf <<EOF
+g ccache -
+EOF
+
 
 %build
 %cmake
@@ -108,6 +112,8 @@ done
 find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
     sed -e "s|^$RPM_BUILD_ROOT|%%ghost |" > %{name}-%{version}.compilers
 
+install -m0644 -D ccache.sysusers.conf %{buildroot}%{_sysusersdir}/ccache.conf
+
 
 %check
 %ctest
@@ -217,8 +223,6 @@ done\
 %ccache_trigger -p gcc-xtensa-linux-gnu xtensa-linux-gnu-gcc
 %ccache_trigger -p gcc-c++-xtensa-linux-gnu xtensa-linux-gnu-c++ xtensa-linux-gnu-g++
 
-%pre
-getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %files -f %{name}-%{version}.compilers
@@ -229,9 +233,13 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 %dir %{_libdir}/ccache/
 %attr(2770,root,ccache) %dir %{_var}/cache/ccache/
 %{_mandir}/man1/ccache.1*
+%{_sysusersdir}/ccache.conf
 
 
 %changelog
+* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.10.2-3
+- Add sysusers.d config file to allow rpm to create users/groups automatically
+
 * Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 

From 286b8ceca272be009ebe0d7e23e10a5bd9b73c2b Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Mon, 17 Mar 2025 20:26:11 -0600
Subject: [PATCH 148/153] Update to 4.11.1

---
 .gitignore  |  1 +
 ccache.spec | 10 ++++++----
 sources     |  2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 71f8609..a4c12f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@
 /ccache-4.10.tar.gz
 /ccache-4.10.1.tar.gz
 /ccache-4.10.2.tar.gz
+/ccache-4.11.1.tar.gz
diff --git a/ccache.spec b/ccache.spec
index add086e..1a3ca74 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.10.2
-Release:        3%{?dist}
+Version:        4.11.1
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -55,8 +55,7 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 
 %prep
-%setup -q
-%autopatch -p1
+%autosetup -p1
 # win32-compat gets imported, but not used
 rm -r src/third_party/{[ad-lo-tvy-z]*,cpp-httplib}
 sed -e 's|@LIBDIR@|%{_libdir}|g' -e 's|@CACHEDIR@|%{_var}/cache/ccache|g' \
@@ -237,6 +236,9 @@ done\
 
 
 %changelog
+* Tue Mar 18 2025 Orion Poplawski <orion@nwra.com> - 4.11.1-1
+- Update to 4.11.1
+
 * Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 4.10.2-3
 - Add sysusers.d config file to allow rpm to create users/groups automatically
 
diff --git a/sources b/sources
index dea28e4..f68599f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.10.2.tar.gz) = c6b66821372492b3e52cfaaad9a3167039aa943557ab2e1119fa68e3e983dcd022b839c54ef016802c0092209cae8122fcb8aa4dbe3bc03902183376bde2c4ef
+SHA512 (ccache-4.11.1.tar.gz) = b73a86bbb3c381653ea7646abd0ff932e4369e71326feddf7e85a6d0c00ede529b0a191ab220dc04ebb1dc018661d2720f1e481759678ba8bda355c7317b27f7

From 7b28be2f5e198a9a13610d7823b1c9a6dce72fb0 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Mon, 24 Mar 2025 19:06:13 -0600
Subject: [PATCH 149/153] Update to 4.11.2

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4c12f3..bc0d31d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@
 /ccache-4.10.1.tar.gz
 /ccache-4.10.2.tar.gz
 /ccache-4.11.1.tar.gz
+/ccache-4.11.2.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 1a3ca74..6d85be8 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.11.1
+Version:        4.11.2
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -236,6 +236,9 @@ done\
 
 
 %changelog
+* Tue Mar 25 2025 Orion Poplawski <orion@nwra.com> - 4.11.2-1
+- Update to 4.11.2
+
 * Tue Mar 18 2025 Orion Poplawski <orion@nwra.com> - 4.11.1-1
 - Update to 4.11.1
 
diff --git a/sources b/sources
index f68599f..247b73d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.11.1.tar.gz) = b73a86bbb3c381653ea7646abd0ff932e4369e71326feddf7e85a6d0c00ede529b0a191ab220dc04ebb1dc018661d2720f1e481759678ba8bda355c7317b27f7
+SHA512 (ccache-4.11.2.tar.gz) = 3d68bfeb31a535c0b886fa7575938a69cff8c453a450fee8e6c4bbfb744a04128745a333456fb2cec4795aa26d8b8ad272c879d36019cbd579c4449a5ed3b9a8

From d9e3a94bc1a880932bb67a73bff82c92d4f23cd5 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 8 May 2025 22:08:42 -0600
Subject: [PATCH 150/153] Update to 4.11.3

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index bc0d31d..7692173 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /ccache-4.10.2.tar.gz
 /ccache-4.11.1.tar.gz
 /ccache-4.11.2.tar.gz
+/ccache-4.11.3.tar.gz
diff --git a/ccache.spec b/ccache.spec
index 6d85be8..e33e012 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.11.2
+Version:        4.11.3
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -236,6 +236,9 @@ done\
 
 
 %changelog
+* Fri May 09 2025 Orion Poplawski <orion@nwra.com> - 4.11.3-1
+- Update to 4.11.3
+
 * Tue Mar 25 2025 Orion Poplawski <orion@nwra.com> - 4.11.2-1
 - Update to 4.11.2
 
diff --git a/sources b/sources
index 247b73d..f7eb5e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.11.2.tar.gz) = 3d68bfeb31a535c0b886fa7575938a69cff8c453a450fee8e6c4bbfb744a04128745a333456fb2cec4795aa26d8b8ad272c879d36019cbd579c4449a5ed3b9a8
+SHA512 (ccache-4.11.3.tar.gz) = e312be133c6cf519588afd6a40480dd796c61b05a66549830314ba343291bc1d8a9e370e21001abcbf6947ea1a1e562025c7ba229154da26b019a9f4b727bb4c

From 6c9b8623ec2f3e739c886bc5ff00f65ad158ac28 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 23 Jul 2025 18:08:53 +0000
Subject: [PATCH 151/153] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 ccache.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ccache.spec b/ccache.spec
index e33e012..d65a076 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -13,7 +13,7 @@
 
 Name:           ccache
 Version:        4.11.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -236,6 +236,9 @@ done\
 
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Fri May 09 2025 Orion Poplawski <orion@nwra.com> - 4.11.3-1
 - Update to 4.11.3
 

From e738207be32058c0cc1474d890f1dd145738998a Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 1 Oct 2025 20:48:41 -0600
Subject: [PATCH 152/153] Update to 4.12.1

---
 .gitignore  |  1 +
 ccache.spec | 11 ++++++++---
 sources     |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7692173..4422e68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@
 /ccache-4.11.1.tar.gz
 /ccache-4.11.2.tar.gz
 /ccache-4.11.3.tar.gz
+/ccache-4.12.1.tar.gz
diff --git a/ccache.spec b/ccache.spec
index d65a076..b966bf3 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.11.3
-Release:        2%{?dist}
+Version:        4.12.1
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 # See LICENSE.adoc for licenses of bundled codes
@@ -113,6 +113,8 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
 
 install -m0644 -D ccache.sysusers.conf %{buildroot}%{_sysusersdir}/ccache.conf
 
+install -m0644 README.md %{buildroot}%{_pkgdocdir}/
+
 
 %check
 %ctest
@@ -226,7 +228,7 @@ done\
 
 %files -f %{name}-%{version}.compilers
 %license GPL-3.0.txt LICENSE.*
-%doc doc/AUTHORS.*  doc/MANUAL.* doc/NEWS.* README.md
+%{_pkgdocdir}/
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
@@ -236,6 +238,9 @@ done\
 
 
 %changelog
+* Thu Oct 02 2025 Orion Poplawski <orion@nwra.com> - 4.12.1-1
+- Update to 4.12.1
+
 * Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 4.11.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/sources b/sources
index f7eb5e6..03a471d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.11.3.tar.gz) = e312be133c6cf519588afd6a40480dd796c61b05a66549830314ba343291bc1d8a9e370e21001abcbf6947ea1a1e562025c7ba229154da26b019a9f4b727bb4c
+SHA512 (ccache-4.12.1.tar.gz) = 6536916405ecf02c2a657fd3c20869e4c03b5c5480e56c8f61ca17ca8a59a652a2738af00a0ef99bd5ba6d0195a18a177e64d4c4dcd8beb7c9a39c94d7c98517

From b8b5c9c0682d64e84366bdfec119d5ab9dc5eef1 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Wed, 26 Nov 2025 17:36:09 -0700
Subject: [PATCH 153/153] Update to 4.12.2

---
 .gitignore  | 1 +
 ccache.spec | 5 ++++-
 sources     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4422e68..b0b7403 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@
 /ccache-4.11.2.tar.gz
 /ccache-4.11.3.tar.gz
 /ccache-4.12.1.tar.gz
+/ccache-4.12.2.tar.gz
diff --git a/ccache.spec b/ccache.spec
index b966bf3..f8d1589 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,7 +12,7 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.12.1
+Version:        4.12.2
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
@@ -238,6 +238,9 @@ done\
 
 
 %changelog
+* Thu Nov 27 2025 Orion Poplawski <orion@nwra.com> - 4.12.2-1
+- Update to 4.12.2
+
 * Thu Oct 02 2025 Orion Poplawski <orion@nwra.com> - 4.12.1-1
 - Update to 4.12.1
 
diff --git a/sources b/sources
index 03a471d..a73b9cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ccache-4.12.1.tar.gz) = 6536916405ecf02c2a657fd3c20869e4c03b5c5480e56c8f61ca17ca8a59a652a2738af00a0ef99bd5ba6d0195a18a177e64d4c4dcd8beb7c9a39c94d7c98517
+SHA512 (ccache-4.12.2.tar.gz) = e078a393f41660e401c3a2795fe2c2784413fe9e15313e7a996cd321e0180d5b5b89faf723a4fe3e6414ee644de198707b6bf6d0f003bdf2cd49fad0288bdf73