rpms/gtk-qt-engine/EL-5 gtk-qt-engine-0.8-nspluginviewer.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 gtk-qt-engine.spec, 1.28, 1.29 sources, 1.7, 1.8

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/gtk-qt-engine/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14172

Modified Files:
	.cvsignore gtk-qt-engine.spec sources 
Added Files:
	gtk-qt-engine-0.8-nspluginviewer.patch 
Log Message:
rawhide sync (0.8)


gtk-qt-engine-0.8-nspluginviewer.patch:

--- NEW FILE gtk-qt-engine-0.8-nspluginviewer.patch ---
diff -up gtk-qt-engine/src/qt_qt_wrapper.cpp.nspluginviewer gtk-qt-engine/src/qt_qt_wrapper.cpp
--- gtk-qt-engine/src/qt_qt_wrapper.cpp.nspluginviewer	2007-08-28 15:30:38.000000000 -0500
+++ gtk-qt-engine/src/qt_qt_wrapper.cpp	2008-01-14 06:47:07.000000000 -0600
@@ -334,7 +334,7 @@ void createQApp()
 		printf("createQApp()\n");
 	
 	char* sessionEnv = getenv("SESSION_MANAGER");
-	if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) ||
+	if (QString(sessionEnv).endsWith(QString::number(getpid())) || cmdLine.contains("gnome-wm") || cmdLine.contains("metacity") || cmdLine.contains("nspluginviewer") || cmdLine.contains("xfwm4") || (getenv("GTK_QT_ENGINE_DISABLE") != NULL) ||
 	((qApp) && (qApp->type() == QApplication::Tty)))
 	{
 		printf("Not initializing the Gtk-Qt theme engine\n");


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Sep 2007 16:23:00 -0000	1.7
+++ .cvsignore	14 Jan 2008 12:58:29 -0000	1.8
@@ -1,3 +1,2 @@
-gtk-qt-engine-0.7.tar.bz2
-gtk-qt-engine-20061211svn.tar.bz2
 gtk-qt-engine-20070811svn.tar.bz2
+gtk-qt-engine-0.8.tar.bz2


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/gtk-qt-engine.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- gtk-qt-engine.spec	10 Sep 2007 16:23:27 -0000	1.28
+++ gtk-qt-engine.spec	14 Jan 2008 12:58:29 -0000	1.29
@@ -1,12 +1,12 @@
 
-%define real_ver 0.7
-%define svn 20070811svn
+#define svn 20070811svn
 
-Summary: A project allowing GTK to use Qt widget styles.
+Summary: A project allowing GTK to use Qt widget styles
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
-Version: 0.70
-Release: 5.%{svn}%{?dist}
+Epoch:   1
+Version: 0.8
+Release: 2%{?dist}
 
 License: GPLv2+
 URL: 	 http://gtk-qt.ecs.soton.ac.uk/
@@ -15,17 +15,23 @@
 Source0: gtk-qt-engine-%{svn}.tar.bz2
 Source1: gtk-qt-engine-svn.sh
 %else
-Source0: http://gtk-qt.ecs.soton.ac.uk/files/%{real_ver}/gtk-qt-engine-%{real_ver}.tar.bz2 
+Source0: http://gtk-qt.ecs.soton.ac.uk/files/%{version}/gtk-qt-engine-%{version}.tar.bz2 
 %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 
+
 BuildRequires: cmake
 BuildRequires: gettext
-BuildRequires: gtk2-devel >= 2.2
+BuildRequires: gtk2-devel
+%if 0%{?fedora} > 6
+BuildRequires: kdelibs3-devel
+%else
+BuildRequires: kdelibs-devel
+%endif
 BuildRequires: libbonoboui-devel
-BuildRequires: qt-devel 
 BuildRequires: libpng-devel
-BuildRequires: kdelibs-devel
 
 
 %description
@@ -38,22 +44,21 @@
 %prep
 %setup -q  -n %{name}
 
+%patch1 -p1 -b .nspluginviewer
+
 
 %build
 
-%if "%{?svn:1}" == "1"
-%cmake .
-%else
-unset QTDIR || : ; source /etc/profile.d/qt.sh
-%configure
-%endif
-make VERBOSE=1 %{?_smp_mflags}
+%{cmake} .
+
+make %{?_smp_mflags} VERBOSE=1
+
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT 
+make install DESTDIR=$RPM_BUILD_ROOT
 
 # locale's
 %find_lang gtkqtengine || touch gtkqtengine.lang
@@ -68,7 +73,7 @@
 
 
 %files -f gtkqtengine.lang
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README
 %{_datadir}/themes/Qt/
 %{_datadir}/applications/*.desktop
@@ -77,6 +82,18 @@
 
 
 %changelog 
+* Mon Jan 14 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 1:0.8-2
+- nslpluginviewer patch (kde#132138c#48)
+
+* Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 1:0.8-1
+- gtk-qt-engine-0.8
+
+* Sun Dec 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-7.20070811svn
+- BR: kdelibs3-devel
+
+* Sat Aug 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-6.20070811svn
+- respin (BuildID)
+
 * Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.70-5.20070811svn
 - gtk-qt-engine-20070811svn (revision 38)
 - License: GPLv2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-qt-engine/EL-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Sep 2007 16:23:00 -0000	1.7
+++ sources	14 Jan 2008 12:58:29 -0000	1.8
@@ -1 +1 @@
-c06bd40c5892e7abca0470c2f680b32f  gtk-qt-engine-20070811svn.tar.bz2
+9fe75b7765b6a5b49901fcd6f4f4aa4b  gtk-qt-engine-0.8.tar.bz2