rpms/gtk-qt-engine/devel gtk-qt-engine-cvs.sh, NONE, 1.1 gtk-qt-engine-dt.patch, NONE, 1.1 gtk-qt-engine.spec, 1.20, 1.21

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-cvs.sh gtk-qt-engine-dt.patch 
Log Message:
* Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-9
- gtk-qt-engine-cvs20060629, fixes ooo issues (bug #163110)



--- NEW FILE gtk-qt-engine-cvs.sh ---
#!/bin/bash


MODULE=$(basename $0 -cvs.sh)
DATE=$(date +%Y%m%d)

set -x
rm -rf $MODULE
cvs -d :pserver:anoncvs at cvs.freedesktop.org:/cvs/gtk-qt co $MODULE 
tar cjf $MODULE-cvs${DATE}.tar.bz2 $MODULE
rm -rf $MODULE

gtk-qt-engine-dt.patch:

--- NEW FILE gtk-qt-engine-dt.patch ---
--- gtk-qt-engine/kcm_gtk/kcmgtk-xdg.desktop.dt	2006-06-24 20:11:56.000000000 -0500
+++ gtk-qt-engine/kcm_gtk/kcmgtk-xdg.desktop	2006-06-29 14:31:58.000000000 -0500
@@ -7,7 +7,6 @@
 
 Encoding=UTF-8
 Keywords=kcmgtk,gtk,style,font
-Terminal=false
 X-KDE-FactoryName=kcmgtk
 X-KDE-Library=kcmgtk
 X-KDE-ModuleType=Library
--- gtk-qt-engine/kcm_gtk/kcmgtk.desktop.dt	2005-01-23 06:14:34.000000000 -0600
+++ gtk-qt-engine/kcm_gtk/kcmgtk.desktop	2006-06-29 14:31:23.000000000 -0500
@@ -8,7 +8,6 @@
 
 Encoding=UTF-8
 Keywords=kcmgtk,gtk,style,font
-Terminal=false
 X-KDE-FactoryName=kcmgtk
 X-KDE-Library=kcmgtk
 X-KDE-ModuleType=Library


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- gtk-qt-engine.spec	1 Mar 2006 19:21:02 -0000	1.20
+++ gtk-qt-engine.spec	29 Jun 2006 20:33:01 -0000	1.21
@@ -1,17 +1,18 @@
 
 %define real_ver 0.6
-#define cvs cvs20050930
+%define cvs cvs20060629
 
 Summary: A project allowing GTK to use Qt widget styles.
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.60
-Release: 8%{?dist}
+Release: 9.%{cvs}%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
-#Source: gtk-qt-engine-%{cvs}.tar.bz2
-Source:  http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2
+#Source0:  http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2
+Source0: gtk-qt-engine-%{cvs}.tar.bz2
+Source1: gtk-qt-engine-cvs.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 #### reported Bugs, patches
@@ -31,17 +32,14 @@
 ## missing toolbar icons
 ## http://bugs.freedesktop.org/show_bug.cgi?id=4904
 #Patch4904: 
-## 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
+Patch2: gtk-qt-engine-dt.patch
 
 BuildRequires: automake17
 
+BuildRequires: desktop-file-utils
+BuildRequires: gettext
 BuildRequires: gtk2-devel >= 2.2
 BuildRequires: libbonoboui-devel
-
 BuildRequires: qt-devel >= 1:3.3
 BuildRequires: kdelibs-devel >= 6:3.3
 BuildRequires: libpng-devel
@@ -58,10 +56,9 @@
 %setup -q  -n %{name}%{!?cvs:-%{real_ver}}
 
 %{!?cvs:%patch0 -p0 -b .x86_64}
-%{?gcc296:%patch1 -p1 -b .gcc29}
 %patch2 -p1 -b .dt
-%patch3919 -p1 -b .3919
-%patch3983 -p1 -b .3983
+%{!?cvs:%patch3919 -p1 -b .3919}
+%{!?cvs:%patch3983 -p1 -b .3983}
 
 #if [ ! -f configure -o ! -z "%{?cvs}" ]; then
 make -f admin/Makefile.common cvs
@@ -70,7 +67,6 @@
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure \
   --disable-rpath \
@@ -89,6 +85,11 @@
 # locale's
 %find_lang gtkqtengine || touch gtkqtengine.lang
 
+desktop-file-install \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
+  --add-category="X-Fedora" --vendor="" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
+
 # Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu
 
@@ -108,6 +109,9 @@
 
 
 %changelog 
+* Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-9
+- gtk-qt-engine-cvs20060629, fixes ooo issues (bug #163110)
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-8
 - Unpackaged file %%_libdir/menu -> %%_prefix/lib/menu