rpms/ccache/devel ccache.spec,1.10,1.11

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	ccache.spec 
Log Message:
* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-4
- Drop "bin" from compiler symlink path.
- Make profile.d snippets non-executable (#35714).



Index: ccache.spec
===================================================================
RCS file: /cvs/extras/rpms/ccache/devel/ccache.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ccache.spec	4 May 2005 19:53:51 -0000	1.10
+++ ccache.spec	18 Feb 2006 11:43:08 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:		ccache
 Version:	2.4
-Release:	3
+Release:	4%{?dist}
 Summary:	C/C++ compiler cache
 
 Group:		Development/Tools
@@ -14,9 +14,9 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
-ccache is a compiler cache. It acts as a caching pre-processor to
+ccache is a compiler cache.  It acts as a caching pre-processor to
 C/C++ compilers, using the -E compiler switch and a hash to detect
-when a compilation can be satisfied from cache. This often results in
+when a compilation can be satisfied from cache.  This often results in
 a 5 to 10 times speedup in common compilations.
 
 
@@ -29,13 +29,13 @@
 %configure
 %{__make} %{?_smp_mflags}
 cat <<EOF > %{name}.sh
-if ! echo "\$PATH" | grep -q %{_libdir}/ccache/bin ; then
-    PATH="%{_libdir}/ccache/bin:\$PATH"
+if ! echo "\$PATH" | grep -q %{_libdir}/ccache ; then
+    PATH="%{_libdir}/ccache:\$PATH"
 fi
 EOF
 cat <<EOF > %{name}.csh
-if ( "\$path" !~ *%{_libdir}/ccache/bin* ) then
-    set path = ( %{_libdir}/ccache/bin \$path )
+if ( "\$path" !~ *%{_libdir}/ccache* ) then
+    set path = ( %{_libdir}/ccache \$path )
 endif
 EOF
 
@@ -44,12 +44,12 @@
 rm -rf $RPM_BUILD_ROOT %{name}-%{version}.compilers
 make install DESTDIR=$RPM_BUILD_ROOT
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -pm 755 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
-install -dm 755 $RPM_BUILD_ROOT%{_libdir}/ccache/bin
+install -pm 644 %{name}.sh %{name}.csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
+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/bin/$c
-    echo "%ghost %{_libdir}/ccache/bin/$c" >> %{name}-%{version}.compilers
+    ln -s %{_bindir}/ccache $RPM_BUILD_ROOT%{_libdir}/ccache/$c
+    echo "%ghost %{_libdir}/ccache/$c" >> %{name}-%{version}.compilers
   done
 done
 
@@ -61,14 +61,14 @@
 %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/bin/$c
+    [ ! -x %{_bindir}/$c ] || ln -sf %{_bindir}/ccache %{_libdir}/ccache/$c
   done
 done
 
 %triggerpostun -- %{pkgs}
 for name in %{compilers} ; do
   for c in $name %{_target_cpu}-%{_vendor}-%{_target_os}-$name ; do
-    [ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/bin/$c
+    [ -x %{_bindir}/$c ] || rm -f %{_libdir}/ccache/$c
   done
 done
 
@@ -79,11 +79,14 @@
 %config %{_sysconfdir}/profile.d/%{name}.*sh
 %{_bindir}/ccache
 %dir %{_libdir}/ccache
-%dir %{_libdir}/ccache/bin
 %{_mandir}/man1/ccache.1*
 
 
 %changelog
+* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-4
+- Drop "bin" from compiler symlink path.
+- Make profile.d snippets non-executable (#35714).
+
 * Sun May  1 2005 Ville Skyttä <ville.skytta at iki.fi> - 2.4-3
 - Auto-symlink update: add compat-gcc-32 and compat-gcc-32-c++, drop
   bunch of no longer relevant compilers.