diff --git a/.gitignore b/.gitignore index b0b7403..71f8609 100644 --- a/.gitignore +++ b/.gitignore @@ -26,8 +26,3 @@ /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..0d161de 100644 --- a/ccache.spec +++ b/ccache.spec @@ -12,7 +12,7 @@ %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache) Name: ccache -Version: 4.12.2 +Version: 4.10.2 Release: 1%{?dist} Summary: C/C++ compiler cache @@ -43,6 +43,7 @@ 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) @@ -55,7 +56,8 @@ being done again. The main focus is to handle the GNU C/C++ compiler %prep -%autosetup -p1 +%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' \ @@ -63,11 +65,6 @@ 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 < %{name}-%{version}.compilers -install -m0644 -D ccache.sysusers.conf %{buildroot}%{_sysusersdir}/ccache.conf - -install -m0644 README.md %{buildroot}%{_pkgdocdir}/ - %check %ctest @@ -224,44 +217,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 diff --git a/sources b/sources index a73b9cd..dea28e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ccache-4.12.2.tar.gz) = e078a393f41660e401c3a2795fe2c2784413fe9e15313e7a996cd321e0180d5b5b89faf723a4fe3e6414ee644de198707b6bf6d0f003bdf2cd49fad0288bdf73 +SHA512 (ccache-4.10.2.tar.gz) = c6b66821372492b3e52cfaaad9a3167039aa943557ab2e1119fa68e3e983dcd022b839c54ef016802c0092209cae8122fcb8aa4dbe3bc03902183376bde2c4ef