rpms/qt4-qsa/devel qt4-qsa-fhs.patch, NONE, 1.1 qt4-qsa.spec, 1.12, 1.13

[Frank Büttner (frankb)]

Author: frankb

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

Modified Files:
	qt4-qsa.spec 
Added Files:
	qt4-qsa-fhs.patch 
Log Message:
fix Bug 210544


qt4-qsa-fhs.patch:

--- NEW FILE qt4-qsa-fhs.patch ---
--- qsa-x11-opensource-1.2.2/src/qsa/qsa.pro.prefix	2006-12-08 14:02:25.000000000 +0100
+++ qsa-x11-opensource-1.2.2/src/qsa/qsa.pro	2007-02-10 17:59:43.000000000 +0100
@@ -83,16 +83,16 @@
 		..\ide\qsworkbench.h
 
 !isEmpty(QSA_INSTALL_PREFIX) {
-  headers.path = $$QSA_INSTALL_PREFIX/include
+  headers.path = $$(QTINC)
   win32 {
     target.path = $$QSA_INSTALL_PREFIX/bin
   } else {
-    target.path = $$QSA_INSTALL_PREFIX/lib
+    target.path = $$(QTLIB)
   }
   prf.files = qsa.prf
-  prf.path = $$QSA_INSTALL_PREFIX/mkspecs/features
+  prf.path = $$(QTDATA)/mkspecs/features
   documentation.files = ../../doc/html/*
-  documentation.path = $$QSA_INSTALL_PREFIX/doc/html
+  documentation.path = $$(QTDATA)/doc/html
   INSTALLS += headers target prf documentation
 }


Index: qt4-qsa.spec
===================================================================
RCS file: /cvs/extras/rpms/qt4-qsa/devel/qt4-qsa.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qt4-qsa.spec	11 Jan 2007 09:04:30 -0000	1.12
+++ qt4-qsa.spec	14 Feb 2007 12:01:02 -0000	1.13
@@ -1,27 +1,20 @@
 Name:		qt4-qsa
 Summary:	Qt Script for Applications
 Version:	1.2.2
-Release:	1%{?dist}
+Release:	2%{?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:         qt4-qsa-fhs.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 qtinc	%(qmake-qt4 -query QT_INSTALL_HEADERS)
+%define qtlib  %(qmake-qt4 -query QT_INSTALL_LIBS)
+%define qtdata %(qmake-qt4 -query QT_INSTALL_DATA)
 
 
 %package devel
@@ -40,22 +33,25 @@
 
 %prep
 %setup -q -n qsa-x11-opensource-%{version}
+%patch0 -p1 -z .fhs
 
 %build
 export QTDIR=%{qtdir}
-export PATH=$QTDIR/bin:$PATH
+export PATH=%{qtlib}/qt4/bin:$PATH
 export QTINC=%{qtinc}
 export QTLIB=%{qtlib}
+export QTDATA=%{qtdata}
+
 #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
+make %{?_smp_mflags} sub-src
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make %{?_smp_mflags} -e INSTALL_ROOT=$RPM_BUILD_ROOT install 
-rm -rf $RPM_BUILD_ROOT/%{qtdir}/doc
+make -e INSTALL_ROOT=$RPM_BUILD_ROOT install 
+rm -rf $RPM_BUILD_ROOT/%{qtdata}/doc
 #remove uneeded files
 rm -f examples/qsa.prf
 find examples -name "Makefile.*" | xargs rm -f
@@ -71,12 +67,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
@@ -94,12 +84,15 @@
 %defattr(0644,root,root)   
 %{qtinc}/*
 %{qtlib}/libqsa.so
-%{qtdir}/mkspecs/features/qsa.prf
+%{qtdata}/mkspecs/features/qsa.prf
 %defattr(0644,root,root,0755)
 %doc examples
 %doc doc/html
 
 %changelog 
+* Thu Feb 13 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.2.2-2%{?dist}
+- fix Bug 210544, thanks Hans de Goede
+
 * Thu Jan 11 2007 Frank Büttner  <frank-buettner at gmx.net> - 1.2.2-1%{?dist}
 - update to 1.2.2
 - add warning about end of life