From 472801f2478a6c5684c478ab863d188ae0a99945e6388883b181ac7b31af5613 Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Mon, 8 Jul 2013 13:12:23 +0000 Subject: [PATCH] Accepting request 182401 from openSUSE:Factory:Core - have python-devel require python: http://lists.opensuse.org/opensuse-factory/2013-06/msg00622.html Note that talloc and libxml2 need to be in factory before this OBS-URL: https://build.opensuse.org/request/show/182401 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=146 --- python-base.changes | 8 +++++++- python-base.spec | 11 ++++++----- python-doc.spec | 8 ++++---- python.changes | 6 +++--- python.spec | 7 ++++--- 5 files changed, 24 insertions(+), 16 deletions(-) diff --git a/python-base.changes b/python-base.changes index 3ba302e..2f2c050 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jul 6 17:17:11 UTC 2013 - coolo@suse.com + +- have python-devel require python: + http://lists.opensuse.org/opensuse-factory/2013-06/msg00622.html + ------------------------------------------------------------------- Sun Jun 30 21:20:29 UTC 2013 - schwab@suse.de @@ -44,7 +50,7 @@ Mon May 13 09:24:29 UTC 2013 - dmueller@suse.com - add aarch64 to the list of 64-bit platforms ------------------------------------------------------------------- +------------------------------------------------------------------- Thu May 9 16:11:23 UTC 2013 - jmatejek@suse.com - update to 2.7.4 diff --git a/python-base.spec b/python-base.spec index c465bba..90c5650 100644 --- a/python-base.spec +++ b/python-base.spec @@ -1,7 +1,7 @@ # # spec file for package python-base # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,14 +16,13 @@ # - Name: python-base Version: 2.7.5 Release: 0 -License: Python-2.0 Summary: Python Interpreter base package -Url: http://www.python.org/ +License: Python-2.0 Group: Development/Languages/Python +Url: http://www.python.org/ %define tarversion %{version} %define tarname Python-%{tarversion} Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz @@ -53,7 +52,8 @@ Patch23: python-2.7.4-no-REUSEPORT.patch # COMMON-PATCH-END %define python_version %(echo %{tarversion} | head -c 3) BuildRequires: automake -BuildRequires: fdupes libbz2-devel +BuildRequires: fdupes +BuildRequires: libbz2-devel BuildRequires: pkg-config BuildRequires: xz BuildRequires: zlib-devel @@ -81,6 +81,7 @@ modules that would pull in extra dependencies. Summary: Include Files and Libraries Mandatory for Building Python Modules Group: Development/Languages/Python Requires: glibc-devel +Requires: python = %{version} Requires: python-base = %{version}-%{release} %description -n python-devel diff --git a/python-doc.spec b/python-doc.spec index fb71a76..4cad410 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -1,7 +1,7 @@ # # spec file for package python-doc # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python-doc Version: 2.7 Release: 0 -License: Python-2.0 Summary: Additional Package Documentation for Python -Url: http://www.python.org/ +License: Python-2.0 Group: Development/Languages/Python +Url: http://www.python.org/ %define pyver 2.7.5 %define tarname Python-%{pyver} Source0: %{tarname}.tar.xz @@ -137,4 +138,3 @@ done %doc %{_docdir}/python/paper-letter %changelog - diff --git a/python.changes b/python.changes index 30ec09a..a76df8b 100644 --- a/python.changes +++ b/python.changes @@ -1368,18 +1368,18 @@ Mon Feb 9 17:28:57 MET 1998 - ro@suse.de - added some in neededforbuild ----------------------------------------------------------------------------- +------------------------------------------------------------------- Wed Feb 4 19:27:08 CET 1998 - mt@suse.de - new Version 1.5 with more features, html documentation and new modules ----------------------------------------------------------------------------- +------------------------------------------------------------------- Mon Sep 15 14:57:42 CEST 1997 - mt@suse.de - added support for readline and (shared) modules: tkinter, dbm, gdbm, syslog, ncurses, ... - see /usr/lib/python1.4/config/Setup for details ----------------------------------------------------------------------------- +------------------------------------------------------------------- Thu Jun 5 17:57:42 CEST 1997 - mt@suse.de - new Version 1.4 diff --git a/python.spec b/python.spec index 70c9c15..7daa9d4 100644 --- a/python.spec +++ b/python.spec @@ -1,7 +1,7 @@ # # spec file for package python # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,13 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: python Version: 2.7.5 Release: 0 -License: Python-2.0 Summary: Python Interpreter -Url: http://www.python.org/ +License: Python-2.0 Group: Development/Languages/Python +Url: http://www.python.org/ %define tarversion %{version} %define tarname Python-%{tarversion} Source0: http://www.python.org/ftp/python/%{version}/%{tarname}.tar.xz