SPECS (AC-branch): k3b.spec - HEAD merge

[glen]

Author: glen                         Date: Sun Dec 10 12:47:09 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- HEAD merge

---- Files affected:
SPECS:
   k3b.spec (1.137.2.1 -> 1.137.2.1.2.1) 

---- Diffs:

================================================================
Index: SPECS/k3b.spec
diff -u SPECS/k3b.spec:1.137.2.1 SPECS/k3b.spec:1.137.2.1.2.1
--- SPECS/k3b.spec:1.137.2.1	Sat Aug 26 19:09:44 2006
+++ SPECS/k3b.spec	Sun Dec 10 13:47:04 2006
@@ -22,7 +22,8 @@
 Patch0:		%{name}-linux22.patch
 Patch1:		%{name}-desktop.patch
 Patch2:		%{name}-group.patch
-Patch3:		%{name}-autotools.patch
+Patch3:		kde-ac260.patch
+Patch4:		kde-ac260-lt.patch
 URL:		http://www.k3b.org/
 BuildRequires:	arts-qt-devel
 BuildRequires:	autoconf >= 2.52
@@ -45,7 +46,6 @@
 BuildRequires:	taglib-devel
 Requires:	cdrdao >= 1.1.5
 Requires:	cdrecord
-Requires:	kdelibs
 Requires:	mkisofs
 %if %{with reqs}
 Requires:	normalize
@@ -295,6 +295,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 cp -f /usr/share/automake/config.sub admin
@@ -467,6 +468,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137.2.1.2.1  2006/12/10 12:47:04  glen
+- HEAD merge
+
 Revision 1.137.2.1  2006/08/26 17:09:44  shadzik
 - 0.12.17; started new AC-branch; spec with BR dbus-qt-devel >= 0.62
 
================================================================

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