rpms/qt4-qsa/devel qsa-1.2.1-QT_INSTALL.patch, NONE, 1.1 qt4-qsa.spec, 1.7, 1.8

Frank Büttner (frankb) fedora-extras-commits at redhat.com
Thu Oct 12 20:28:45 UTC 2006 

Author: frankb

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

Modified Files:
	qt4-qsa.spec 
Added Files:
	qsa-1.2.1-QT_INSTALL.patch 
Log Message:
fix bug 210544


qsa-1.2.1-QT_INSTALL.patch:

--- NEW FILE qsa-1.2.1-QT_INSTALL.patch ---
--- qsa-x11-opensource-1.2.1/configure2/configutils.cpp.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configutils.cpp	2006-08-07 12:23:12.000000000 -0500
@@ -178,9 +178,13 @@
 
 void copyQSAHeaders()
 {
+    QString *qtData = 0;
+    QString *qtHeaders = 0;
+    qtData = new QString(QT_INSTALL_DATA);
+    qtHeaders = new QString(QT_INSTALL_HEADERS);
     // install qmake feature file
-    mkDir(*qtDir + QLatin1String("mkspecs/features"));
-    copy(QLatin1String("src/qsa/qsa.prf"), *qtDir + QLatin1String("mkspecs/features/qsa.prf"));
+    mkDir(*qtData + QLatin1String("/mkspecs/features"));
+    copy(QLatin1String("src/qsa/qsa.prf"), *qtData + QLatin1String("/mkspecs/features/qsa.prf"));
 
     // install header files
     static const char *headers[11] = {
@@ -199,7 +203,7 @@
     for (int j = 0; j < int(sizeof(headers) / sizeof(char*)); ++j) {
         QString header = QLatin1String(headers[j]);
         QString target = header.mid(header.indexOf(QLatin1Char('/')) + 1);
-        symLink(QLatin1String("src/") + header, *qtDir + QLatin1String("include/") + target);
+        symLink(QLatin1String("src/") + header, *qtHeaders + QLatin1String("/") + target);
     }
 }
 
--- qsa-x11-opensource-1.2.1/configure2/configure2.pro.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure2/configure2.pro	2006-08-07 12:11:53.000000000 -0500
@@ -3,6 +3,9 @@
 CONFIG += console
 INCLUDEPATH += .
 
+#QMAKE_CFLAGS   += -DQT_INSTALL_DATA=$$[QT_INSTALL_DATA] -DQT_INSTALL_HEADERS=$$[QT_INSTALL_HEADERS] -DQT_INSTALL_PREFIX=$$[QT_INSTALL_PREFIX]
+QMAKE_CXXFLAGS += -DQT_INSTALL_DATA=\\\"$$[QT_INSTALL_DATA]\\\" -DQT_INSTALL_HEADERS=\\\"$$[QT_INSTALL_HEADERS]\\\" -DQT_INSTALL_PREFIX=\\\"$$[QT_INSTALL_PREFIX]\\\"
+
 # Input
 SOURCES += main.cpp configutils.cpp
 HEADERS += configutils.h
--- qsa-x11-opensource-1.2.1/configure.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/configure	2006-08-07 12:02:05.000000000 -0500
@@ -31,6 +31,12 @@
 
 if [ -z $QTDIR ]
 then
+  QTDIR=`qmake -query QT_INSTALL_PREFIX`
+  export QTDIR
+fi
+
+if [ -z $QTDIR ]
+then
     echo "Can't find Qt library. No QTDIR set."
     exit 1
 else
@@ -55,7 +61,7 @@
 # build 2nd stage configure tool
 echo "Building 2nd stage configure"
 cd configure2
-qmake && make > /dev/null
+qmake && make 
 if [ $? -gt 0 -o ! -x configure2 ]; then
     exit 1
 fi
--- qsa-x11-opensource-1.2.1/src/qsa/qsa.pro.QT_INSTALL	2006-02-28 07:21:15.000000000 -0600
+++ qsa-x11-opensource-1.2.1/src/qsa/qsa.pro	2006-08-07 11:32:49.000000000 -0500
@@ -5,12 +5,25 @@
 TARGET = qsa
 
 isEmpty(QSA_INSTALL_PREFIX) {
-  QSA_BUILD_PREFIX=$$(QTDIR)
+  QSA_BUILD_PREFIX=$$[QT_INSTALL_PREFIX]
+  DESTDIR=$$[QT_INSTALL_LIBS]
+  headers.path = $$[QT_INSTALL_HEADERS]
+  target.path = $$[QT_INSTALL_LIBS]
+  prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
+  documentation.path = $$[QT_INSTALL_DOCS]/html
 } else {
   QSA_BUILD_PREFIX=../..
+  DESTDIR  	= $$QSA_BUILD_PREFIX/lib
+  headers.path = $$QSA_INSTALL_PREFIX/include
+  win32 {
+    target.path = $$QSA_INSTALL_PREFIX/bin
+  } else {
+    target.path = $$QSA_INSTALL_PREFIX/lib
+  }
+  prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features
+  documentation.path = $$QSA_INSTALL_PREFIX/doc/html
 }
 
-DESTDIR         = $$QSA_BUILD_PREFIX/lib
 DLLDESTDIR      = $$QSA_BUILD_PREFIX/bin
 
 HEADERS		= \
@@ -65,7 +78,7 @@
 DEFINES += QT_INTERNAL_ICONVIEW
 DEFINES += QT_INTERNAL_TABLE
 
-LIBS += -L$${QT_INSTALL_PREFIX}/lib
+LIBS += -L$$[QT_INSTALL_LIBS]
 
 mac:QMAKE_LFLAGS_PREBIND    = -prebind -seg1addr 0xBC000000
 
@@ -81,19 +94,9 @@
 		qsinputdialogfactory.h \
 		qsscript.h
 
-!isEmpty(QSA_INSTALL_PREFIX) {
-  headers.path = $$QSA_INSTALL_PREFIX/include
-  win32 {
-    target.path = $$QSA_INSTALL_PREFIX/bin
-  } else {
-    target.path = $$QSA_INSTALL_PREFIX/lib
-  }
-  prf.files = qsa.prf
-  prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features
-  documentation.files = ../../doc/html/*
-  documentation.path = $$QSA_INSTALL_PREFIX/doc/html
-  INSTALLS += headers target prf documentation
-}
+prf.files = qsa.prf
+documentation.files = ../../doc/HTML/*
+INSTALLS += headers target prf documentation
 
 KERNELDIR = ../kernel
 !noeditor {


Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qt4-qsa.spec	11 Sep 2006 08:06:14 -0000	1.7
+++ qt4-qsa.spec	12 Oct 2006 20:28:45 -0000	1.8
@@ -2,31 +2,24 @@
 Summary:	Qt Script for Applications
 Version:	1.2.1
 Release:	17%{?dist}
-BuildRequires:	qt4-devel => 4.2
+BuildRequires:	qt4-devel 
 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
+Patch1:		qsa-1.2.1-QT_INSTALL.patch
 Buildroot: 	%{_tmppath}/qsa-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%define qtdir %(qmake-qt4 -query QT_INSTALL_PREFIX) 
-
-# fix the the broken include path
-%define qtinc %{qtdir}/include
-%ifarch x86_64
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib64
-%else
-%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)/qt4/lib
-%endif
-
-#%%define qtinc %(qmake4 -query QT_INSTALL_HEADERS)
-#%%define qtlib %(qmake-qt4 -query QT_INSTALL_LIBS)
+%define qtdir  %(qmake-qt4 -query QT_INSTALL_PREFIX)
+%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA)
+%define qtinc  %(qmake-qt4 -query QT_INSTALL_HEADERS)
+%define qtlib  %(qmake-qt4 -query QT_INSTALL_LIBS)
 
 %package devel
 Summary:	Development and doc files for qsa 
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Group:		Development/Libraries
 
 %description
@@ -39,6 +32,7 @@
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -47,8 +41,7 @@
 export QTLIB=%{qtlib}
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
-./configure -release -prefix %{qtdir}
-#./configure -release 
+./configure -release 
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -70,12 +63,6 @@
 install -p -m 644 src/ide/qsworkbench.h $RPM_BUILD_ROOT%{qtinc}/
 install -p -m 644 src/qsa/qsutilfactory.h  $RPM_BUILD_ROOT%{qtinc}/
 
-%if "%{_lib}" != "lib"
-test -d $RPM_BUILD_ROOT%{qtdir}/lib && \
-mkdir -p $RPM_BUILD_ROOT%{qtlib} && \
-mv $RPM_BUILD_ROOT%{qtdir}/lib/* $RPM_BUILD_ROOT%{qtlib}/
-%endif 
-
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -93,13 +80,13 @@
 %defattr(0644,root,root)   
 %{qtinc}/*
 %{qtlib}/libqsa.so
-%{qtdir}/mkspecs/features/qsa.prf
+%{qtdata}/mkspecs/features/qsa.prf
 %doc examples
 %doc doc/html
 
 %changelog 
-* Mon Sep 11 2006 Frank Büttner  <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
-- second rebuild for FC6
+* Thu Oct 12 2006 Frank Büttner <frank-buettner at gmx.net> - 1.2.1-17%{?dist}
+- fix for bug 210544
 
 * Mon Aug 07 2006 Frank Büttner  <frank-buettner at gmx.net> - 1.2.1-16%{?dist}
 - fix build for EMT64

More information about the fedora-extras-commits mailing list