From 612302b13f0d9a951a973a2d7b136064f26c33bb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2015 13:26:13 +0200 Subject: [PATCH 1/5] Update mock config --- fedora-rawhide-x86_64.cfg | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fedora-rawhide-x86_64.cfg b/fedora-rawhide-x86_64.cfg index 075af92..3f8cb3d 100644 --- a/fedora-rawhide-x86_64.cfg +++ b/fedora-rawhide-x86_64.cfg @@ -4,7 +4,7 @@ config_opts['legal_host_arches'] = ('x86_64',) config_opts['chroot_setup_cmd'] = 'install @buildsys-build python3-PyXB asciidoc dia python3-lxml python3-nose python3-setuptools python3-devel scl-utils-build xmlto' config_opts['dist'] = 'rawhide' # only useful for --resultdir variable subst config_opts['extra_chroot_dirs'] = [ '/run/lock', ] -config_opts['releasever'] = '21' +config_opts['releasever'] = '23' config_opts['yum.conf'] = """ [main] @@ -17,6 +17,7 @@ syslog_device= metadata_expire=1 mirrorlist_expire=1 debuglevel=2 +reposdir=/dev/null$ [mock-rawhide] name=mock-rawhide From 2bd06aa119b74072d073b5d30b4a4f60fe101814 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 12 May 2015 10:18:33 +0200 Subject: [PATCH 2/5] Install files for gradle-local package --- javapackages-tools.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 89e8c48..02a6275 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -205,7 +205,7 @@ popd %files -n maven-local -f files-maven -%files -n gradle-local +%files -n gradle-local -f files-gradle %files -n ivy-local -f files-ivy From 192ffcbf8286ffd9b453b297118c5c97c38a998b Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 15 May 2015 10:26:13 +0200 Subject: [PATCH 3/5] Remove fedora-review-plugin-java subpackage --- javapackages-tools.spec | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 02a6275..c2add8c 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -146,14 +146,6 @@ packaging in Linux distributions %endif -%package -n fedora-review-plugin-java -Summary: fedora-review plugin for checking Java packaging guidelines -License: GPLv2+ -Requires: fedora-review - -%description -n fedora-review-plugin-java -%{summary}. - %package doc Summary: Guide for Java packaging @@ -219,9 +211,6 @@ popd %{python_sitelib}/javapackages* %endif -%files -n fedora-review-plugin-java -%{_datadir}/fedora-review/plugins/* - %files doc -f files-doc %doc LICENSE From fd20f54087f3dd8f77545041c3d88cead3524736 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Jun 2015 09:45:35 +0200 Subject: [PATCH 4/5] Drop support for Python 2 from spec Python 2 was used in Fedora 21 (old-stable now) and before, but no updates are expected for Fedora < 22. --- javapackages-tools.spec | 48 ----------------------------------------- 1 file changed, 48 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index c2add8c..df4a40c 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,12 +1,5 @@ %bcond_without tests -%if 0%{?fedora} > 21 -%global with_python3 1 -%else -%{!?__python2: %global __python2 /usr/bin/python2} -%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print (get_python_lib())")} -%endif - Name: javapackages-tools Version: 4.4.0 Release: 1%{?dist} @@ -19,19 +12,11 @@ Source0: https://fedorahosted.org/released/javapackages/javapackages-%{ve BuildArch: noarch -%if 0%{?with_python3} BuildRequires: python3-devel BuildRequires: python3-lxml BuildRequires: python3-setuptools BuildRequires: python3-nose BuildRequires: python3-six -%else -BuildRequires: python2-devel -BuildRequires: python-lxml -BuildRequires: python-setuptools -BuildRequires: python-nose -BuildRequires: python-six -%endif BuildRequires: make BuildRequires: asciidoc BuildRequires: xmlto @@ -42,13 +27,8 @@ BuildRequires: xmvn-resolve >= 2 Requires: coreutils Requires: lua -%if 0%{?with_python3} Requires: python3-javapackages = %{version}-%{release} Requires: python3 -%else -Requires: python-javapackages = %{version}-%{release} -Requires: python -%endif Provides: jpackage-utils = %{version}-%{release} Obsoletes: jpackage-utils < %{version}-%{release} @@ -122,7 +102,6 @@ Requires: xmvn-connector-ivy >= 2 This package implements local mode fow Apache Ivy, which allows artifact resolution using XMvn resolver. -%if 0%{?with_python3} %package -n python3-javapackages Summary: Module for handling various files for Java packaging Requires: python3-lxml @@ -133,19 +112,6 @@ Obsoletes: python-javapackages < %{version}-%{release} Module for handling, querying and manipulating of various files for Java packaging in Linux distributions -%else # python2 -%package -n python-javapackages -Summary: Module for handling various files for Java packaging -Requires: python-lxml -Requires: python-six -Obsoletes: python3-javapackages < %{version}-%{release} - -%description -n python-javapackages -Module for handling, querying and manipulating of various files for Java -packaging in Linux distributions -%endif - - %package doc Summary: Guide for Java packaging @@ -166,11 +132,7 @@ This package provides non-essential macros and scripts to support Java packaging %setup -q -n javapackages-%{version} %build -%if 0%{?with_python3} %configure --pyinterpreter=%{__python3} -%else -%configure --pyinterpreter=%{__python2} -%endif ./build %install @@ -178,11 +140,7 @@ This package provides non-essential macros and scripts to support Java packaging sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* pushd python -%if 0%{?with_python3} %{__python3} setup.py install -O1 --skip-build --root %{buildroot} -%else -%{__python} setup.py install -O1 --skip-build --root %{buildroot} -%endif popd %if %{with tests} @@ -201,15 +159,9 @@ popd %files -n ivy-local -f files-ivy -%if 0%{?with_python3} %files -n python3-javapackages %doc LICENSE %{python3_sitelib}/javapackages* -%else # python2 -%files -n python-javapackages -%doc LICENSE -%{python_sitelib}/javapackages* -%endif %files doc -f files-doc %doc LICENSE From f53edfbd5decd9fbf3cb92aacf36101608018b2e Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 16 Jun 2015 00:03:57 +0200 Subject: [PATCH 5/5] Update to upstream version 4.6.0 --- javapackages-tools.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index df4a40c..43d2fab 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,7 +1,7 @@ %bcond_without tests Name: javapackages-tools -Version: 4.4.0 +Version: 4.6.0 Release: 1%{?dist} Summary: Macros and scripts for Java packaging support @@ -88,7 +88,7 @@ Requires: gradle >= 2.2.1-2 Requires: xmvn-connector-gradle >= 2 %description -n gradle-local -This package implements local mode fow Gradle, which allows artifact +This package implements local mode for Gradle, which allows artifact resolution using XMvn resolver. %package -n ivy-local @@ -167,6 +167,9 @@ popd %doc LICENSE %changelog +* Mon Jun 15 2015 Michal Srb - 4.6.0-1 +- Update to upstream version 4.6.0 + * Wed Apr 1 2015 Mikolaj Izdebski - 4.4.0-4 - Remove requires on plexus-tools-pom