rpms/kdebase/devel kdebase-3.5.1-konsole-fonts.patch, NONE, 1.1 kdebase.spec, 1.156, 1.157

[fedora-cvs-commits at redhat.com]

Author: than

Update of /cvs/dist/rpms/kdebase/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27464

Modified Files:
	kdebase.spec 
Added Files:
	kdebase-3.5.1-konsole-fonts.patch 
Log Message:
- fixed rpm file conflict


kdebase-3.5.1-konsole-fonts.patch:
 Makefile.am |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kdebase-3.5.1-konsole-fonts.patch ---
--- kdebase-3.5.1/konsole/Makefile.am.orig	2006-02-21 19:52:27.000000000 +0100
+++ kdebase-3.5.1/konsole/Makefile.am	2006-02-21 19:52:32.000000000 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = konsole other doc fonts
+SUBDIRS = konsole other doc
 
 xdg_apps_DATA = konsole.desktop konsolesu.desktop
 


Index: kdebase.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebase/devel/kdebase.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- kdebase.spec	21 Feb 2006 15:42:05 -0000	1.156
+++ kdebase.spec	21 Feb 2006 18:57:52 -0000	1.157
@@ -51,6 +51,7 @@
 Patch12: kdebase-3.5.1-dbus.patch
 Patch13: kdebase-3.5.1-kdm-readme.patch
 Patch14: kdebase-3.5.1-kwin-systray.patch
+Patch15: kdebase-3.5.1-fonts.patch
 
 # upstream patches
 Patch100: kdebase-3.5.1-keyboardlayout.patch
@@ -427,7 +428,8 @@
 
 %changelog
 * Tue Feb 21 2006 Than Ngo <than at redhat.com> 6:3.5.1-5
-- add missing Category X-KDE-LookNFeel
+- fixed rpm file conflict
+- added missing Category X-KDE-LookNFeel
 
 * Thu Feb 16 2006 Than Ngo <than at redhat.com> 6:3.5.1-4
 - Systray icons not docked sometimes, apply patch to fix this issue #180314