diff --git a/jython.spec b/jython.spec index d87865e..491c2ed 100644 --- a/jython.spec +++ b/jython.spec @@ -1,13 +1,12 @@ %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')} %global cpython_version %{pyver} -%global pyxml_version 0.8.3 %global svn_tag Release_2_2_1 %global _python_bytecompile_errors_terminate_build 0 Name: jython Version: 2.2.1 -Release: 13%{?dist} +Release: 14%{?dist} 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/ @@ -35,7 +34,6 @@ BuildRequires: libreadline-java >= 0.8.0-16 BuildRequires: mysql-connector-java BuildRequires: jakarta-oro BuildRequires: python >= %{cpython_version} -BuildRequires: PyXML >= %{pyxml_version} BuildRequires: servlet BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils @@ -104,8 +102,6 @@ ant \ -Dht2html.dir=%{_datadir}/ht2html \ -Dpython.lib=./CPythonLib \ -Dpython.exe=%{_bindir}/python \ - -DPyXmlHome=%{_libdir}/python%pyver \ - -Dtargetver=1.3 \ copy-dist @@ -159,8 +155,6 @@ install -d $RPM_BUILD_ROOT%{_bindir} cat > $RPM_BUILD_ROOT%{_bindir}/%{name} << EOF #!/bin/sh # -# %{name} script -# JPackage Project (http://jpackage.sourceforge.net) # Source functions library . %{_datadir}/java-utils/java-functions @@ -206,8 +200,6 @@ EOF cat > $RPM_BUILD_ROOT%{_bindir}/%{name}c << EOF #!/bin/sh # -# %{name}c script -# JPackage Project (http://jpackage.sourceforge.net) %{_bindir}/%{name} %{_datadir}/%{name}/Tools/%{name}c/%{name}c.py "\$@" EOF @@ -241,6 +233,9 @@ EOF %doc %{_datadir}/%{name}/Demo %changelog +* Mon Aug 12 2013 akurtakov 2.2.1-14 +- PyXML is dead - bug#992651 . + * Sat Aug 03 2013 Fedora Release Engineering - 2.2.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild @@ -383,7 +378,7 @@ source. - Add -Dtargetver=1.3 - Changed BuildRoot to what Extras expects -* Sun Aug 23 2004 Randy Watler - 0:2.2-0.a0.2jpp +* Mon Aug 23 2004 Randy Watler - 0:2.2-0.a0.2jpp - Rebuild with ant-1.6.2 - Allow build use of python >= 2.3 to generate docs since 2.2 libraries included