Browse Source

update: PyQt4, sip

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2613 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 13 years ago
parent
commit
1cfadc3619
2 changed files with 17 additions and 9 deletions
  1. 11 6
      P/PyQt4/PyQt4-vl.spec
  2. 6 3
      s/sip/sip-vl.spec

+ 11 - 6
P/PyQt4/PyQt4-vl.spec

@@ -4,13 +4,14 @@
 %global sip_ver %(sip -V 2>/dev/null | cut -d' ' -f1 | cut -d- -f1)
 
 # Qt4 version auto-detection -- inagaki
-%define qtver %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.6.3)
+%define qtver %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.7.1)
 %define qt4qmake %{_libdir}/qt-%{qtver}/bin/qmake
 
-Summary: Python bindings for Qt4
 Name: 	 PyQt4
-Version: 4.7.4
-Release: 2%{?_dist_release}
+Summary: Python bindings for Qt4
+Summary(ja): Qt4 の Python バインディング
+Version: 4.8.3
+Release: 1%{?_dist_release}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
@@ -58,9 +59,9 @@ of the Qt4 classes (e.g. KDE or your own).
 
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
-%patch1 -p1 -b .64bit
+#patch1 -p1 -b .64bit
 %patch2 -p1 -b .QT_SHARED
-%patch4 -p1 
+#patch4 -p1 
 
 %patch100 -p1 -b .phononpath_vine 
 
@@ -122,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.8.3-1
+- new upstream release
+- built with sip-4.12.1 and qt4-4.7.1
+
 * Wed Aug 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.7.4-2
 - rebuild with qt4-4.6.3
 - fix %qtver (from 4.6.1 to 4.6.3)

+ 6 - 3
s/sip/sip-vl.spec

@@ -5,8 +5,8 @@
 Name:        sip
 Summary:     SIP - Python/C++ Bindings Generator
 Summary(ja): Python/C++ インターフェイス生成ツール
-Version:     4.10.5
-Release:     2%{?_dist_release}
+Version:     4.12.1
+Release:     1%{?_dist_release}
 
 License:     GPL
 Group:       Development/Tools
@@ -18,7 +18,7 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	python-devel
 BuildRequires:	sed
 
-Vendor:	Project Vine
+Vendor:		Project Vine
 Distribution:	Vine Linux
 
 %description
@@ -92,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/sip
 
 %changelog
+* Sun Jan 30 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 4.12.1-1
+- new upstream release
+
 * Mon Oct  4 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 4.10.5-2
 - add gcc option "-fPIC" also on ppc