packages: kdenetwork/kde-am.patch, kdenetwork/kdenetwork.spec - am 1.11 sup...

[glen]

Author: glen                         Date: Wed May 20 14:23:59 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- am 1.11 support

---- Files affected:
packages/kdenetwork:
   kde-am.patch (1.1 -> 1.2) , kdenetwork.spec (1.271 -> 1.272) 

---- Diffs:

================================================================
Index: packages/kdenetwork/kde-am.patch
diff -u packages/kdenetwork/kde-am.patch:1.1 packages/kdenetwork/kde-am.patch:1.2
--- packages/kdenetwork/kde-am.patch:1.1	Fri Oct 27 10:00:00 2006
+++ packages/kdenetwork/kde-am.patch	Wed May 20 16:23:53 2009
@@ -1,11 +1,11 @@
---- kde/admin/cvs.sh.org	2006-10-27 07:59:00.057543638 +0000
-+++ kde/admin/cvs.sh	2006-10-27 07:59:38.666892277 +0000
+--- 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.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.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
      echo "*** $AUTOMAKE_STRING found."
      UNSERMAKE=no
      ;;

================================================================
Index: packages/kdenetwork/kdenetwork.spec
diff -u packages/kdenetwork/kdenetwork.spec:1.271 packages/kdenetwork/kdenetwork.spec:1.272
--- packages/kdenetwork/kdenetwork.spec:1.271	Fri May 15 17:06:08 2009
+++ packages/kdenetwork/kdenetwork.spec	Wed May 20 16:23:53 2009
@@ -40,6 +40,7 @@
 Patch4:		kopete-icqconn.patch
 Patch5:		%{name}-libjingle.patch
 Patch6:		%{name}-gcc.patch
+Patch7:		kde-am.patch
 URL:		http://www.kde.org/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
@@ -65,8 +66,8 @@
 BuildRequires:	rpmbuild(find_lang) >= 1.32
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
-%{?with_xmms:BuildRequires:	xmms-devel}
 BuildRequires:	speex-devel >= 1.1.6
+%{?with_xmms:BuildRequires:	xmms-devel}
 BuildRequires:	xorg-lib-libXtst-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -1034,6 +1035,7 @@
 %patch4 -p0
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Network;FileTransfer;/' \
 	-e 's/Terminal=0/Terminal=false/' -e '/\[Desktop Entry\]/aEncoding=UTF-8' \
@@ -1739,6 +1741,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.272  2009/05/20 14:23:53  glen
+- am 1.11 support
+
 Revision 1.271  2009/05/15 15:06:08  hawk
 - release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdenetwork/kde-am.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kdenetwork/kdenetwork.spec?r1=1.271&r2=1.272&f=u