rpms/gtk-qt-engine/devel gtk-qt-engine-0.6-dt.patch, NONE, 1.1 gtk-qt-engine.spec, 1.15, 1.16

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6977

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-0.6-dt.patch 
Log Message:
* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
- don't dup "GTK Styles and fonts" in KDE menu(s)
- drop Req: kdebase


gtk-qt-engine-0.6-dt.patch:

--- NEW FILE gtk-qt-engine-0.6-dt.patch ---
--- gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop.dt	2004-08-22 03:40:29.000000000 -0500
+++ gtk-qt-engine-0.6/kcm_gtk/kcmgtk.desktop	2006-01-23 09:28:15.000000000 -0600
@@ -12,3 +12,5 @@
 X-KDE-Library=kcmgtk
 X-KDE-ModuleType=Library
 Type=Application
+
+NotShowIn=KDE


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gtk-qt-engine.spec	27 Oct 2005 15:19:56 -0000	1.15
+++ gtk-qt-engine.spec	23 Jan 2006 15:32:09 -0000	1.16
@@ -6,7 +6,7 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
@@ -34,7 +34,8 @@
 ## build fails w/gcc-2.9x:
 ## http://bugs.freedesktop.org/show_bug.cgi?id=4676
 Patch1: gtk-qt-engine-gcc29.patch
-
+## don't dup GTK-QT in kde menu(s)
+Patch2: gtk-qt-engine-0.6-dt.patch
 
 BuildRequires: automake17
 
@@ -45,9 +46,6 @@
 BuildRequires: kdelibs-devel >= 6:3.3
 BuildRequires: libpng-devel
 
-# For KDE Control center
-Requires: kdebase
-
 
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
@@ -61,6 +59,7 @@
 
 %{!?cvs:%patch0 -p0 -b .x86_64}
 %{?gcc296:%patch1 -p1 -b .gcc29}
+%patch2 -p1 -b .dt
 %patch3919 -p1 -b .3919
 %patch3983 -p1 -b .3983
 
@@ -75,8 +74,8 @@
 
 %configure \
   --disable-rpath \
-  %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-debug --disable-warnings --enable-final --disable-dependency-tracking }
+  --disable-debug --disable-warnings \
+  --disable-dependency-tracking --enable-final
 
 make %{?_smp_mflags}
 
@@ -101,15 +100,19 @@
 %files -f gtkqtengine.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README
-%{_datadir}/themes/Qt
-%{_datadir}/gtk-qt-engine
+%{_datadir}/themes/Qt/
+%{_datadir}/gtk-qt-engine/
 %{_datadir}/applications/*.desktop
-%{_datadir}/applnk/Settings/*/*.desktop
+%{_datadir}/applnk/Settings/LookNFeel/*.desktop
 %{_libdir}/gtk-2.0/*/engines/*
 %{_libdir}/kde3/kcm_*.*
 
 
 %changelog 
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-6
+- don't dup "GTK Styles and fonts" in KDE menu(s)
+- drop Req: kdebase
+
 * Wed Oct 26 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-5
 - revert to 0.6.
 - Req: kdebase