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 - 4.0-1 +- Update to 4.0 + * Thu Oct 1 2020 Orion Poplawski - 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