Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@10611 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 7 years ago
parent
commit
06dca6d5bf
1 changed files with 6 additions and 5 deletions
  1. 6 5
      P/PyQt4/PyQt4-vl.spec

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

@@ -10,8 +10,8 @@
 Name: 	 PyQt4
 Name: 	 PyQt4
 Summary: Python bindings for Qt4
 Summary: Python bindings for Qt4
 Summary(ja): Qt4 の Python バインディング
 Summary(ja): Qt4 の Python バインディング
-Version: 4.11.2
-Release: 2%{?_dist_release}
+Version: 4.11.4
+Release: 1%{?_dist_release}
 
 
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 # GPLv2 exceptions(see GPL_EXCEPTIONS*.txt)
 License: GPLv3 or GPLv2 with exceptions
 License: GPLv3 or GPLv2 with exceptions
@@ -21,8 +21,6 @@ URL:     http://www.riverbankcomputing.com/software/pyqt/
 Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
 Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt4/PyQt-x11-gpl-%{version}.tar.gz
 
 
 ## upstreamable patches
 ## 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
 Patch52:  PyQt-x11-gpl-4.10.4-pyuic_shbang.patch
 
 
 # Vine Patch
 # Vine Patch
@@ -61,7 +59,6 @@ of the Qt4 classes (e.g. KDE or your own).
 
 
 %prep
 %prep
 %setup -q -n PyQt-x11-gpl-%{version}
 %setup -q -n PyQt-x11-gpl-%{version}
-%patch50 -p1 -b .timestamp
 # skip -b on this one, so the backup copy doesnt end up packaged too
 # skip -b on this one, so the backup copy doesnt end up packaged too
 %patch52 -p1
 %patch52 -p1
 
 
@@ -123,6 +120,10 @@ rm -rf $RPM_BUILD_ROOT
 #{_qt4_prefix}/qsci/api/python/PyQt4.api
 #{_qt4_prefix}/qsci/api/python/PyQt4.api
 
 
 %changelog
 %changelog
+* Thu Jul 14 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.11.4-1
+- new upstream release
+- remove Patch50 (PyQt-x11-gpl-4.9.5-timestamp_multilib.patch)
+
 * Thu Jun 30 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.11.2-2
 * Thu Jun 30 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 4.11.2-2
 - rebuild with gcc-5.4.0
 - rebuild with gcc-5.4.0