[packages/util-vserver] better fix for diet & ccache that works with rpm5

[glen]

commit 7352b98458ce936261ed278200c5cfa448fc97f6
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Oct 28 14:45:11 2012 +0200

    better fix for diet & ccache that works with rpm5

 diet-ccache.patch | 13 +++++++++++++
 util-vserver.spec |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/util-vserver.spec b/util-vserver.spec
index eb48a49..2e91786 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -10,8 +10,6 @@
 %bcond_with	xalan			# use the xalan xslt processor
 
 %define	vproc_version 0.01
-# diet compile fails with ccache in %{__cc}
-%undefine	with_ccache
 
 %ifarch ppc
 # pdflatex: refman: Invalid argument
@@ -79,6 +77,7 @@ Patch24:	vunify-more-exclude.patch
 Patch25:	stat.patch
 Patch26:	%{name}-am.patch
 Patch27:	%{name}-rpm5.patch
+Patch28:	diet-ccache.patch
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires:	autoconf
 BuildRequires:	automake >= 1.9
@@ -443,8 +442,9 @@ Szablony do tworzenia VServerów dla dystrybucji Titanium Linux.
 %patch25 -p1
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
-install %{SOURCE9} package-management.txt
+cp -p %{SOURCE9} package-management.txt
 
 %build
 unset LD_SYMBOLIC_FUNCTIONS || :
diff --git a/diet-ccache.patch b/diet-ccache.patch
new file mode 100644
index 0000000..6db5dd4
--- /dev/null
+++ b/diet-ccache.patch
@@ -0,0 +1,13 @@
+diet does not work well with ccache (missing quoting somewhere)
+
+--- util-vserver-0.30.216-pre3034/Makefile.am~	2012-10-28 14:16:40.000000000 +0200
++++ util-vserver-0.30.216-pre3034/Makefile.am	2012-10-28 14:37:18.207577514 +0200
+@@ -91,7 +91,7 @@
+ AM_INSTALLCHECK_STD_OPTIONS_EXEMPT =
+ 
+ if USE_DIETLIBC
+-DIET_CC		       :=  $(DIET) $(DIETFLAGS) $(CC)
++DIET_CC		       :=  $(DIET) $(DIETFLAGS) $(filter-out ccache,$(CC))
+ VSERVER_LDFLGS	       :=  -static
+ else
+ VSERVER_LDFLGS	       :=
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/util-vserver.git/commitdiff/7352b98458ce936261ed278200c5cfa448fc97f6