SPECS: k3b.spec - merge with AC-branch

[glen]

Author: glen                         Date: Mon Dec 11 10:11:50 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge with AC-branch

---- Files affected:
SPECS:
   k3b.spec (1.139 -> 1.140) 

---- Diffs:

================================================================
Index: SPECS/k3b.spec
diff -u SPECS/k3b.spec:1.139 SPECS/k3b.spec:1.140
--- SPECS/k3b.spec:1.139	Mon Sep 18 14:18:25 2006
+++ SPECS/k3b.spec	Mon Dec 11 11:11:45 2006
@@ -24,6 +24,7 @@
 Patch2:		%{name}-group.patch
 Patch3:		kde-ac260.patch
 Patch4:		kde-ac260-lt.patch
+Patch5:		kde-am.patch
 URL:		http://www.k3b.org/
 BuildRequires:	arts-qt-devel
 BuildRequires:	autoconf >= 2.52
@@ -282,12 +283,12 @@
 Requires:	%{name} = %{version}-%{release}
 
 %description plugin-project
-Additional plugins from group project:
-Audio Metainfo Renamer, Cddb Audio Plugin.
+Additional plugins from group project: Audio Metainfo Renamer, Cddb
+Audio Plugin.
 
 %description plugin-project -l pl
-Dodatkowe wtyczki z grupy projekt:
-Audio Metainfo Renamer, Cddb Audio Plugin.
+Dodatkowe wtyczki z grupy projekt: Audio Metainfo Renamer, Cddb Audio
+Plugin.
 
 %prep
 %setup -q -a1
@@ -296,6 +297,11 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+cd k3b-i18n-%{version}
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -468,6 +474,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.140  2006/12/11 10:11:45  glen
+- merge with AC-branch
+
 Revision 1.139  2006/09/18 12:18:25  shadzik
 - remove R: kdelibs, it's taken from BR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/k3b.spec?r1=1.139&r2=1.140&f=u