Update to 4.8.3

README.en.md

@@ -3,21 +3,6 @@
 #### Description
 ccache is a c/c++ compiler ccache
 
-#### Software Architecture
-Software architecture description
-
-#### Installation
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### Instructions
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
 #### Contribution
 
 1.  Fork the repository

README.md

@@ -3,22 +3,6 @@
 #### 介绍
 ccache is a c/c++ compiler ccache
 
-#### 软件架构
-软件架构说明
-
-
-#### 安装教程
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
-#### 使用说明
-
-1.  xxxx
-2.  xxxx
-3.  xxxx
-
 #### 参与贡献
 
 1.  Fork 本仓库

ccache.csh.in

@@ -23,4 +23,4 @@ else if ( $uid != 0 ) then
         setenv CCACHE_UMASK 002
         unsetenv CCACHE_HARDLINK
     endif
-endif
+endif

ccache.spec

@@ -10,7 +10,7 @@
 %define abs2rel() perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' %1 %2
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 Name:                ccache
-Version:             3.7.12
+Version:             4.8.3
 Release:             1
 Summary:             C/C++ compiler cache
 License:             GPLv3+
@@ -18,9 +18,15 @@ 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
-BuildRequires:       perl perl(File::Spec) zlib-devel >= 1.2.3 clang
+BuildRequires:       perl perl(File::Spec)
+BuildRequires:       rubygem-asciidoctor
+BuildRequires:       cmake
+BuildRequires:       hiredis-devel
+BuildRequires:       libzstd-devel
+BuildRequires:       clang clang-tools-extra
+
 Requires:            coreutils
-Requires(pre):  shadow-utils
+Requires(pre):       shadow-utils
 %description
 ccache is a compiler cache.  It speeds up recompilation of C/C++ code
 by caching previous compiles and detecting when the same compile is
@@ -33,15 +39,17 @@ 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
-rm -r src/zlib
 
 %build
-%configure
-make %{?_smp_mflags}
+%cmake
+%make_build
+%make_build doc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %make_install
+install -Dpm 644 %{_builddir}/ccache-%{version}/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
 install -dm 770 $RPM_BUILD_ROOT%{_var}/cache/ccache
@@ -71,8 +79,8 @@ find $RPM_BUILD_ROOT%{_libdir}/ccache -type l | \
     sed -e "s|^$RPM_BUILD_ROOT|%%ghost |" > %{name}-%{version}.compilers
 
 %check
-make check
-make check CC=clang
+ctest
+
 %define ccache_trigger(p:) \
 %triggerin -- %{-p*}\
 for n in %* ; do\
@@ -188,5 +196,8 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 %{_mandir}/man1/ccache.1*
 
 %changelog
+* Fri Dec 8 zhoujing <zhoujing106@huawei.com> - 4.8.3-1
+- Update to 4.8.3
+
 * Fri Dec 4 2020 huanghaitao <huanghaitao8@huawei.com> - 3.7.12-1
 - package init