packages: kdegraphics/kdegraphics.spec, kdegraphics/kdegraphics-am.patch (N...

[lmasko]

Author: lmasko                       Date: Tue Jul 14 07:32:57 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Automake 1.11 patch added.

---- Files affected:
packages/kdegraphics:
   kdegraphics.spec (1.215 -> 1.216) , kdegraphics-am.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kdegraphics/kdegraphics.spec
diff -u packages/kdegraphics/kdegraphics.spec:1.215 packages/kdegraphics/kdegraphics.spec:1.216
--- packages/kdegraphics/kdegraphics.spec:1.215	Thu Apr 23 12:35:22 2009
+++ packages/kdegraphics/kdegraphics.spec	Tue Jul 14 09:32:52 2009
@@ -26,11 +26,11 @@
 Group:		X11/Applications/Graphics
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5:	a09094b5357d8cd5c49d45b5d291dcfe
-Patch100:	%{name}-branch.diff
 Patch0:		kde-common-PLD.patch
 Patch1:		%{name}-allowprint.patch
 Patch2:		kde-ac260-lt.patch
 Patch3:		%{name}-kuickshow-imlib.patch
+Patch4:		%{name}-am.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.1.0
 BuildRequires:	OpenGL-GLU-devel
@@ -531,11 +531,11 @@
 
 %prep
 %setup -q
-%patch100 -p0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Graphics;Viewer;/' \
 	kdvi/kdvi.desktop \
@@ -898,6 +898,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.216  2009/07/14 07:32:52  lmasko
+- Automake 1.11 patch added.
+
 Revision 1.215  2009/04/23 10:35:22  glen
 - add branch.diff
 

================================================================
Index: packages/kdegraphics/kdegraphics-am.patch
diff -u /dev/null packages/kdegraphics/kdegraphics-am.patch:1.1
--- /dev/null	Tue Jul 14 09:32:57 2009
+++ packages/kdegraphics/kdegraphics-am.patch	Tue Jul 14 09:32:52 2009
@@ -0,0 +1,11 @@
+--- kdegraphics-3.5.10/admin/cvs.sh~	2008-08-19 22:22:24.000000000 +0200
++++ kdegraphics-3.5.10/admin/cvs.sh	2009-07-14 09:11:55.000000000 +0200
+@@ -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/kdegraphics/kdegraphics.spec?r1=1.215&r2=1.216&f=u