Update to 3.3.6

.gitignore

@@ -1,33 +1 @@
 /*.tar.xz
-/ccache-3.7.1.tar.gz
-/ccache-3.7.5.tar.gz
-/ccache-3.7.6.tar.gz
-/ccache-3.7.7.tar.gz
-/ccache-3.7.8.tar.gz
-/ccache-3.7.9.tar.gz
-/ccache-3.7.11.tar.gz
-/ccache-3.7.12.tar.gz
-/ccache-4.0.tar.gz
-/ccache-4.1.tar.gz
-/ccache-4.2.tar.gz
-/ccache-4.2.1.tar.gz
-/ccache-4.4.2.tar.gz
-/ccache-4.5.1.tar.gz
-/ccache-4.6.1.tar.gz
-/ccache-4.6.3.tar.gz
-/ccache-4.7.3.tar.gz
-/ccache-4.7.4.tar.gz
-/ccache-4.7.5.tar.gz
-/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
-/ccache-4.10.tar.gz
-/ccache-4.10.1.tar.gz
-/ccache-4.10.2.tar.gz
-/ccache-4.11.1.tar.gz
-/ccache-4.11.2.tar.gz
-/ccache-4.11.3.tar.gz
-/ccache-4.12.1.tar.gz
-/ccache-4.12.2.tar.gz

ccache.spec

@@ -12,40 +12,24 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        4.12.2
+Version:        3.3.6
 Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
-# See LICENSE.adoc for licenses of bundled codes
-# blake3 is Apache-2.0
-# 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
+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
 
-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
+BuildRequires:  perl(File::Spec)
+BuildRequires:  zlib-devel >= 1.2.3
 # clang for additional tests
-BuildRequires:  clang clang-tools-extra
+BuildRequires:  clang
 # coreutils for triggerin, triggerpostun
 Requires:       coreutils
 # For groupadd
-Provides:       bundled(blake3) = 1.5.1
-Provides:       bundled(span-lite) = 0.11.0
-Provides:       bundled(cxxurl)
+Requires(pre):  shadow-utils
 
 %description
 ccache is a compiler cache.  It speeds up recompilation of C/C++ code
@@ -55,30 +39,24 @@ being done again.  The main focus is to handle the GNU C/C++ compiler
 
 
 %prep
-%autosetup -p1
-# win32-compat gets imported, but not used
-rm -r src/third_party/{[ad-lo-tvy-z]*,cpp-httplib}
+%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' \
     %{SOURCE2} > %{name}.csh
-
-# Create a sysusers.d config file
-cat >ccache.sysusers.conf <<EOF
-g ccache -
-EOF
+# Make sure system zlib is used
+rm -r zlib
 
 
 %build
-%cmake
-%cmake_build
-%cmake_build --target doc
+%configure
+make %{?_smp_mflags}
 
 
 %install
-%cmake_install
+rm -rf $RPM_BUILD_ROOT
 
-install -Dpm 644 %{__cmake_builddir}/doc/ccache.1 $RPM_BUILD_ROOT%{_mandir}/man1/ccache.1
+%make_install
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
@@ -93,8 +71,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 powerpc64le ppc64 ppc64le \
-        s390x sh sh64 sparc64 tile x86_64 xtensa ; do
+        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
@@ -111,13 +89,10 @@ 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
-
-install -m0644 README.md %{buildroot}%{_pkgdocdir}/
-
 
 %check
-%ctest
+make check
+make check CC=clang
 
 
 %define ccache_trigger(p:) \
@@ -203,12 +178,8 @@ 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
@@ -224,210 +195,26 @@ 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
 %license GPL-3.0.txt LICENSE.*
-%{_pkgdocdir}/
+%doc AUTHORS.*  MANUAL.* NEWS.* README.md
 %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
 %attr(2770,root,ccache) %dir %{_var}/cache/ccache/
 %{_mandir}/man1/ccache.1*
-%{_sysusersdir}/ccache.conf
 
 
 %changelog
-* Thu Nov 27 2025 Orion Poplawski <orion@nwra.com> - 4.12.2-1
-- Update to 4.12.2
+* Mon Feb 16 2018 Michael Cullen <michael@cullen-online.com> - 3.3.6-1
+- Update to 3.3.6
 
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-- 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
-
-* 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
+* Mon Jan 22 2018 Michael Cullen <michael@cullen-online.com> - 3.3.5-1
+- Update to 3.3.5
 
 * Sat Feb 18 2017 Ville Skyttä <ville.skytta@iki.fi> - 3.3.4-1
 - Update to 3.3.4

sources

@@ -1 +1 @@
-SHA512 (ccache-4.12.2.tar.gz) = e078a393f41660e401c3a2795fe2c2784413fe9e15313e7a996cd321e0180d5b5b89faf723a4fe3e6414ee644de198707b6bf6d0f003bdf2cd49fad0288bdf73
+SHA512 (ccache-3.3.6.tar.xz) = 149ac45b2bc2bf09d9a97d4e7b4352fbea1d8e230f75c0caaae785afb9f8c468fa62cf4adf8eb72da41c79a2f7d8d9330bbf9bb7737fe368bd422bf1e6579918