Accepting request 109478 from Java:packages

license update: Python-2.0 and Apache-2.0
Use SPDX format (forwarded request 109062 from babelworx)

OBS-URL: https://build.opensuse.org/request/show/109478
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/jython?expand=0&rev=14
This commit is contained in:
Stephan Kulow 2012-03-22 11:33:20 +00:00 committed by Git OBS Bridge
commit 9f3b0fdd29
2 changed files with 23 additions and 14 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Mar 13 08:36:41 UTC 2012 - cfarrell@suse.com
- license update: Python-2.0 and Apache-2.0
Use SPDX format
-------------------------------------------------------------------
Tue Feb 28 14:11:15 UTC 2012 - mvyskocil@suse.cz
- do not require mysql-connector-java, just recommend
to break some build cycles
-------------------------------------------------------------------
Fri Mar 11 13:01:53 UTC 2011 - mvyskocil@suse.cz

View File

@ -1,7 +1,7 @@
#
# spec file for package jython
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 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
@ -25,11 +25,11 @@
Name: jython
Version: 2.2.1
Release: 1
Release: 0
Summary: A Java implementation of the Python language
License: ASL 1.1 and BSD and CNRI and JPython and Python
Url: http://www.jython.org/
License: Python-2.0 and Apache-2.0
Group: Development/Languages/Python
Url: http://www.jython.org/
# Use the included fetch-jython.sh script to generate the source drop
# for jython 2.2.1
# sh fetch-jython.sh \
@ -42,22 +42,22 @@ Patch0: %{name}-cachedir.patch
# Also, copy python's license from source directory and not
# ${python.home}
Patch1: %{name}-nofullbuildpath.patch
Requires: jpackage-utils >= 1.5
Requires: jakarta-oro
Requires: servletapi5
Requires: python >= %{cpython_version}
Requires: jpackage-utils >= 1.5
Requires: libreadline-java >= 0.8.0-16
Requires: mysql-connector-java
Requires: python >= %{cpython_version}
Requires: servletapi5
Recommends: mysql-connector-java
Requires: java >= 1.6.0
BuildRequires: ant
BuildRequires: ht2html
BuildRequires: jakarta-oro
BuildRequires: java-devel >= 1.6.0
BuildRequires: libreadline-java >= 0.8.0-16
BuildRequires: mysql-connector-java
BuildRequires: jakarta-oro
BuildRequires: python >= %{cpython_version}
BuildRequires: pyxml >= %{pyxml_version}
BuildRequires: servletapi5
BuildRequires: java-devel >= 1.6.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -81,7 +81,6 @@ Java allows developers to freely mix the two languages both during
development and in shipping products.
%package manual
License: ASL 1.1 and BSD and CNRI and JPython and Python
Summary: Manual for jython
Group: Development/Libraries/Java
@ -109,7 +108,6 @@ development and in shipping products.
%package javadoc
License: ASL 1.1 and BSD and CNRI and JPython and Python
Summary: Javadoc for jython
Group: Development/Libraries/Java
@ -137,10 +135,9 @@ development and in shipping products.
%package demo
License: ASL 1.1 and BSD and CNRI and JPython and Python
Summary: Demonstration and samples for jython
Requires: %{name} = %{version}-%{release}
Group: Development/Libraries/Java
Requires: %{name} = %{version}-%{release}
%description demo
This package contains demonstration and sample files for Jython.