diff --git a/.gitignore b/.gitignore index b0b7403..9159c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -20,14 +20,3 @@ /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 diff --git a/ccache.spec b/ccache.spec index f8d1589..28cbc7d 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,15 +12,11 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.12.2 -Release: 1%{?dist} +Version: 4.8.2 +Release: 2%{?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 +License: GPLv3+ URL: http://ccache.dev/ Source0: https://github.com/ccache/ccache/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: %{name}.sh.in @@ -28,24 +24,15 @@ 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 # clang for additional tests BuildRequires: clang clang-tools-extra # 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,19 +42,12 @@ 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 < %{name}-%{version}.compilers -install -m0644 -D ccache.sysusers.conf %{buildroot}%{_sysusersdir}/ccache.conf - -install -m0644 README.md %{buildroot}%{_pkgdocdir}/ - %check %ctest @@ -224,77 +202,21 @@ 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 doc/AUTHORS.* doc/MANUAL.* doc/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 - 4.12.2-1 -- Update to 4.12.2 - -* Thu Oct 02 2025 Orion Poplawski - 4.12.1-1 -- Update to 4.12.1 - -* Wed Jul 23 2025 Fedora Release Engineering - 4.11.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Fri May 09 2025 Orion Poplawski - 4.11.3-1 -- Update to 4.11.3 - -* Tue Mar 25 2025 Orion Poplawski - 4.11.2-1 -- Update to 4.11.2 - -* Tue Mar 18 2025 Orion Poplawski - 4.11.1-1 -- Update to 4.11.1 - -* Tue Feb 11 2025 Zbigniew Jędrzejewski-Szmek - 4.10.2-3 -- Add sysusers.d config file to allow rpm to create users/groups automatically - -* Thu Jan 16 2025 Fedora Release Engineering - 4.10.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Wed Jul 31 2024 Orion Poplawski - 4.10.2-1 -- Update to 4.10.2 - -* Fri Jul 26 2024 Kefu Chai - 4.10.1-3 -- Rebuilt for fmt 11 - -* Wed Jul 17 2024 Fedora Release Engineering - 4.10.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Fri Jul 12 2024 Orion Poplawski - 4.10.1-1 -- Update to 4.10.1 - -* Sun Jun 02 2024 Orion Poplawski - 4.10-1 -- Update to 4.10 - -* Sat May 11 2024 Kevin Fenzi - 4.9.1-2 -- rebuild for hiredis soname bump - -* Tue Feb 06 2024 Orion Poplawski - 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 - 4.8.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 4.8.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Orion Poplawski - 4.8.3-1 -- Update to 4.8.3 - * Wed Jul 19 2023 Fedora Release Engineering - 4.8.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index a73b9cd..ab6a16a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.12.2.tar.gz) = e078a393f41660e401c3a2795fe2c2784413fe9e15313e7a996cd321e0180d5b5b89faf723a4fe3e6414ee644de198707b6bf6d0f003bdf2cd49fad0288bdf73 +SHA512 (ccache-4.8.2.tar.gz) = 61841b2ae307d99aeae2a21be66f56fa58f72b56a51c830f686218c03e04314757b7d38af4ac501a8280c9a67b0ca0f95ffc53b19543957d103223f990b97d4c