rpms/qt4-qsa/devel qt4-qsa.spec,1.9,1.10

[Frank Büttner (frankb)]

Author: frankb

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

Modified Files:
	qt4-qsa.spec 
Log Message:
back to old one because the patch for bug 210544 fails



Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- qt4-qsa.spec	12 Oct 2006 20:35:08 -0000	1.9
+++ qt4-qsa.spec	14 Oct 2006 16:04:15 -0000	1.10
@@ -1,21 +1,29 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.1
-Release:	18%{?dist}
-BuildRequires:	qt4-devel 
+Release:	19%{?dist}
+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)
-%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA)
-%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
+%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)
+
 
 %package devel
 Summary:	Development and doc files for qsa 
@@ -32,7 +40,6 @@
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %build
 export QTDIR=%{qtdir}
@@ -41,7 +48,8 @@
 export QTLIB=%{qtlib}
 #without qt3support
 #./configure -release -new-editor -prefix %{qtdir}
-./configure -release 
+./configure -release -prefix %{qtdir} 
+#./configure -release
 make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT sub-src
 
 %install
@@ -63,6 +71,12 @@
 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
@@ -80,11 +94,14 @@
 %defattr(0644,root,root)   
 %{qtinc}/*
 %{qtlib}/libqsa.so
-%{qtdata}/mkspecs/features/qsa.prf
+%{qtdir}/mkspecs/features/qsa.prf
 %doc examples
 %doc doc/html
 
 %changelog 
+* Sat Oct 14 2006 Frank Büttner  <frank-buettner at gmx.net> - 1.2.1-19%{?dist}
+- back to old one because the patch for bug 210544 fails
+
 * Thu Oct 12 2006 Frank Büttner <frank-buettner at gmx.net> - 1.2.1-18%{?dist}
 - fix for bug 210544