packages: kdemultimedia/kde-am.patch, kdemultimedia/kdemultimedia.spec - am...

[glen]

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

---- Files affected:
packages/kdemultimedia:
   kde-am.patch (1.1 -> 1.2) , kdemultimedia.spec (1.247 -> 1.248) 

---- Diffs:

================================================================
Index: packages/kdemultimedia/kde-am.patch
diff -u packages/kdemultimedia/kde-am.patch:1.1 packages/kdemultimedia/kde-am.patch:1.2
--- packages/kdemultimedia/kde-am.patch:1.1	Fri Oct 27 10:00:00 2006
+++ packages/kdemultimedia/kde-am.patch	Wed May 20 16:29:51 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/kdemultimedia/kdemultimedia.spec
diff -u packages/kdemultimedia/kdemultimedia.spec:1.247 packages/kdemultimedia/kdemultimedia.spec:1.248
--- packages/kdemultimedia/kdemultimedia.spec:1.247	Thu Apr 23 12:35:22 2009
+++ packages/kdemultimedia/kdemultimedia.spec	Wed May 20 16:29:51 2009
@@ -30,6 +30,7 @@
 Patch1:		kde-ac260-lt.patch
 Patch2:		%{name}-bug-157891.patch
 Patch3:		%{name}-gcc.patch
+Patch4:		kde-am.patch
 URL:		http://www.kde.org/
 BuildRequires:	akode-devel
 %{?with_alsa:BuildRequires:	alsa-lib-devel}
@@ -66,7 +67,6 @@
 BuildRequires:	rpmbuild(macros) >= 1.129
 BuildRequires:	speex-devel
 BuildRequires:	taglib-devel >= 0.95.031114
-#BuildRequires:	unsermake >= 040511
 %{?with_xine:BuildRequires:	xine-lib-devel >= 1:1.0}
 BuildRequires:	zlib-devel
 Obsoletes:	kdemultimedia-libworkman
@@ -182,16 +182,18 @@
 FFT, listę obsługiwanych typów plików, moduły zarządzania klientami,
 midi oraz środowiskiem, a także monitor stanu serwera dźwięku.
 
-#%package artsplugin-audiofile
-#Summary:	Audiofile Plug-in
-#Summary(pl):	Wtyczka do Audiofile
-#Group:		X11/Applications
-#Requires:	%{name}-arts = %{epoch}:%{version}-%{release}
-#Obsoletes:	kdemultimedia-arts < 9:3.1.92.021012
+%package artsplugin-audiofile
+Summary:	Audiofile Plug-in
+Summary(pl.UTF-8):	Wtyczka do Audiofile
+Group:		X11/Applications
+Requires:	%{name}-arts = %{epoch}:%{version}-%{release}
+Obsoletes:	kdemultimedia-arts < 9:3.1.92.021012
 
-#%description artsplugin-audiofile #Audiofile Plug-in.
+%description artsplugin-audiofile
+Audiofile Plug-in.
 
-#%description artsplugin-audiofile -l pl #Wtyczka do Audiofile.
+%description artsplugin-audiofile -l pl.UTF-8
+Wtyczka do Audiofile.
 
 %package artsplugin-xine
 Summary:	Xine engine plugin for arts
@@ -519,6 +521,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %{__sed} -i -e 's/Categories=.*/Categories=Qt;KDE;Audio;Player;/' \
 	juk/juk.desktop \
@@ -1006,6 +1009,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.248  2009/05/20 14:29:51  glen
+- am 1.11 support
+
 Revision 1.247  2009/04/23 10:35:22  glen
 - add branch.diff
 
================================================================

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