- do not require mysql-connector-java, just recommend

to break some build cycles

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jython?expand=0&rev=7
This commit is contained in:
Michal Vyskocil 2012-02-28 14:11:53 +00:00 committed by Git OBS Bridge
parent 870d8d879d
commit e4c55ad82a
2 changed files with 35 additions and 29 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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
@ -13,6 +13,8 @@
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
@ -23,39 +25,39 @@
Name: jython
Version: 2.2.1
Release: 1
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/
Group: Development/Languages/Python
Release: 0
Summary: A Java implementation of the Python language
License: Apache-1.1 and BSD and CNRI and JPython and Python-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 \
# jython https://jython.svn.sourceforge.net/svnroot Release_2_2_1
#
Source0: %{name}-fetched-src-%{svn_tag}.tar.bz2
Source2: fetch-%{name}.sh
Patch0: %{name}-cachedir.patch
Source0: %{name}-fetched-src-%{svn_tag}.tar.bz2
Source2: fetch-%{name}.sh
Patch0: %{name}-cachedir.patch
# Make javadoc and copy-full tasks not depend upon "full-build"
# 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: libreadline-java >= 0.8.0-16
Requires: mysql-connector-java
Requires: java >= 1.6.0
BuildRequires: ant
BuildRequires: ht2html
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
Patch1: %{name}-nofullbuildpath.patch
Requires: jakarta-oro
Requires: jpackage-utils >= 1.5
Requires: libreadline-java >= 0.8.0-16
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: python >= %{cpython_version}
BuildRequires: pyxml >= %{pyxml_version}
BuildRequires: servletapi5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@ -134,8 +136,8 @@ development and in shipping products.
%package demo
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.
@ -182,7 +184,6 @@ ant \
-Dtargetver=1.3 \
copy-dist
# remove #! from python files
pushd dist
for f in `find . -name '*.py'`
@ -297,7 +298,6 @@ rm -rf $RPM_BUILD_ROOT
%doc LICENSE.txt README.txt
%doc %{name}-manual-%{version}
%files demo
%defattr(-,root,root)
%doc ACKNOWLEDGMENTS NEWS LICENSE.txt README.txt