From fd3321620daf236efae859da8fb7827fed0c3dcdc7499be2b59b9496badd0826 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 18 May 2017 19:28:34 +0000 Subject: [PATCH] - Version update to 4.7.0: * Switch to python3 * All binaries in python now * More tests - Remove patch merged by upstream: * create_valid_xml_comments.patch - Try to reduce some dependencies bsc#1036025 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=32 --- create_valid_xml_comments.patch | 22 ---------- javapackages-4.6.0.tar.xz | 3 -- javapackages-4.7.0.tar.xz | 3 ++ javapackages-tools.changes | 11 +++++ javapackages-tools.spec | 71 +++++++++++++-------------------- 5 files changed, 42 insertions(+), 68 deletions(-) delete mode 100644 create_valid_xml_comments.patch delete mode 100644 javapackages-4.6.0.tar.xz create mode 100644 javapackages-4.7.0.tar.xz diff --git a/create_valid_xml_comments.patch b/create_valid_xml_comments.patch deleted file mode 100644 index 73d5944..0000000 --- a/create_valid_xml_comments.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 84211c0ee761e93ee507f5d37e9fc80ec377e89d Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Thu, 3 Dec 2015 06:58:58 +0100 -Subject: [PATCH] Fix TravisCI test failure - ---- - java-utils/pom_editor.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/java-utils/pom_editor.py b/java-utils/pom_editor.py -index eac7ab1..364a443 100644 ---- a/java-utils/pom_editor.py -+++ b/java-utils/pom_editor.py -@@ -580,7 +580,7 @@ def pom_remove_parent(pom=None): - """[POM location]""" - try: - pom.replace_xml(pom.xpath_query_element("/pom:project/pom:parent"), -- etree.Comment(" parent POM reference removed by maintainer --> ")) -+ etree.Comment(" parent POM reference removed by maintainer ")) - except PomQueryNoMatch: - raise PomQueryNoMatch("POM doesn't specify parent.") - diff --git a/javapackages-4.6.0.tar.xz b/javapackages-4.6.0.tar.xz deleted file mode 100644 index 05a1c13..0000000 --- a/javapackages-4.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:62d447460d394fe7409c8f6a2e8b6448887b04668d6867586c7a0d282f3c13d8 -size 179680 diff --git a/javapackages-4.7.0.tar.xz b/javapackages-4.7.0.tar.xz new file mode 100644 index 0000000..1d6d431 --- /dev/null +++ b/javapackages-4.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f4444b7301a61b8b2f049809364db57b15c4ad7e11e890487527167228e37db2 +size 184964 diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 94c5608..18b4c00 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu May 18 19:28:28 UTC 2017 - tchvatal@suse.com + +- Version update to 4.7.0: + * Switch to python3 + * All binaries in python now + * More tests +- Remove patch merged by upstream: + * create_valid_xml_comments.patch +- Try to reduce some dependencies bsc#1036025 + ------------------------------------------------------------------- Fri Feb 12 15:21:42 UTC 2016 - toddrme2178@gmail.com diff --git a/javapackages-tools.spec b/javapackages-tools.spec index c6711af..8c2c77b 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,7 +1,7 @@ # # spec file for package javapackages-tools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 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 @@ -17,55 +17,34 @@ Name: javapackages-tools -Version: 4.6.0 +Version: 4.7.0 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause Group: Development/Languages/Java -Url: https://fedorahosted.org/released/javapackages/doc/ -Source: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz +Url: https://github.com/mizdebsk/javapackages +# Impossible tags, downloaded from Fedora package +Source: javapackages-%{version}.tar.xz #PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits # where Fedora use jpackage convention - usr/lib everywhere Patch0: suse-use-libdir.patch #PATCH-FIX-SUSE: We put macros to /etc/rpm directly so make it reflected by # the install script Patch1: suse-macros-install-location.patch -#PATCH-FIX-Upstream: create_valid_xml_comments.patch -- make comments that pass python-lxml validation - https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9fc80ec377e89d -Patch2: create_valid_xml_comments.patch BuildRequires: asciidoc BuildRequires: dia BuildRequires: fdupes -BuildRequires: python-devel -BuildRequires: python-lxml -BuildRequires: python-nose -BuildRequires: python-pyxb -BuildRequires: python-setuptools -BuildRequires: python-six +BuildRequires: python3-lxml +BuildRequires: python3-nose +BuildRequires: python3-setuptools +BuildRequires: python3-six BuildRequires: rpm BuildRequires: xmlto BuildRequires: xz -Requires: coreutils -Requires: lua -Requires: python -# Well even tho python is split it is required for most of the operations -Requires: python-javapackages = %{version} -# for the xb pom conversions -Requires: python-pyxb -Requires: python-six -# for xml.dom.minidom -Requires: python-xml -Provides: jpackage-utils = %{version} -Provides: jpackage-utils-java9 = %{version} -Obsoletes: jpackage-utils <= 1.7.5 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# for xsltproc -%if 0%{?suse_version} == 1110 -# disable pbc on sle11 as there is clash in directories we don't care about -BuildRequires: -post-build-checks -Requires: libxslt -%else -Requires: libxslt-tools -%endif +# Even tho python is split it is required for most of the operations. +# All the binaries used for most builds are in python now. +# Only if package does not contain anything except macro usage it is not needed +Requires: python3-javapackages = %{version} %description This package provides macros and scripts to support Java packaging. @@ -100,12 +79,14 @@ Requires: javapackages-local = %{version} This package implements local mode fow Apache Ivy, which allows artifact resolution using XMvn resolver. -%package -n python-javapackages +%package -n python3-javapackages Summary: Module for handling various files for Java packaging Group: Development/Languages/Java -Requires: python-lxml +Requires: python3-lxml +Requires: python3-six +Obsoletes: python-javapackages -%description -n python-javapackages +%description -n python3-javapackages Module for handling, querying and manipulating of various files for Java packaging in Linux distributions @@ -128,24 +109,27 @@ This package provides non-essential macros and scripts to support Java packaging %setup -q -n javapackages-%{version} %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build -%configure --rpmconfigdir=%{_sysconfdir}/rpm/ +%configure \ + --rpmconfigdir=%{_sysconfdir}/rpm/ \ + --pyinterpreter=python3 ./build %install ./install sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* +pushd python +python3 setup.py install -O1 --skip-build --root %{buildroot} +popd + rm -rf %{buildroot}%{_datadir}/fedora-review/ %fdupes %{buildroot}/%{_prefix} %check -%if 0%{?suse_version} >= 1210 ./check -%endif %files -f files-common %defattr(-,root,root,-) @@ -156,6 +140,7 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/ %files -n maven-local -f files-maven %defattr(-,root,root,-) +%dir %{_sysconfdir}/maven %files -n gradle-local -f files-gradle %defattr(-,root,root) @@ -165,10 +150,10 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/ %defattr(-,root,root,-) %dir %{_sysconfdir}/ant.d -%files -n python-javapackages +%files -n python3-javapackages %defattr(-,root,root,-) %doc LICENSE -%{python_sitelib}/javapackages* +%{python3_sitelib}/javapackages* %files doc -f files-doc %defattr(-,root,root,-)