forked from pool/python
Accepting request 307908 from home:fstrba:freetype2
Revert the freetype2-bootstrap change, since it does not work OBS-URL: https://build.opensuse.org/request/show/307908 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=177
This commit is contained in:
parent
f19acd10ab
commit
19fa21847c
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-base
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python-doc
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX 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,6 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: python-doc
|
||||
Version: 2.7.9
|
||||
Release: 0
|
||||
|
@ -1,9 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu May 7 15:04:03 UTC 2015 - fstrba@suse.com
|
||||
|
||||
- For openSUSE:Factory, build against the new freetype2-bootstrap
|
||||
package to avoid build cycles in the build service.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Feb 25 16:31:37 UTC 2015 - jmatejek@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package python
|
||||
#
|
||||
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 SUSE LINUX 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,6 +15,7 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
Name: python
|
||||
Version: 2.7.9
|
||||
Release: 0
|
||||
@ -70,8 +71,8 @@ BuildRequires: ncurses-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: sqlite-devel
|
||||
BuildRequires: tk-devel
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(x11)
|
||||
%define python_version %(echo %{tarversion} | head -c 3)
|
||||
%define idle_name idle
|
||||
Requires: python-base = %{version}
|
||||
@ -85,10 +86,6 @@ Obsoletes: python21
|
||||
Obsoletes: python-64bit
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: freetype2-bootstrap
|
||||
#!BuildIgnore: libfreetype6
|
||||
%endif
|
||||
|
||||
%description
|
||||
Python is an interpreted, object-oriented programming language, and is
|
||||
|
Loading…
x
Reference in New Issue
Block a user