rpms/ccache/devel ccache.spec,1.17,1.18

[Ville Skytta (scop)]

Author: scop

Update of /cvs/pkgs/rpms/ccache/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27540

Modified Files:
	ccache.spec 
Log Message:
- Make compiler symlinks relative.
- Make profile.d scripts noreplace.



Index: ccache.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ccache.spec	16 Aug 2007 09:09:14 -0000	1.17
+++ ccache.spec	19 Aug 2007 17:05:06 -0000	1.18
@@ -1,6 +1,9 @@
 %define compilers gcc g++ cc c++ gcc296 g++296 gcc32 c++32 g++32 gcc34 c++34 g++34 g++-libstdc++-so_7 avr-gcc avr-c++ avr-g++ arm-gp2x-linux-gcc arm-gp2x-linux-c++ arm-gp2x-linux-g++
 %define pkgs gcc, gcc-c++, compat-gcc, compat-gcc-c++, compat-gcc-32, compat-gcc-32-c++, gcc34, gcc34-c++, compat-gcc-34, compat-gcc-34-c++, libstdc++so7-devel, avr-gcc, avr-gcc-c++, arm-gp2x-linux-gcc, arm-gp2x-linux-gcc-c++
 
+%define abs2rel() perl -MFile::Spec -e 'print File::Spec->abs2rel(@ARGV)' %1 %2
+%{expand: %%define relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)}
+
 Name:           ccache
 Version:        2.4
 Release:        10%{?dist}
@@ -17,6 +20,7 @@
 Patch2:         %{name}-2.4-hardlink-doc.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildRequires:  perl(File::Spec)
 Requires(triggerin): coreutils
 Requires(triggerpostun): coreutils
 
@@ -51,7 +55,7 @@
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/$c
+    ln -s %{relccache} $RPM_BUILD_ROOT%{_libdir}/ccache/$c
     echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
   done
 done
@@ -69,7 +73,7 @@
 %triggerin -- %{pkgs}
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    [ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/$c
+    [ ! -x %{_bindir}/$c ] || ln -sf %{relccache} %{_libdir}/ccache/$c
   done
 done
 :
@@ -86,7 +90,7 @@
 %files -f %{name}-%{version}.compilers
 %defattr(-,root,root,-)
 %doc COPYING README web/*.html
-%config %{_sysconfdir}/profile.d/%{name}.*sh
+%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache/
 %attr(2770,root,ccache) %dir %{_var}/cache/ccache/
@@ -94,8 +98,10 @@
 
 
 %changelog
-* Wed Aug 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
+* Sun Aug 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-10
 - License: GPLv2+
+- Make compiler symlinks relative.
+- Make profile.d scripts noreplace.
 
 * Mon Jul 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 2.4-9
 - Use shared cache dir for users in the ccache group by default