diff --git a/python-jep.spec b/python-jep.spec index 0b1c785..950b5d6 100644 --- a/python-jep.spec +++ b/python-jep.spec @@ -1,5 +1,3 @@ -%bcond_with python2 - %global srcname jep %global desc \ @@ -21,18 +19,14 @@ Some benefits of embedding CPython in a JVM:\ to different operating system. Name: python-%{srcname} -Version: 3.7.0 -Release: 4%{?dist} +Version: 3.8 +Release: 0.1.rc%{?dist} Summary: Embed Python in Java License: zlib URL: https://github.com/ninia/%{srcname} -Source0: %{url}/archive/v%{version}.tar.gz +Source0: %{url}/archive/v%{version}rc.tar.gz -%if %{with python2} -BuildRequires: python2-devel -BuildRequires: python2-numpy -%endif # with python2 BuildRequires: python3-devel BuildRequires: python3-numpy @@ -42,12 +36,6 @@ Requires: java-headless %description %desc -%package -n python2-%{srcname} -Summary: Embed Python in Java -%{?python_provide:%python_provide python2-%{srcname}} - -%description -n python2-%{srcname} %desc - %package -n python3-%{srcname} Summary: Embed Python in Java %{?python_provide:%python_provide python3-%{srcname}} @@ -63,44 +51,19 @@ BuildArch: noarch %prep -%autosetup -c +%autosetup -n%{srcname}-%{version}rc find . -name \*.jar -print -delete -mv %{srcname}-%{version} python3 -# don't confuse rpmbuild -(pushd python3 ; mv -t.. LICENSE AUTHORS release_notes javadoc ) -# be more verbose about tests, FIXME ugly hack! -sed -i -r 's:TextTestRunner\(:\0verbosity=2:' python3/tests/runtests.py - -%if %{with python2} -cp -a python3 python2 -%endif # with python2 - %build export JAVA_HOME=%{_prefix}/lib/jvm/java -%if %{with python2} -pushd python2 -CFLAGS="$RPM_OPT_FLAGS" %py2_build -popd -%endif # with python2 - -pushd python3 CFLAGS="$RPM_OPT_FLAGS" %py3_build -popd +%{__python3} setup.py javadoc %install export JAVA_HOME=%{_prefix}/lib/jvm/java -pushd python3 %py3_install -popd - -%if %{with python2} -pushd python2 -%py2_install -popd -%endif # install javadoc install -dm755 %{buildroot}%{_javadocdir}/%{name} @@ -109,28 +72,14 @@ cp -pr javadoc/* %{buildroot}%{_javadocdir}/%{name} %check export JAVA_HOME=%{_prefix}/lib/jvm/java -%if %{with python2} -pushd python2 -%{__python2} setup.py test -popd -%endif - -pushd python3 +# be more verbose about tests, FIXME ugly hack! +sed -i -r 's:TextTestRunner\(:\0verbosity=2:' src/test/python/runtests.py %{__python3} setup.py test -popd -%if %{with python2} -%files -n python2-%{srcname} -%license LICENSE -%doc python2/README.rst -%doc AUTHORS release_notes/ -%{python2_sitearch}/* -%endif - %files -n python3-%{srcname} %license LICENSE -%doc python3/README.rst +%doc README.rst %doc AUTHORS release_notes/ %{python3_sitearch}/* %{_bindir}/%{srcname} @@ -141,6 +90,11 @@ popd %changelog +* Sat Jul 07 2018 Raphael Groner - 3.8-0.1.rc +- new version (RC) with support for Python 3.7 +- generate javadoc because not provided in tarball any more +- drop optional python2 + * Tue Jun 19 2018 Miro HronĨok - 3.7.0-4 - Rebuilt for Python 3.7