Browse Source

2014-11-08 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* PyQt: rebuilt
	* PyQt4, qscintilla, sip: updated
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9071 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
b669c8994e
4 changed files with 92 additions and 56 deletions
  1. 30 13
      P/PyQt/PyQt-vl.spec
  2. 21 17
      P/PyQt4/PyQt4-vl.spec
  3. 37 25
      q/qscintilla/qscintilla-vl.spec
  4. 4 1
      s/sip/sip-vl.spec

+ 30 - 13
P/PyQt/PyQt-vl.spec

@@ -1,18 +1,28 @@
-%define pyexeclib %(python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib(1)')
+%global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
+%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
+
 %define name 	PyQt
 %define version 3.18.1
-%define release 3%{?_dist_release}
+%define release 4%{?_dist_release}
 
 Summary:	Python bindings for Qt.
+Summary(ja):    Qt の Python バインディング
 Name:		%{name}
 Version:	%{version}
 Release:	%{release}
-License:	GPL
-Group:		Development/Languages
-Source:		http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/%{name}-x11-gpl-%{version}.tar.gz
+License:	GPLv2
+Group:		System Environment/Libraries
 URL:		http://www.riverbankcomputing.co.uk/pyqt
+
+Source:		http://www.riverbankcomputing.com/Downloads/PyQt3/GPL/%{name}-x11-gpl-%{version}.tar.gz
+# FTBFS against sip-4.15+
+Patch1: PyQt-x11-gpl-3.18.1-sip415.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	python-devel sip-devel qt-devel
+BuildRequires:  libXmu-devel
+BuildRequires:	python-devel
+BuildRequires:  qt-devel
+BuildRequires:  sip-devel
 Requires:	python
 
 %description
@@ -30,14 +40,16 @@ of the Qt classes (e.g. KDE or your own).
 
 %prep
 %setup -q -n %{name}-x11-gpl-%{version}
+%patch1 -p0 -b .sip415
 
 %build
-mkdir -p $RPM_BUILD_ROOT%{pyexeclib}
-python configure.py -d %{pyexeclib} <<EOF
-    yes
-EOF
-# note that -j2 does not work
-make
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
+echo yes | python configure.py -d %{python_sitearch} CXXFLAGS="%{optflags} -DANY=void" CFLAGS="%{optflags} -DANY=void"
+
+# Makefiles are broken, workaround
+make -C qt %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -53,7 +65,7 @@ rm -rf %{buildroot}
 %doc NEWS README ChangeLog THANKS
 %doc doc/PyQt.html
 %{_bindir}/*
-%{pyexeclib}/*
+%{python_sitearch}/*
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +73,11 @@ rm -rf %{buildroot}
 %{_datadir}/sip/*
 
 %changelog
+* Sat Nov  8 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 3.18.1-4
+- rebuilt on current VineSeed
+- added patch1
+- moved to System Environment/Libraries Group
+
 * Sat Feb 18 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.18.1-3
 - rebuilt with python-2.7.2
 

+ 21 - 17
P/PyQt4/PyQt4-vl.spec

@@ -2,7 +2,7 @@
 %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
 
-%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.8.5)
+%define _qt4_version %(pkg-config --modversion --silence-errors Qt 2>/dev/null || echo 4.8.6)
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_plugindir %(pkg-config --variable plugindir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/plugins)
 %define qt4qmake %{_qt4_prefix}/bin/qmake
@@ -10,19 +10,20 @@
 Name: 	 PyQt4
 Summary: Python bindings for Qt4
 Summary(ja): Qt4 の Python バインディング
-Version: 4.10.4
+Version: 4.11.2
 Release: 1%{?_dist_release}
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
-Group: 	 Development/Languages
+Group: 	 System Environment/Libraries
 URL:     http://www.riverbankcomputing.com/software/pyqt/
 
 Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
-Patch1:  PyQt-x11-gpl-4.10.4-64bit.patch
-# HACK! FIXME: ping upstream why this isn't working right. -- Rex
-Patch2:  PyQt-x11-gpl-4.5.2-QT_SHARED.patch
-Patch4:  PyQt-x11-gpl-4.5.1-pyuic_shebang.patch
+
+## upstreamable patches
+# fix multilib conflict because of timestamp
+Patch50:  PyQt-x11-gpl-4.9.5-timestamp_multilib.patch 
+Patch52:  PyQt-x11-gpl-4.10.4-pyuic_shbang.patch
 
 # Vine Patch
 Patch100: PyQt-x11-gpl-4.7.3-phononpath_vine.patch
@@ -60,25 +61,23 @@ of the Qt4 classes (e.g. KDE or your own).
 
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
-%ifarch x86_64
-%patch1 -p1 -b .64bit
-%endif
-%patch2 -p1 -b .QT_SHARED
+%patch50 -p1 -b .timestamp
+# skip -b on this one, so the backup copy doesnt end up packaged too
+%patch52 -p1
 
 #patch100 -p1 -b .phononpath_vine 
 
-## permissions
-# mark examples non-executable
+# permissions, mark examples non-executable
 find examples/ -name "*.py" | xargs chmod a-x
 chmod a+rx pyuic/uic/pyuic.py
 
 %build
-CFLAGS="${CFLAGS:-%optflags}" \
-CXXFLAGS="${CXXFLAGS:-%optflags} -I%{_includedir}/KDE" \
-sed -i "s|0x040f00|0x040e07|" configure.py
-sed -i "s|4.15|4.14.7|" configure-ng.py
+QT4DIR=%{_qt4_prefix}
+PATH=%{_qt4_bindir}:$PATH ; export PATH
 %{__python} configure.py \
+  --assume-shared \
   --confirm-license \
+  --no-timestamp \
   --qmake=%{qt4qmake} \
   --no-qsci-api \
   --verbose 
@@ -124,6 +123,11 @@ rm -rf $RPM_BUILD_ROOT
 #{_qt4_prefix}/qsci/api/python/PyQt4.api
 
 %changelog
+* Sat Nov  8 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.11.2-1
+- new upstream release
+- added Patch50 and 52
+- moved to System Environment/Libraries Group
+
 * Mon May 05 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.10.4-1
 - new upstream release
 - update Patch1 (PyQt-x11-gpl-4.10.4-64bit.patch)

+ 37 - 25
q/qscintilla/qscintilla-vl.spec

@@ -1,22 +1,23 @@
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global pyqt4_version 4.9
+%global pyqt4_version 4.11.2
 
-%define ver 2.29
+%define ver 3.3.6
 
-%define _qt4_version 4.8.0
+%define _qt4_version 4.8.6
 %define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
 %define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_libdir})
 %define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_includedir})
 %define _qt4_translationdir %(pkg-config --variable translationdir --silence-errors Qt 2>/dev/null || echo %{_datadir}/qt4/translations)
 
 Summary:	A Scintilla port to Qt
+Summary(ja):	Scintilla の Qt への移植版
 Name:		qscintilla
-Version:	2.6
+Version:	2.8.4
 Release:	1%{?_dist_release}
 
 # matches up (pretty much) with qt4
 License:	GPLv3 or GPLv2 with exceptions
-Group:		Development/Tools
+Group:		System Environment/Libraries
 URL:		http://www.riverbankcomputing.co.uk/qscintilla
 
 Source:		QScintilla-gpl-%{version}.tar.gz
@@ -26,6 +27,7 @@ Patch1:         QScintilla-2-gpl-Qt4-incpath.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	qt4-devel
 BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
+BuildRequires:  sip-devel
 Requires:	qt4 >= %{_qt4_version}
 
 %description
@@ -35,7 +37,8 @@ This version of QScintilla is based on Scintilla v%{ver}.
 
 %package designer
 Summary:  QScintilla designer plugin 
-Group:    Development/Tools
+Summary(ja):  QScintilla デザイナプラグイン
+Group:	  System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: qt4-designer
 
@@ -44,6 +47,7 @@ Requires: qt4-designer
 
 %package devel
 Summary: QScintilla Development Files
+Summary(ja): QScintilla 開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: qt4-devel >= %{_qt4_version}
@@ -53,16 +57,19 @@ This packages contains the libraries, include and other files
 you can use to develop applications with QScintilla.
 
 %package python
-Summary:  QScintilla PyQt4 bindings
-Group:    Development/Libraries
+Summary:  QScintilla python bindings
+Summary(ja):  QScintilla の Python バインディング
+Group:    System Environment/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: PyQt4 >= %{pyqt4_version}
+Provides: python-qscintilla = %{version}-%{release}
 
 %description python
 %{summary}.
 
 %package python-devel
-Summary:  Development files for QScintilla PyQt4 bindings 
+Summary:  Development files for QScintilla python bindings 
+Summary(ja): QScintilla の Python バインディングの開発用ファイル
 Group:    Development/Libraries
 Requires: %{name}-python = %{version}-%{release}
 Requires: PyQt4-devel >= %{pyqt4_version}
@@ -72,10 +79,9 @@ Requires: PyQt4-devel >= %{pyqt4_version}
 
 %prep 
 %setup -q -n QScintilla-gpl-%{version}
-%patch1 -p1 -b .designer-incpath-qt4
 
 # fix permissions on doc files
-find doc example-Qt4  -type f -exec chmod 0644 {} ';'
+find doc example-Qt4Qt5  -type f -exec chmod 0644 {} ';'
 find src include -type f -exec chmod 0644 {} ';'
 
 # fix line endings in license file(s)
@@ -89,30 +95,31 @@ export QMAKESPEC=$QTDIR/mkspecs/linux-g++-64/
 export QMAKESPEC=$QTDIR/mkspecs/linux-g++/
 %endif
 
-pushd Qt4
+cd Qt4Qt5
 $QTDIR/bin/qmake -o Makefile qscintilla.pro
 make %{?_smp_mflags}
-popd
+cd ..
 
-pushd designer-Qt4
-$QTDIR/bin/qmake -o Makefile designer.pro
+cd designer-Qt4Qt5
+QMAKEFEATURES=../Qt4Qt5/features \
+$QTDIR/bin/qmake -o Makefile designer.pro INCLUDEPATH+=../Qt4Qt5 LIBS+=-L../Qt4Qt5
 make %{?_smp_mflags}
-popd
+cd ..
 
-pushd Python
+cd Python
 %{__python} configure.py \
-            -c -j 3 \
-            -n ../Qt4 \
-            -o ../Qt4
+    --no-timestamp \
+    --qsci-incdir=../Qt4Qt5 \
+    --qsci-libdir=../Qt4Qt5
 make %{?_smp_mflags}
-popd
+cd ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install INSTALL_ROOT=$RPM_BUILD_ROOT -C Qt4
-make install INSTALL_ROOT=$RPM_BUILD_ROOT -C designer-Qt4
-make install DESTDIR=$RPM_BUILD_ROOT -C Python
+make install INSTALL_ROOT=$RPM_BUILD_ROOT -C Qt4Qt5
+make install INSTALL_ROOT=$RPM_BUILD_ROOT -C designer-Qt4Qt5
+make install INSTALL_ROOT=$RPM_BUILD_ROOT  DESTDIR=$RPM_BUILD_ROOT -C Python
 
 
 %clean
@@ -138,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root, -)
 %{_qt4_headerdir}/*
 %{_qt4_libdir}/libqscintilla2.so
+%{_qt4_prefix}/mkspecs/features/qscintilla2.prf
 
 %files python
 %defattr(-,root,root,-)
@@ -148,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/sip/PyQt4/Qsci
 
 %changelog
+* Sat Nov  8 2014 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.2-1
+- new upstream release
+- built with qt-4.8.6, PyQt4-4.11.2
+
 * Sat Jan  7 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.6-1
 - new upstream release
 - built with qt-4.8.0, PyQt4-4.9
@@ -192,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Sep 13 2007 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.7.1-0vl1
 - new upstream release (1.71)
 
-* Mon Jun  4 2006 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6-0vl1
+* Sun Jun  4 2006 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6-0vl1
 - new upstream release (1.65)
 - changed Group to System Environment/Libraries
 

+ 4 - 1
s/sip/sip-vl.spec

@@ -5,7 +5,7 @@
 Name: 		sip
 Summary: 	Python/C++ Bindings Generator
 Summary(ja): 	Python/C++ インターフェイス生成ツール
-Version: 	4.15.5
+Version: 	4.16.4
 Release: 	1%{?_dist_release}
 
 License:	GPLv2 or GPLv3
@@ -93,6 +93,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/sip
 
 %changelog
+* Sat Nov  8 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 4.16.4-1
+- new upstream release
+
 * Mon May 05 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.15.5-1
 - new upstream release