Merge branch 'master' into el6
This commit is contained in:
commit
6d987f16b8
2
.gitignore
vendored
2
.gitignore
vendored
@ -1 +1 @@
|
||||
/ccache-3.1.4.tar.xz
|
||||
/*.tar.xz
|
||||
|
@ -24,3 +24,5 @@ else if ( $uid != 0 ) then
|
||||
unsetenv CCACHE_HARDLINK
|
||||
endif
|
||||
endif
|
||||
|
||||
setenv CCACHE_HASHDIR
|
||||
|
@ -25,3 +25,5 @@ elif [ "${EUID:-}" != 0 ] ; then
|
||||
unset CCACHE_HARDLINK
|
||||
fi
|
||||
fi
|
||||
|
||||
export CCACHE_HASHDIR=
|
||||
|
13
ccache.spec
13
ccache.spec
@ -12,8 +12,8 @@
|
||||
%global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
|
||||
|
||||
Name: ccache
|
||||
Version: 3.1.4
|
||||
Release: 4%{?dist}
|
||||
Version: 3.1.6
|
||||
Release: 1%{?dist}
|
||||
Summary: C/C++ compiler cache
|
||||
|
||||
Group: Development/Tools
|
||||
@ -142,6 +142,15 @@ getent group ccache >/dev/null || groupadd -r ccache || :
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Dec 4 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.6-2
|
||||
- Turn on CCACHE_HASHDIR by default (#759592, Jan Kratochvil).
|
||||
|
||||
* Mon Aug 22 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.6-1
|
||||
- Update to 3.1.6.
|
||||
|
||||
* Mon May 30 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.5-1
|
||||
- Update to 3.1.5.
|
||||
|
||||
* Sat Apr 2 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.4-4
|
||||
- Replace Requires(trigger*) with plain requires to appease rpmbuild >= 4.9.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user