rpms/qt4-qsa/devel qsa-1.2.1-Qt4.2-preview.patch, NONE, 1.1 qt4-qsa.spec, 1.4, 1.5

Frank Büttner (frankb) fedora-extras-commits at redhat.com
Mon Aug 7 09:37:54 UTC 2006


Author: frankb

Update of /cvs/extras/rpms/qt4-qsa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17643

Modified Files:
	qt4-qsa.spec 
Added Files:
	qsa-1.2.1-Qt4.2-preview.patch 
Log Message:
Try to bypass the broken paths in the Qt4 package.
Not nice, but no other way until the Qt4 package will be corrected.


qsa-1.2.1-Qt4.2-preview.patch:

--- NEW FILE qsa-1.2.1-Qt4.2-preview.patch ---
--- qsa-x11-opensource-1.2.1/configure2/configutils.cpp.preview	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configutils.cpp	2006-08-01 06:34:07.000000000 -0500
@@ -372,6 +372,8 @@
         qtLicense = Universal;
     } else if (qtEdition == QLatin1String("OpenSource")) {
         qtLicense = GPL;
+    } else if (qtEdition == QLatin1String("Preview")) {
+        qtLicense = GPL;
     } else {
         message(QLatin1String("\nQSA is not compatible with your Qt edition\n"));
         return false;


Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qt4-qsa.spec	30 Jul 2006 00:56:35 -0000	1.4
+++ qt4-qsa.spec	7 Aug 2006 09:37:53 -0000	1.5
@@ -1,19 +1,24 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	14%{?dist}
-BuildRequires:	qt4-devel < 4.2 qt4-devel => 4.1.3-8
-Requires:	qt4 < 4.2
+Release:	15%{?dist}
+BuildRequires:	qt4-devel => 4.2
 URL:		http://www.trolltech.com/products/qt/addon/qsa
 
 License: 	GPL
 Group: 		Development/Libraries
 Source: 	ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz
+Patch0:		qsa-1.2.1-Qt4.2-preview.patch
 Buildroot: 	%{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) 
-%define qtinc %(qmake-qt4 -query QT_INSTALL_HEADERS)
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
+
+# fix the the broken include path
+%define qtinc %{qtdir}/include
+%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
+
+#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS)
+#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
 
 %package devel
 Summary:	Development and doc files for qsa 
@@ -29,6 +34,7 @@
 
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
+%patch0 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -38,6 +44,7 @@
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
 ./configure -release -prefix %{qtdir}
+#./configure -release 
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -87,8 +94,15 @@
 %doc doc/html
 
 %changelog 
+* Mon Aug 07 2006 Frank Büttner  <frank-buettner at gmx.net> - 1.2.1-15%{?dist}
+- Try to bypass the broken paths in the Qt4 package.
+  Not nice, but no other way until the Qt4 package will be corrected.
+
+* Wed Aug 02 2006 Frank Büttner  <frank-buettner at gmx.net> - 1.2.1-14%{?dist}
+- try to compile QSA with Qt 4.2
+
 * Mon Jun 12 2006 Frank Büttner  <frank-buettner at gmx.net> - 1.2.1-13%{?dist}
-- try again to fix the x86_64 build 
+- try agin to fix the x86_64 build 
 
 * Mon Jun 12 2006 Frank Büttner  <frank-buettner at gmx.net> - 1.2.1-12%{?dist}
 - fix build for x86_64




More information about the fedora-extras-commits mailing list