rpms/gtk-qt-engine/FC-5 .cvsignore, 1.4, 1.5 gtk-qt-engine-dt.patch, 1.1, 1.2 gtk-qt-engine.spec, 1.21, 1.22 sources, 1.4, 1.5 gtk-qt-engine-0.6-dt.patch, 1.1, NONE gtk-qt-engine-3919.patch, 1.1, NONE gtk-qt-engine-3983.patch, 1.1, NONE gtk-qt-engine-x86_64.patch, 1.5, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/gtk-qt-engine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15479

Modified Files:
	.cvsignore gtk-qt-engine-dt.patch gtk-qt-engine.spec sources 
Removed Files:
	gtk-qt-engine-0.6-dt.patch gtk-qt-engine-3919.patch 
	gtk-qt-engine-3983.patch gtk-qt-engine-x86_64.patch 
Log Message:
* Thu Jul 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.70-1
- gtk-qt-engine-0.7



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	29 Jun 2006 21:00:38 -0000	1.4
+++ .cvsignore	6 Jul 2006 13:38:27 -0000	1.5
@@ -1,2 +1 @@
-gtk-qt-engine-0.6.tar.bz2
-gtk-qt-engine-cvs20060629.tar.bz2
+gtk-qt-engine-0.7.tar.bz2

gtk-qt-engine-dt.patch:

Index: gtk-qt-engine-dt.patch
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-5/gtk-qt-engine-dt.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtk-qt-engine-dt.patch	29 Jun 2006 21:00:38 -0000	1.1
+++ gtk-qt-engine-dt.patch	6 Jul 2006 13:38:27 -0000	1.2
@@ -1,5 +1,5 @@
 --- 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
++++ gtk-qt-engine/kcm_gtk/kcmgtk-xdg.desktop	2006-07-06 08:10:49.000000000 -0500
 @@ -7,7 +7,6 @@
  
  Encoding=UTF-8
@@ -8,13 +8,3 @@
  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/FC-5/gtk-qt-engine.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gtk-qt-engine.spec	29 Jun 2006 21:00:38 -0000	1.21
+++ gtk-qt-engine.spec	6 Jul 2006 13:38:27 -0000	1.22
@@ -1,47 +1,36 @@
 
-%define real_ver 0.6
-%define cvs cvs20060629
+%define real_ver 0.7
+#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: 10.%{cvs}%{?dist}
+Version: 0.70
+Release: 1%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
-#Source0:  http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2
+%if "%{?cvs:1}" == "1"
 Source0: gtk-qt-engine-%{cvs}.tar.bz2
 Source1: gtk-qt-engine-cvs.sh
+%else
+Source0: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-%{real_ver}.tar.bz2
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 #### reported Bugs, patches
-## fix x86_64 build, requires auto-tools
-## (already fixed in upstream cvs)
-Patch0: gtk-qt-engine-x86_64.patch
 ## GTK/QT + Baghira = lots of problems
 ## (gtk-qt-engine-cvs20050930 + baghira-0.71 crashes firefox/gimp)
 ## http://bugs.freedesktop.org/show_bug.cgi?id=2349
 #Patch2349:
-## segfault in libqtengine.so drawing notebook
-## https://bugs.freedesktop.org/show_bug.cgi?id=3919
-Patch3919: gtk-qt-engine-3919.patch
-## GTK-Qt engine causes crashes with Cairo GTK:
-## http://bugs.freedesktop.org/show_bug.cgi?id=3983
-Patch3983: gtk-qt-engine-3983.patch
-## missing toolbar icons
-## http://bugs.freedesktop.org/show_bug.cgi?id=4904
-#Patch4904: 
 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: qt-devel 
+BuildRequires: kdelibs-devel 
 BuildRequires: libpng-devel
 
 
@@ -53,16 +42,9 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{real_ver}}
+%setup -q  -n %{name}
 
-%{!?cvs:%patch0 -p0 -b .x86_64}
 %patch2 -p1 -b .dt
-%{!?cvs:%patch3919 -p1 -b .3919}
-%{!?cvs:%patch3983 -p1 -b .3983}
-
-#if [ ! -f configure -o ! -z "%{?cvs}" ]; then
-make -f admin/Makefile.common cvs
-#fi
 
 
 %build
@@ -109,6 +91,9 @@
 
 
 %changelog 
+* Thu Jul 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.70-1
+- gtk-qt-engine-0.7
+
 * Thu Jun 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-10
 - gtk-qt-engine-cvs20060629, fixes ooo issues (bug #163110)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Jun 2006 21:00:38 -0000	1.4
+++ sources	6 Jul 2006 13:38:27 -0000	1.5
@@ -1,2 +1 @@
-9c02c95a6e8d304b1f2801429759e1c0  gtk-qt-engine-0.6.tar.bz2
-de14569eb41cdec8eb1b092089349d38  gtk-qt-engine-cvs20060629.tar.bz2
+27ca211621f38c45b1c4c9e9ef1f84b0  gtk-qt-engine-0.7.tar.bz2


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


--- gtk-qt-engine-3919.patch DELETED ---


--- gtk-qt-engine-3983.patch DELETED ---


--- gtk-qt-engine-x86_64.patch DELETED ---