rpms/gtk-qt-engine/devel .cvsignore, 1.8, 1.9 gtk-qt-engine.spec, 1.35, 1.36 sources, 1.8, 1.9

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore gtk-qt-engine.spec sources 
Log Message:
* Fri Apr 04 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-1
- gtk-qt-engine-1.1 for kde4 support (#441038)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Dec 2007 04:50:29 -0000	1.8
+++ .cvsignore	5 Apr 2008 14:21:41 -0000	1.9
@@ -1,2 +1,3 @@
 gtk-qt-engine-20070811svn.tar.bz2
 gtk-qt-engine-0.8.tar.bz2
+gtk-qt-engine-1.1.tar.bz2


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- gtk-qt-engine.spec	29 Feb 2008 11:28:39 -0000	1.35
+++ gtk-qt-engine.spec	5 Apr 2008 14:21:41 -0000	1.36
@@ -5,8 +5,8 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Epoch:   1
-Version: 0.8
-Release: 4%{?dist}
+Version: 1.1 
+Release: 1%{?dist}
 
 License: GPLv2+
 URL: 	 http://gtk-qt.ecs.soton.ac.uk/
@@ -19,19 +19,10 @@
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-# see http://bugs.kde.org/132138c#48
-Patch1: gtk-qt-engine-0.8-nspluginviewer.patch 
-# http://gtk-qt.ecs.soton.ac.uk/trac/ticket/24
-Patch2: gtk-qt-engine-0.8-ooo.patch
-
 BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: gtk2-devel
-%if 0%{?fedora} > 6
-BuildRequires: kdelibs3-devel
-%else
-BuildRequires: kdelibs-devel
-%endif
+BuildRequires: kdelibs4-devel
 BuildRequires: libbonoboui-devel
 BuildRequires: libpng-devel
 
@@ -46,18 +37,14 @@
 %prep
 %setup -q  -n %{name}
 
-%patch1 -p1 -b .nspluginviewer
-%patch2 -p1 -b .ooo
-
 
 %build
 
-%{cmake} .
+%{cmake_kde4} .
 
 make %{?_smp_mflags} VERBOSE=1
 
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -66,9 +53,9 @@
 # locale's
 %find_lang gtkqtengine || touch gtkqtengine.lang
 
-# Unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu
-rm -f  $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/LookNFeel/kcmgtk.desktop
+# FIXME: workaround our parallel-install hack
+mv %{buildroot}%{_kde4_libdir}/kde4/devel/kde4/kcm_gtk4.so \
+   %{buildroot}%{_kde4_libdir}/kde4/kcm_gtk4.so
 
 
 %clean
@@ -78,13 +65,17 @@
 %files -f gtkqtengine.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README
-%{_datadir}/themes/Qt/
-%{_datadir}/applications/*.desktop
+%{_datadir}/themes/Qt4/
+%{_datadir}/applications/kde4/kcmgtk4.desktop
+%{_datadir}/icons/kcmgtk.png
 %{_libdir}/gtk-2.0/*/engines/*
-%{_libdir}/kde3/kcm_*.*
+%{_kde4_libdir}/kde4/kcm_gtk4.so
 
 
 %changelog
+* Fri Apr 04 2008 Rex Dieter <rdieter at fedoraproject.org> 1:1.1-1
+- gtk-qt-engine-1.1 for kde4 support (#441038)
+
 * Fri Feb 19 2008 Rex Dieter <rdieter at fedoraproject.org> 1:0.8-4
 - fix ooffice detection (#232159,gtk-qt#24)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Dec 2007 04:50:29 -0000	1.8
+++ sources	5 Apr 2008 14:21:41 -0000	1.9
@@ -1 +1 @@
-9fe75b7765b6a5b49901fcd6f4f4aa4b  gtk-qt-engine-0.8.tar.bz2
+de8048baef7dfe6c97cd97c463d66152  gtk-qt-engine-1.1.tar.bz2