Browse Source

update: qtscriptgenerator

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5384 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 12 years ago
parent
commit
e219ca4bfb
1 changed files with 14 additions and 6 deletions
  1. 14 6
      q/qtscriptgenerator/qtscriptgenerator-vl.spec

+ 14 - 6
q/qtscriptgenerator/qtscriptgenerator-vl.spec

@@ -1,24 +1,26 @@
-%define qt4_ver 4.7.2
+%define qt4_ver 4.8.0
 # Qt4 version auto-detection
 %define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo %{qt4_ver})
-%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
+%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_bindir %(pkg-config --variable bindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/bin)
-%define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/include)
+%define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_includedir})
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
-%define _qt4_qmake %{_qt4_bindir}/qmake
+%define _qt4_qmake %(pkg-config --variable qmake --silence-errors Qt 2>/dev/null || echo %{_qt4_bindir}/qmake)
 
 Name:		qtscriptgenerator
 Summary: 	A tool to generate Qt bindings for Qt Script	
 Version:	0.1.0
-Release:	14%{?_dist_release}
+Release:	15%{?_dist_release}
 
 Group:		System Environment/Libraries
 License: 	GPLv2	
 URL:		http://code.google.com/p/qtscriptgenerator/	
+
 Source0:	http://qtscriptgenerator.googlecode.com/files/qtscriptgenerator-src-%{version}.tar.gz	
 
 Patch1: qtscriptgenerator-0.1.0-gcc44.patch
 Patch2: qtscriptgenerator-src-0.1.0-no_phonon.patch
+Patch3: qtscriptgenerator-src-0.1.0-no_QFileOpenEvent.patch
 
 ## upstreamable patches
 Patch50: qtscriptgenerator-src-0.1.0-qmake_target.path.patch
@@ -45,7 +47,7 @@ Qt Script Generator is a tool to generate Qt bindings for Qt Script.
 %package -n qtscriptbindings 
 Summary: Qt bindings for Qt Script
 Group: System Environment/Libraries
-Requires: qt4 = %{_qt4_version}
+Requires: qt4 >= %{_qt4_version}
 Provides: qtscript-qt = %{version}-%{release}
 
 %description -n qtscriptbindings
@@ -59,6 +61,8 @@ from within Qt Script.
 
 %patch1 -p0 -b .gcc44
 %patch2 -p1 -b .no_phonon
+%patch3 -p1 -b .no_QFileOpenEvent
+
 %patch50 -p1 -b .qmake_target.path
 %patch51 -p1 -b .kde_phonon
 
@@ -121,6 +125,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan  9 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.0-15
+- rebuilt with qt-4.8.0
+- added Patch3
+
 * Sun Mar 13 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 0.1.0-14
 - rebuilt with qt-4.7.2
 - added Patch1