devel/gtk-qt-engine gtk-qt-engine-x86_64.patch, NONE, 1.1 gtk-qt-engine.spec, 1.2, 1.3

[Thorsten Leemhuis (thl)]

Author: thl

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

Modified Files:
	gtk-qt-engine.spec 
Added Files:
	gtk-qt-engine-x86_64.patch 
Log Message:
Add patch to fix compile-error on x86_64

gtk-qt-engine-x86_64.patch:

--- NEW FILE gtk-qt-engine-x86_64.patch ---
--- kcm_gtk/Makefile.am
+++ kcm_gtk/Makefile.am
@@ -1,9 +1,7 @@
 INCLUDES    = $(all_includes)
 METASOURCES = AUTO
 
-# Install this plugin in the KDE modules directory
-kcmgtkmoduledir = $(KDE_PREFIX)/lib/kde3/
-kcmgtkmodule_LTLIBRARIES = kcm_kcmgtk.la
+kde_module_LTLIBRARIES = kcm_kcmgtk.la
 
 kcm_kcmgtk_la_SOURCES = kcmgtkwidget.ui kcmgtk.cpp
 kcm_kcmgtk_la_LIBADD = $(LIB_KDEUI)


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/devel/gtk-qt-engine/gtk-qt-engine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gtk-qt-engine.spec	10 Dec 2004 22:03:03 -0000	1.2
+++ gtk-qt-engine.spec	12 Feb 2005 17:01:20 -0000	1.3
@@ -4,9 +4,10 @@
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.41
-Release: 4%{?dist_tag}
+Release: 5%{?dist_tag}
 License: GPL
 Source:  http://www.freedesktop.org/Software/gtk-qt/gtk-qt-engine-0.41.tar.bz2
+Patch0:  %{name}-x86_64.patch
 URL:	 http://www.freedesktop.org/Software/gtk-qt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -36,7 +37,9 @@
 
 %prep
 %setup -q 
-
+%ifarch x86_64
+%patch0 
+%endif
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -55,7 +58,7 @@
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
 ## Unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_libdir}/menu
+rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu
 
 
 %clean
@@ -72,6 +75,9 @@
 
 
 %changelog 
+* Sat Feb 12 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0.41-5
+- Add patch to fix compile-error on x86_64; Patch was found in a suse srpm
+
 * Tue Jul 13 2004 Rex Dieter <rexdieter at sf.net> 0.41-0.fdr.4
 - workarounds for missing deps in stock qt-devel/kdelibs-devel
   BR: libmng-devel libjpeg-devel