rpms/gtk-qt-engine/FC-3 .cvsignore, 1.2, 1.3 gtk-qt-engine.spec, 1.3, 1.4 sources, 1.2, 1.3

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore gtk-qt-engine.spec sources 
Log Message:
sync w/-devel branch



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-3/.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	5 Aug 2005 15:54:58 -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/FC-3/gtk-qt-engine.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gtk-qt-engine.spec	12 Feb 2005 17:01:20 -0000	1.3
+++ gtk-qt-engine.spec	5 Aug 2005 15:54:58 -0000	1.4
@@ -1,31 +1,35 @@
 # $Id$
 
-Summary: a project allowing GTK to use Qt widget styles.
+%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.41
-Release: 5%{?dist_tag}
+Version: 0.60
+Release: 3%{?dist}
+
 License: GPL
-Source:  http://www.freedesktop.org/Software/gtk-qt/gtk-qt-engine-0.41.tar.bz2
-Patch0:  %{name}-x86_64.patch
+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
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
+
+# fix x86_64 build, requires auto-tools
+Patch0: gtk-qt-engine-x86_64.patch
+BuildRequires: autoconf, automake17
 
 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: libpng-devel
+
+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
@@ -36,10 +40,12 @@
 
 
 %prep
-%setup -q 
-%ifarch x86_64
-%patch0 
-%endif
+%setup -q  -n %{name}-%{real_ver}
+
+%patch0 -p0 -b .x86_64
+
+make -f admin/Makefile.common
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -47,9 +53,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
@@ -58,7 +64,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
@@ -69,12 +75,28 @@
 %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 
+* Fri Aug  5 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-3
+- drop bogus BR: libjpeg-devel libmng-devel
+- x86_64 patch (and BR: autoconf automake17)
+
+* Fri Aug  5 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-2
+- respin (2nd attempt at make plague)
+
+* Wed Apr  8 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.60-1
+- cleanup for Extras
+- 0.6 (#153976)
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-3/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	5 Aug 2005 15:54:58 -0000	1.3
@@ -1 +1 @@
-d6f9fcfb6aa8a0445c81ea893144591d  gtk-qt-engine-0.41.tar.bz2
+9c02c95a6e8d304b1f2801429759e1c0  gtk-qt-engine-0.6.tar.bz2