rpms/gtk-qt-engine/FC-6 gtk-qt-engine-svn.sh, NONE, 1.1 .cvsignore, 1.5, 1.6 gtk-qt-engine.spec, 1.25, 1.26 sources, 1.5, 1.6

[Rex Dieter (rdieter)]

Author: rdieter

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

Modified Files:
	.cvsignore gtk-qt-engine.spec sources 
Added Files:
	gtk-qt-engine-svn.sh 
Log Message:
* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.70-4.20061211svn
- gtk-qt-engine-20061211svn



--- NEW FILE gtk-qt-engine-svn.sh ---
#!/bin/sh

DATE=$(date +%Y%m%d)
MODULE="$(basename $0 -svn.sh)"
SVNROOT=http://gtk-qt.ecs.soton.ac.uk/svn/gtk-qt/trunk/gtk-qt-engine

set -x
rm -rf $MODULE

svn export $SVNROOT $MODULE/

## tar it up
tar cjf $MODULE-${DATE}svn.tar.bz2 $MODULE

## cleanup
rm -rf $MODULE



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	6 Jul 2006 13:22:30 -0000	1.5
+++ .cvsignore	18 Dec 2006 20:10:06 -0000	1.6
@@ -1 +1,2 @@
 gtk-qt-engine-0.7.tar.bz2
+gtk-qt-engine-20061211svn.tar.bz2


Index: gtk-qt-engine.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-6/gtk-qt-engine.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- gtk-qt-engine.spec	29 Aug 2006 17:59:31 -0000	1.25
+++ gtk-qt-engine.spec	18 Dec 2006 20:10:06 -0000	1.26
@@ -1,31 +1,24 @@
 
 %define real_ver 0.7
-#define cvs cvs20060629
+%define svn 20061211svn
 
 Summary: A project allowing GTK to use Qt widget styles.
 Name: 	 gtk-qt-engine 
 Group:	 User Interface/Desktops
 Version: 0.70
-Release: 3%{?dist}
+Release: 4.%{svn}%{?dist}
 
 License: GPL
 URL:     http://www.freedesktop.org/Software/gtk-qt
-%if "%{?cvs:1}" == "1"
-Source0: gtk-qt-engine-%{cvs}.tar.bz2
-Source1: gtk-qt-engine-cvs.sh
+%if "%{?svn:1}" == "1"
+Source0: gtk-qt-engine-%{svn}.tar.bz2
+Source1: gtk-qt-engine-svn.sh
 %else
 Source0: http://www.freedesktop.org/~davidsansome/gtk-qt-engine-%{real_ver}.tar.bz2
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
-#### reported Bugs, patches
-## GTK/QT + Baghira = lots of problems
-## (gtk-qt-engine-cvs20050930 + baghira-0.71 crashes firefox/gimp)
-## http://bugs.freedesktop.org/show_bug.cgi?id=2349
-#Patch2349:
-Patch2: gtk-qt-engine-dt.patch
-
-BuildRequires: desktop-file-utils
+BuildRequires: cmake
 BuildRequires: gettext
 BuildRequires: gtk2-devel >= 2.2
 BuildRequires: libbonoboui-devel
@@ -44,33 +37,30 @@
 %prep
 %setup -q  -n %{name}
 
-%patch2 -p1 -b .dt
-
 
 %build
-unset QTDIR || : ; source /etc/profile.d/qt.sh
 
-%configure \
-  --disable-rpath \
-  --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
-
-make %{?_smp_mflags}
+%if "%{?svn:1}" == "1"
+export CFLAGS="$RPM_OPT_FLAGS"
+export CXXFLAGS="$RPM_OPT_FLAGS"
+cmake . \
+        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+        -DBUILD_SHARED_LIBS:BOOL=ON
+%else
+unset QTDIR || : ; source /etc/profile.d/qt.sh
+%configure
+%endif
+make VERBOSE=1 %{?_smp_mflags}
 
 
 %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
 
-desktop-file-install \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/ \
-  --add-category="X-Fedora" --vendor="" \
-  $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
-
 # Unpackaged files
 rm -rf $RPM_BUILD_ROOT%{_prefix}/lib/menu
 rm -f  $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/LookNFeel/kcmgtk.desktop
@@ -84,13 +74,18 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog README
 %{_datadir}/themes/Qt/
-%{_datadir}/gtk-qt-engine/
 %{_datadir}/applications/*.desktop
 %{_libdir}/gtk-2.0/*/engines/*
 %{_libdir}/kde3/kcm_*.*
 
 
 %changelog 
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.70-4.20061211svn
+- gtk-qt-engine-20061211svn
+
+* Wed Nov 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.70-3.20061101svn
+- gtk-qt-engine-20061101svn 
+
 * Tue Aug 29 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.70-3
 - fc6 respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtk-qt-engine/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	6 Jul 2006 13:22:30 -0000	1.5
+++ sources	18 Dec 2006 20:10:06 -0000	1.6
@@ -1 +1 @@
-27ca211621f38c45b1c4c9e9ef1f84b0  gtk-qt-engine-0.7.tar.bz2
+ab25f35e9812e3fd7dba080ad2853645  gtk-qt-engine-20061211svn.tar.bz2