packages: kdeutils/kdeutils.spec, kdeutils/kde-am.patch - disable arts, fix...

[glen]

Author: glen                         Date: Wed May 26 12:06:14 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable arts, fix builds; rel 10

---- Files affected:
packages/kdeutils:
   kdeutils.spec (1.210 -> 1.211) , kde-am.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/kdeutils/kdeutils.spec
diff -u packages/kdeutils/kdeutils.spec:1.210 packages/kdeutils/kdeutils.spec:1.211
--- packages/kdeutils/kdeutils.spec:1.210	Sun Mar 14 21:26:56 2010
+++ packages/kdeutils/kdeutils.spec	Wed May 26 14:06:09 2010
@@ -2,6 +2,7 @@
 #
 # Conditional build:
 %bcond_without	xmms			# do not force xmms support
+%bcond_with	arts			# build with aRts support
 %bcond_with	hidden_visibility	# gcc hidden visibility
 #
 %define		_state		stable
@@ -18,7 +19,7 @@
 Summary(zh_CN.UTF-8):	KDE实用工具
 Name:		kdeutils
 Version:	3.5.10
-Release:	9
+Release:	10
 Epoch:		9
 License:	GPL
 Group:		X11/Applications
@@ -28,6 +29,7 @@
 Patch0:		kde-common-PLD.patch
 Patch1:		kde-ac260-lt.patch
 Patch2:		%{name}-kmilo-thinklight_notice.patch
+Patch3:		kde-am.patch
 URL:		http://www.kde.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -52,6 +54,9 @@
 %{?with_xmms:BuildRequires:	xmms-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# build broken with spaces in CC
+%undefine	with_ccache
+
 %description
 KDE utilities. Package includes:
  - Ark - archive manager,
@@ -567,6 +572,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Utility;Archiving;/' \
 	ark/ark.desktop
@@ -600,6 +606,7 @@
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
+	--with%{!?with_arts:out}-arts \
 	--with-distribution="PLD Linux Distribution" \
 	--with-extra-libs="%{_datadir}" \
 %ifarch ppc ppc64
@@ -929,6 +936,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.211  2010/05/26 12:06:09  glen
+- disable arts, fix builds; rel 10
+
 Revision 1.210  2010/03/14 20:26:56  glen
 - let build section reset install stamps
 

================================================================
Index: packages/kdeutils/kde-am.patch
diff -u /dev/null packages/kdeutils/kde-am.patch:1.3
--- /dev/null	Wed May 26 14:06:14 2010
+++ packages/kdeutils/kde-am.patch	Wed May 26 14:06:09 2010
@@ -0,0 +1,11 @@
+--- kdelibs-3.5.10/admin/cvs.sh~	2008-08-19 23:28:39.000000000 +0300
++++ kdelibs-3.5.10/admin/cvs.sh	2009-05-19 13:34:47.966210297 +0300
+@@ -68,7 +68,7 @@
+     echo "*** KDE requires automake $required_automake_version"
+     exit 1
+     ;;
+-  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
++  automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
+     echo "*** $AUTOMAKE_STRING found."
+     UNSERMAKE=no
+     ;;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdeutils/kdeutils.spec?r1=1.210&r2=1.211&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdeutils/kde-am.patch?r1=1.2&r2=1.3&f=u