scm-commits June 2014

scm-commits@lists.fedoraproject.org

462 participants
35398 discussions

[pykde4/f20: 2/2] Merge branch 'master' into f20
by Rex Dieter 30 Jun '14

30 Jun '14

commit 87e293041e6a78dfd15fda9ba7e63283c534ab8f Merge: 9edeeca 0213852 Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Mon Jun 30 17:40:52 2014 -0500 Merge branch 'master' into f20 .gitignore | 1 - 0001-Fix-building-with-PyQt-4.11.patch | 73 ++++++++++++++++++++++++++++++++ pykde4.spec | 10 +++-- 3 files changed, 79 insertions(+), 5 deletions(-) ---

1 0

[pykde4/f20] (2 commits) ...Merge branch 'master' into f20
by Rex Dieter 30 Jun '14

30 Jun '14

Summary of changes: 0213852... upstream fix for PyQt-4.11 ftbfs (*) 87e2930... Merge branch 'master' into f20 (*) This commit already existed in another branch; no separate mail sent

1 0

[python-html2text] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 30 Jun '14

30 Jun '14

commit 932a038848318e6eda2a1a22ef850f7596b83ce9 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 15:40:45 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-html2text.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-html2text.spec b/python-html2text.spec index 49c1c97..41c9577 100644 --- a/python-html2text.spec +++ b/python-html2text.spec @@ -4,7 +4,7 @@ Name: python-html2text Version: 3.200.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Converts a page of HTML into plain ASCII text Group: Development/Languages @@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools # Debian bug #299027 Patch0: aaronsw-html2text-remove-newlines.patch @@ -57,6 +57,9 @@ PYTHONPATH=${RPM_BUILD_ROOT}%{python_sitelib} %{__python} run_tests.py %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 3.200.3-7 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 3.200.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[pykde4] upstream fix for PyQt-4.11 ftbfs
by Rex Dieter 30 Jun '14

30 Jun '14

commit 021385264079c5a68b853378df1757de56381d70 Author: Rex Dieter <rdieter(a)math.unl.edu> Date: Mon Jun 30 17:40:19 2014 -0500 upstream fix for PyQt-4.11 ftbfs .gitignore | 1 - 0001-Fix-building-with-PyQt-4.11.patch | 73 ++++++++++++++++++++++++++++++++ pykde4.spec | 10 +++-- 3 files changed, 79 insertions(+), 5 deletions(-) --- diff --git a/.gitignore b/.gitignore index 64a7409..7cae621 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/pykde4-4.13.1.tar.xz /pykde4-4.13.2.tar.xz diff --git a/0001-Fix-building-with-PyQt-4.11.patch b/0001-Fix-building-with-PyQt-4.11.patch new file mode 100644 index 0000000..788fd02 --- /dev/null +++ b/0001-Fix-building-with-PyQt-4.11.patch @@ -0,0 +1,73 @@ +From 1e9817f99b405a66199fe9f62de31d3870e3ad12 Mon Sep 17 00:00:00 2001 +From: Luca Beltrame <lbeltrame(a)kde.org> +Date: Fri, 20 Jun 2014 11:08:31 +0200 +Subject: [PATCH] Fix building with PyQt >= 4.11 + +PyQt 4.11 adds new typedefs for GLuint, and these clash with the ones +defined in PyKDE4. Using a conditional in the sip file, the old +definitions are only kept if PyQt's version is lower than 4.11. + +Checks have been added also for the Python 3 definitions. + +CCMAIL: kde-packager(a)kde.org +--- + CMakeLists.txt | 18 +++++++++++++++--- + sip/plasma/glapplet.sip | 5 +++++ + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cf133d7..5233da8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -113,15 +113,27 @@ set(SIP_DISABLE_FEATURES VendorID PyQt_NoPrintRangeBug) + # Use an extra option when compiling on Python 3. + if (PYTHON_VERSION_MAJOR GREATER 2) + if(PYQT4_VERSION STRGREATER "040904") +- # Disable for newer PyQt +- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) ++ # Disable for features in newer Qt ++ if (PYQT4_VERSION STRGREATER "040a04") ++ # GLuint + QVector (PyQt > 4.11) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x PyKDE_GLuint) ++ else () ++ # QVector (PyQt < 4.11) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector) ++ endif () + else () + set(SIP_EXTRA_OPTIONS -g) + endif() + else (PYTHON_VERSION_MAJOR GREATER 2) + if(PYQT4_VERSION STRGREATER "040904") + # Disable for newer PyQt +- set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) ++ if (PYQT4_VERSION STRGREATER "040a04") ++ # GLuint + QVector (PyQt > 4.11) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3 -x PyKDE_GLuint) ++ else () ++ # QVector (PyQt < 4.11) ++ set(SIP_EXTRA_OPTIONS -P -g -x PyKDE_QVector -x Py_v3) ++ endif () + else () + set(SIP_EXTRA_OPTIONS -g -x Py_v3) + endif() +diff --git a/sip/plasma/glapplet.sip b/sip/plasma/glapplet.sip +index ab35ccb..15dbd47 100644 +--- a/sip/plasma/glapplet.sip ++++ b/sip/plasma/glapplet.sip +@@ -18,8 +18,13 @@ + // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + //force ++ ++%Feature PyKDE_GLuint ++ ++%If (PyKDE_GLuint) + typedef unsigned int GLuint; + typedef unsigned int GLenum; ++%End + + namespace Plasma + { +-- +1.9.3 + diff --git a/pykde4.spec b/pykde4.spec index b3e8414..c1b50d7 100644 --- a/pykde4.spec +++ b/pykde4.spec @@ -15,7 +15,7 @@ Name: pykde4 Version: 4.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Python bindings for KDE4 # http://techbase.kde.org/Policies/Licensing_Policy @@ -41,10 +41,9 @@ Patch50: pykde4-4.12.3-python_library_realpath.patch %define sip_version_min 4.15.5 %endif Patch51: pykde4-4.12.3-sip_4_15_5.patch -# FTBFS against sip-4.16 (GLuint, GLenum already defined) -Patch52: pykde4-4.13.1-sip416.patch ## upstream patches +Patch101: 0001-Fix-building-with-PyQt-4.11.patch # debian patches Patch201: add_qt_kde_definitions.diff @@ -159,7 +158,7 @@ Provides: python3-PyKDE4-devel%{?_isa} = %{version}-%{release} %if "%{?sip_version_min}" == "4.15.5" %patch51 -p1 -b .sip_4_15_5 %endif -%patch52 -p1 -b .sip416 +%patch101 -p1 -b .0001 %patch201 -p1 -b .201 %patch202 -p1 -b .202 @@ -299,6 +298,9 @@ mv %{buildroot}%{_kde4_appsdir}/pykde4/examples/ %{buildroot}%{_docdir}/pykde4/ %changelog +* Mon Jun 30 2014 Rex Dieter <rdieter(a)fedoraproject.org> 4.13.2-2 +- upstream fix for PyQt-4.11 ftbfs + * Mon Jun 09 2014 Rex Dieter <rdieter(a)fedoraproject.org> - 4.13.2-1 - 4.13.2

1 0

[python-guppy] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 30 Jun '14

30 Jun '14

commit 9d0d3f51cc9df9d0d16facc8e04ef9e71f1f1887 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 15:37:24 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-guppy.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-guppy.spec b/python-guppy.spec index 3098257..6d0019c 100644 --- a/python-guppy.spec +++ b/python-guppy.spec @@ -6,7 +6,7 @@ Name: python-%{realname} Version: 0.1.9 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A Python Programming Environment Group: Development/Languages License: MIT @@ -18,7 +18,7 @@ Patch1: python-guppy-0001-Work-with-big-endian-archs.patch Patch2: python-guppy-0002-Preliminary-changes-to-cope-with-Python-version-2.7-.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools Provides: %{realname} = %{version}-%{release} @@ -58,6 +58,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 0.1.9-10 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.1.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-googlevoice] Replace the python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 30 Jun '14

30 Jun '14

commit 4a5b23144c43c12dd4d517e3a3539d37cc381b31 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 15:36:28 2014 -0700 Replace the python-setuptools-devel BR with python-setuptools python-googlevoice.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-googlevoice.spec b/python-googlevoice.spec index 897e3d1..6efe583 100644 --- a/python-googlevoice.spec +++ b/python-googlevoice.spec @@ -2,7 +2,7 @@ Name: python-googlevoice Version: 0.5 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Python language bindings for the Google Voice API Group: Development/Languages @@ -13,7 +13,7 @@ Source1: http://pygooglevoice.googlecode.com/files/pygooglevoice-%{versio BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools Provides: pygooglevoice = %{version} @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/* %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 0.5-9 +- Replace the python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-gnutls] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 30 Jun '14

30 Jun '14

commit 987c8bbdbe70072b997e9f5b953107d2ebaaef73 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 15:35:20 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-gnutls.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-gnutls.spec b/python-gnutls.spec index b77cb97..e11e002 100644 --- a/python-gnutls.spec +++ b/python-gnutls.spec @@ -3,7 +3,7 @@ Name: python-gnutls Version: 1.2.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Python wrapper for the GNUTLS library Group: Development/Languages License: LGPLv2+ @@ -13,7 +13,7 @@ Patch1: track-libgnutls-and-opengpg-versions.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: python-devel BuildRequires: gnutls-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools Requires: python-twisted-core Requires: python-zope-interface @@ -63,6 +63,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 1.2.4-5 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.2.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-futures] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 30 Jun '14

30 Jun '14

commit fd8cd045ca4cf00770431a4267b33f4c763d09e3 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 15:31:41 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-futures.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-futures.spec b/python-futures.spec index 9e9d677..5c91c33 100644 --- a/python-futures.spec +++ b/python-futures.spec @@ -5,12 +5,12 @@ Summary: Backport of the concurrent.futures package from Python 3.2 Name: python-futures Version: 2.1.6 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD Group: Development/Libraries URL: http://code.google.com/p/pythonfutures/ Source0: http://pypi.python.org/packages/source/f/futures/futures-%{version}.tar.gz -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools BuildArch: noarch %description @@ -33,6 +33,9 @@ asynchronously executing callables. %{python_sitelib}/futures-*.egg-info* %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 2.1.6-3 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.1.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-flup] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 30 Jun '14

30 Jun '14

commit 0a8c4ecaa78cd9a8d6849a5e585a9b507ebac5d2 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 15:30:32 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-flup.spec | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) --- diff --git a/python-flup.spec b/python-flup.spec index afac485..0e17b34 100644 --- a/python-flup.spec +++ b/python-flup.spec @@ -2,7 +2,7 @@ Name: python-flup Version: 1.0.2 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Random assortment of WSGI servers for python Group: Development/Libraries @@ -13,11 +13,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -%if 0%{?fedora} >= 8 -BuildRequires: python-setuptools-devel -%else -BuildRequires: python-setuptools >= 0.6c6 -%endif +BuildRequires: python-setuptools %description @@ -50,6 +46,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 1.0.2-9 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.2-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

[python-feedcache] Replace python-setuptools-devel BR with python-setuptools
by Toshio くらとみ 30 Jun '14

30 Jun '14

commit 69e1a76799f6847abd5614435e580305f691d165 Author: Toshio Kuratomi <toshio(a)fedoraproject.org> Date: Mon Jun 30 15:27:31 2014 -0700 Replace python-setuptools-devel BR with python-setuptools python-feedcache.spec | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) --- diff --git a/python-feedcache.spec b/python-feedcache.spec index 7b20a31..d578454 100644 --- a/python-feedcache.spec +++ b/python-feedcache.spec @@ -4,7 +4,7 @@ Name: python-feedcache Version: 1.3.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Wrapper for Mark Pilgrim's FeedParser module which caches feed content Group: Development/Languages @@ -15,7 +15,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel -BuildRequires: python-setuptools-devel +BuildRequires: python-setuptools Requires: python-feedparser @@ -56,6 +56,9 @@ rm -rf %{buildroot} %changelog +* Mon Jun 30 2014 Toshio Kuratomi <toshio(a)fedoraproject.org> - 1.3.1-7 +- Replace python-setuptools-devel BR with python-setuptools + * Sat Jun 07 2014 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.3.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

1 0

← Newer
1
2
3
4
5
6
7
8
...
3540
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits June 2014