[arch-commits] Commit in qt-assistant-compat/trunk (PKGBUILD)

[Andrea Scarpino]

    Date: Saturday, March 2, 2013 @ 23:41:52
  Author: andrea
Revision: 179068

upgpkg: qt-assistant-compat 4.6.3-4

usr/share/qt/mkspecs/ -> usr/share/qt4/mkspecs/

Modified:
  qt-assistant-compat/trunk/PKGBUILD

----------+
 PKGBUILD |   14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-03-02 22:33:09 UTC (rev 179067)
+++ PKGBUILD	2013-03-02 22:41:52 UTC (rev 179068)
@@ -3,7 +3,7 @@
 
 pkgname=qt-assistant-compat
 pkgver=4.6.3
-pkgrel=3
+pkgrel=4
 pkgdesc="compat version of Qt Assistant"
 url="http://qt-project.org/"
 arch=('i686' 'x86_64')
@@ -16,8 +16,6 @@
 
 # separate package function does not really work here due to broken build files
 build() {
-    . /etc/profile.d/qt4.sh
-
 	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
 
 	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
@@ -25,11 +23,11 @@
 	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
 	rm -f translations/assistant_adp_*.qm
 
-	qmake CONFIG+=create_prl
+	qmake-qt4 CONFIG+=create_prl
 	make
 	cd  ../translations; lrelease assistant_adp_*.ts
 	cd ..
-	qmake CONFIG+=create_prl
+	qmake-qt4 CONFIG+=create_prl
 	make
 }
 
@@ -46,11 +44,11 @@
 		${pkgdir}/usr/lib/libQtAssistantClient.prl
 
 	# Install translations
-	install -d ${pkgdir}/usr/share/qt/translations/
+	install -d ${pkgdir}/usr/share/qt4/translations/
 	install -p -m0644 translations/assistant_adp_*.qm \
-		${pkgdir}/usr/share/qt/translations/
+		${pkgdir}/usr/share/qt4/translations/
 
 	# Install prf file
 	install -D -p -m0644 features/assistant.prf \
-		${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
+		${pkgdir}/usr/share/qt4/mkspecs/features/assistant.prf
 }