rpms/gtk-qt-engine/FC-3 .cvsignore, 1.3, 1.4 gtk-qt-engine.spec, 1.5, 1.6 sources, 1.3, 1.4 gtk-qt-engine-3919.patch, 1.1, NONE gtk-qt-engine-3983.patch, 1.1, NONE gtk-qt-engine-x86_64.patch, 1.3, NONE

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore gtk-qt-engine.spec sources 
Removed Files:
	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-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Aug 2005 15:54:58 -0000	1.3
+++ .cvsignore	6 Jul 2006 13:39:45 -0000	1.4
@@ -1 +1 @@
-gtk-qt-engine-0.6.tar.bz2
+gtk-qt-engine-0.7.tar.bz2


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-3/gtk-qt-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-qt-engine.spec	27 Oct 2005 15:21:51 -0000	1.5
+++ gtk-qt-engine.spec	6 Jul 2006 13:39:45 -0000	1.6
@@ -1,53 +1,38 @@
 
-%define real_ver 0.6
-#define cvs cvs20050930
+%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: 5%{?dist}
+Version: 0.70
+Release: 1%{?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
+%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: 
-## build fails w/gcc-2.9x:
-## http://bugs.freedesktop.org/show_bug.cgi?id=4676
-Patch1: gtk-qt-engine-gcc29.patch
-
-
-BuildRequires: automake17
+Patch2: gtk-qt-engine-dt.patch
 
+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
 
-# For KDE Control center
-Requires: kdebase
-
 
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
@@ -57,26 +42,18 @@
 
 
 %prep
-%setup -q  -n %{name}%{!?cvs:-%{real_ver}}
+%setup -q  -n %{name}
 
-%{!?cvs:%patch0 -p0 -b .x86_64}
-%{?gcc296:%patch1 -p1 -b .gcc29}
-%patch3919 -p1 -b .3919
-%patch3983 -p1 -b .3983
-
-#if [ ! -f configure -o ! -z "%{?cvs}" ]; then
-make -f admin/Makefile.common cvs
-#fi
+%patch2 -p1 -b .dt
 
 
 %build
 unset QTDIR || : ; source /etc/profile.d/qt.sh
-export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %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}
 
@@ -90,9 +67,13 @@
 # locale's
 %find_lang gtkqtengine || touch gtkqtengine.lang
 
-# Unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/menu
+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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -101,15 +82,31 @@
 %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 
+* 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)
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-8
+- Unpackaged file %%_libdir/menu -> %%_prefix/lib/menu
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
+* Mon Jan 23 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-7
+- 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Aug 2005 15:54:58 -0000	1.3
+++ sources	6 Jul 2006 13:39:45 -0000	1.4
@@ -1 +1 @@
-9c02c95a6e8d304b1f2801429759e1c0  gtk-qt-engine-0.6.tar.bz2
+27ca211621f38c45b1c4c9e9ef1f84b0  gtk-qt-engine-0.7.tar.bz2


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


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


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