packages: kdeartwork/kdeartwork.spec, kdeartwork/kde-am.patch - disable art...

[glen]

Author: glen                         Date: Mon May  3 15:52:41 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- disable arts, kde-am fix

---- Files affected:
packages/kdeartwork:
   kdeartwork.spec (1.126 -> 1.127) , kde-am.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/kdeartwork/kdeartwork.spec
diff -u packages/kdeartwork/kdeartwork.spec:1.126 packages/kdeartwork/kdeartwork.spec:1.127
--- packages/kdeartwork/kdeartwork.spec:1.126	Mon May  3 16:46:47 2010
+++ packages/kdeartwork/kdeartwork.spec	Mon May  3 17:52:35 2010
@@ -1,6 +1,9 @@
 # $Revision$, $Date$
 # TODO:
 # - Splitting kde-emoticons subpkg
+#
+# Conditional build:
+%bcond_with	arts			# build with aRts support
 
 %define		_state		stable
 %define		_minlibsevr	9:%{version}
@@ -23,6 +26,7 @@
 Patch1:		%{name}-screensavers.patch
 Patch2:		%{name}-xscreensaver-dir.patch
 Patch3:		kde-ac260-lt.patch
+Patch4:		kde-am.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenGL-devel
 BuildRequires:	ed
@@ -374,6 +378,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -384,6 +389,7 @@
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	%{!?debug:--disable-rpath} \
 	--disable-final \
+	--with%{!?with_arts:out}-arts \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
@@ -538,6 +544,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.127  2010/05/03 15:52:35  glen
+- disable arts, kde-am fix
+
 Revision 1.126  2010/05/03 14:46:47  glen
 - fix branch.diff
 

================================================================
Index: packages/kdeartwork/kde-am.patch
diff -u /dev/null packages/kdeartwork/kde-am.patch:1.3
--- /dev/null	Mon May  3 17:52:41 2010
+++ packages/kdeartwork/kde-am.patch	Mon May  3 17:52:35 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/kdeartwork/kdeartwork.spec?r1=1.126&r2=1.127&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdeartwork/kde-am.patch?r1=1.2&r2=1.3&f=u