rpms/gtk-qt-engine/devel .cvsignore, 1.2, 1.3 gtk-qt-engine.spec, 1.5, 1.6 sources, 1.2, 1.3 gtk-qt-engine-x86_64.patch, 1.1, NONE

Wed Aug 3 18:40:53 UTC 2005

Author: rdieter

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

Modified Files:
	.cvsignore gtk-qt-engine.spec sources 
Removed Files:
	gtk-qt-engine-x86_64.patch 
Log Message:
auto-import gtk-qt-engine-0.60-1 on branch devel from gtk-qt-engine-0.60-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- .cvsignore	8 Nov 2004 04:31:25 -0000	1.2
+++ .cvsignore	3 Aug 2005 18:40:51 -0000	1.3
@@ -1 +1 @@
-gtk-qt-engine-0.41.tar.bz2
+gtk-qt-engine-0.6.tar.bz2


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/gtk-qt-engine.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gtk-qt-engine.spec	6 Apr 2005 22:11:39 -0000	1.5
+++ gtk-qt-engine.spec	3 Aug 2005 18:40:51 -0000	1.6
@@ -1,46 +1,43 @@
 # $Id$
 
-Summary: Allow GTK to use Qt widget styles
-Name:    gtk-qt-engine
-Group:   User Interface/Desktops
-Version: 0.41
-Release: 6%{?dist_tag}
+%define real_ver 0.6
+
+Summary: A project allowing GTK to use Qt widget styles.
+Name: 	 gtk-qt-engine 
+Group:	 User Interface/Desktops
+Version: 0.60
+Release: 1
 
 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
+Source:	 http://www.freedesktop.org/~davidsansome/gtk-qt-engine-0.6.tar.bz2
+URL:	 http://www.freedesktop.org/Software/gtk-qt
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: gtk2-devel >= 2.2
-BuildRequires: qt-devel >= 1:3.1
 # workaround for stock qt-devel's missing deps
 BuildRequires: libpng-devel libmng-devel libjpeg-devel
-%define qt_ver %(rpm -q --qf '%%{version}' qt-devel | cut -d. -f1,2)
+
+BuildRequires: qt-devel >= 1:3.3
+%define qt_ver %(rpm -q --qf '%%{version}' qt-devel )
 Requires: qt >= 1:%{qt_ver}
-BuildRequires: kdelibs-devel >= 6:3.1
-%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel | cut -d. -f1,2 )
+BuildRequires: kdelibs-devel >= 6:3.3
+%define kdelibs_ver %(rpm -q --qf '%%{version}' kdelibs-devel )
 Requires: kdelibs >= 6:%{kdelibs_ver}
-
-# workarounds for missing deps in stock qt-devel/kdelibs-devel
-BuildRequires: libpng-devel libmng-devel libjpeg-devel
-
-# 0.41 tarball runs autoheader for some reason -- Rex
-BuildRequires: autoconf
+## For KDE Control center (??)
+## Not strictly required, leave out for now. -- Rex
+#Requires: kdebase
 
 
 %description
 The GTK-Qt Theme Engine is a project allowing GTK to use Qt widget styles.
 
-It behaves like a normal GTK theme engine, but calls functions from Qt
-instead of doing the drawing itself.
+It behaves like a normal GTK theme engine, but calls functions from Qt 
+instead of doing the drawing itself. 
 
 
 %prep
-%setup -q
-%ifarch x86_64
-%patch0
-%endif
+%setup -q  -n %{name}-%{real_ver}
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -48,9 +45,9 @@
 %configure \
   --disable-rpath \
   %{?debug:  --enable-debug --enable-warnings } \
-  %{!?debug: --disable-dependency-tracking --disable-debug --disable-warnings --enable-final }
+  %{!?debug: --disable-debug --disable-warnings } 
 
-make %{?_smp_mflags} QTDIR=$QTDIR
+make %{?_smp_mflags} 
 
 
 %install
@@ -59,7 +56,7 @@
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
 ## Unpackaged files
-rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu
+rm -rf $RPM_BUILD_ROOT%{_libdir}/menu
 
 
 %clean
@@ -70,17 +67,23 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README
 %{_datadir}/themes/Qt
+%{_datadir}/gtk-qt-engine
+%{_datadir}/applications/*.desktop
+%{_datadir}/applnk/Settings/*/*.desktop
 %{_libdir}/gtk-2.0/*/engines/*
-%{_libdir}/kde3/kcm_kcmgtk.[ls][ao]
-%{_datadir}/applnk/Settings/LookNFeel/kcmgtk.desktop
+%{_libdir}/kde3/kcm_*.*
+
 
+%changelog 
+* Wed Apr 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-1
+- cleanup for Extras
 
-%changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Thu Jan 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-0.fdr.1
+- 0.6
 
-* 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 Aug 31 2004 Rex Dieter <rexdieter at sf.net> 0.50-0.fdr.1
+- 0.5, using Virtual version 0.50 to make sure rpm treats it
+  as newer than 0.41
 
 * 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


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:25 -0000	1.2
+++ sources	3 Aug 2005 18:40:51 -0000	1.3
@@ -1 +1 @@
-d6f9fcfb6aa8a0445c81ea893144591d  gtk-qt-engine-0.41.tar.bz2
+9c02c95a6e8d304b1f2801429759e1c0  gtk-qt-engine-0.6.tar.bz2


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


