rpms/javapackages-tools
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 5.0.0

Browse Source
This commit is contained in:
Michael Simacek 2017-06-21 11:18:58 +02:00
parent 213661a340
commit cb2e72ffdd
7 changed files with 66 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -69,3 +69,4 @@
/javapackages-4.5.0.tar.xz
/javapackages-4.6.0.tar.xz
/javapackages-4.7.0.tar.xz
/5.0.0.tar.gz

42
0001-Don-t-build-and-install-docs.patch
View File

@ -1,42 +0,0 @@
From 1dbbee792ff2f4915554684097467e10150f2f40 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 6 Sep 2016 12:10:03 +0200
Subject: [PATCH 1/4] Don't build and install docs
---
build | 2 --
install | 7 -------
2 files changed, 9 deletions(-)
diff --git a/build b/build
index c2ba01a..af3576d 100755
--- a/build
+++ b/build
@@ -122,6 +122,4 @@ manpage build-jar-repository
manpage rebuild-jar-repository
manpage shade-jar
-make -C doc clean all
-
(cd ./python && "${pyinterpreter}" setup.py build)
diff --git a/install b/install
index bd0a94f..2201038 100755
--- a/install
+++ b/install
@@ -208,13 +208,6 @@ inst_exec target/gradle-local "${bindir}"
inst_data gradle/init.gradle "${datadir}/gradle-local"
inst_data target/gradle_build.7 "${mandir}/man7"
-exec >files-doc
-inst_doc doc/index.html
-inst_doc doc/images
-inst_doc doc/rpm_project
-inst_doc doc/ideas
-inst_doc doc/java_project
-
exec >files-python
(cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2
echo "${prefix}/lib/python?.?/site-packages/javapackages"
--
2.9.3

26
0002-Fix-generation-of-versioned-OSGi-requires.patch
View File

@ -1,26 +0,0 @@
From 92197a0f3b4eb02ecaaa562a24f3dd698bbf790f Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Fri, 30 Sep 2016 12:31:40 +0200
Subject: [PATCH 2/4] Fix generation of versioned OSGi requires
Fixes #26
---
python/javapackages/cache/osgi.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/javapackages/cache/osgi.py b/python/javapackages/cache/osgi.py
index cf4534c..c1f791c 100644
--- a/python/javapackages/cache/osgi.py
+++ b/python/javapackages/cache/osgi.py
@@ -61,7 +61,7 @@ class OSGiCache(Cache):
def get_bundle(self, name):
for bundle in self._cache.values():
- if bundle == name:
+ if bundle.bundle == name:
return bundle
return None
--
2.9.3

35
0003-Avoid-calling-zipfile.open-.-rU.patch
View File

@ -1,35 +0,0 @@
From 9cfefd513b07bea9e0d215db1d58f7b060da5213 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 20 Dec 2016 10:15:38 +0100
Subject: [PATCH 3/4] Avoid calling zipfile.open(..., "rU")
Fixes: #33
---
python/javapackages/common/manifest.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/python/javapackages/common/manifest.py b/python/javapackages/common/manifest.py
index 5830d80..9a27ff8 100644
--- a/python/javapackages/common/manifest.py
+++ b/python/javapackages/common/manifest.py
@@ -60,7 +60,7 @@ class Manifest(object):
try:
jarfile = ZipFile(self._path)
if "META-INF/MANIFEST.MF" in jarfile.namelist():
- mf = jarfile.open("META-INF/MANIFEST.MF", "rU")
+ mf = jarfile.open("META-INF/MANIFEST.MF", "r")
except IOError:
pass
if mf is None:
@@ -93,7 +93,7 @@ class Manifest(object):
def _normalize_manifest(self):
lines = []
- manifest = self._manifest.split(u'\n')
+ manifest = self._manifest.splitlines()
for line in manifest:
if line.startswith(' '):
lines[-1] += line.strip()
--
2.9.3

26
0004-Force-locale-in-tests.patch
View File

@ -1,26 +0,0 @@
From a8432ff0499c3832246ad7ffcdf9202dc4f29285 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 14 Mar 2017 11:01:57 +0100
Subject: [PATCH 4/4] Force locale in tests
---
test/test_common.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/test/test_common.py b/test/test_common.py
index 9f7c2fd..914e97b 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -16,7 +16,8 @@ from lxml import etree
DIRPATH = path.dirname(path.realpath(__file__))
SCRIPT_ENV = {'PATH':'{mock}:{real}'.format(mock=DIRPATH,
real=os.environ['PATH']),
- 'PYTHONPATH':os.environ['PYTHONPATH']}
+ 'PYTHONPATH':os.environ['PYTHONPATH'],
+ 'LC_ALL': 'C.UTF-8'}
def call_script(name, args, stdin=None, extra_env={}):
--
2.9.3

130
javapackages-tools.spec
View File

@ -2,55 +2,57 @@
# provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole.
%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$
# Avoid circular dependency on itself when bootstrapping
%{!?_with_bootstrap: %global bootstrap 0}
%bcond_without gradle
%bcond_without tests
%if 0%{?fedora}
%global python_prefix python3
%global python_interpreter %{__python3}
%else
%global python_prefix python
%global python_interpreter %{__python2}
%global rpmmacrodir /etc/rpm
%endif
%global default_jdk %{?_root_prefix}%{!?_root_prefix:%{_prefix}}/lib/jvm/java-1.8.0-openjdk
%global default_jre %{default_jdk}/jre
Name: javapackages-tools
Version: 4.7.0
Release: 16%{?dist}
Version: 5.0.0
Release: 1
Summary: Macros and scripts for Java packaging support
License: BSD
URL: https://git.fedorahosted.org/git/javapackages.git
Source0: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
Patch0: 0001-Don-t-build-and-install-docs.patch
# Upstream patch for https://github.com/fedora-java/javapackages/issues/26
Patch1: 0002-Fix-generation-of-versioned-OSGi-requires.patch
# https://github.com/fedora-java/javapackages/issues/33
Patch2: 0003-Avoid-calling-zipfile.open-.-rU.patch
# Fixes test failures due to warnings from python
Patch3: 0004-Force-locale-in-tests.patch
URL: https://github.com/fedora-java/javapackages
Source0: https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
BuildArch: noarch
BuildRequires: python3-devel
BuildRequires: python3-lxml
BuildRequires: python3-setuptools
BuildRequires: python3-nose
BuildRequires: python3-six
BuildRequires: coreutils
BuildRequires: which
BuildRequires: make
BuildRequires: asciidoc
BuildRequires: xmlto
BuildRequires: scl-utils-build
BuildRequires: dia
%if ! 0%{?bootstrap}
BuildRequires: javapackages-tools >= 4.0.0
BuildRequires: xmvn-resolve >= 2
%endif
BuildRequires: %{python_prefix}-devel
BuildRequires: %{python_prefix}-lxml
BuildRequires: %{python_prefix}-setuptools
BuildRequires: %{python_prefix}-nose
BuildRequires: %{python_prefix}-six
Requires: coreutils
Requires: findutils
Requires: which
Requires: lua
Requires: python3-javapackages = %{version}-%{release}
Requires: python3
# default JRE
Requires: java-1.8.0-openjdk-headless
Obsoletes: eclipse-filesystem < 2
Provides: eclipse-filesystem = %{version}-%{release}
Provides: jpackage-utils = %{version}-%{release}
# These could be generated automatically, but then we would need to
# depend on javapackages-local for dependency generator.
Provides: mvn(com.sun:tools) = SYSTEM
Provides: mvn(sun.jdk:jconsole) = SYSTEM
%description
This package provides macros and scripts to support Java packaging.
@ -59,24 +61,21 @@ This package provides macros and scripts to support Java packaging.
Summary: Macros and scripts for Maven packaging support
Requires: %{name} = %{version}-%{release}
Requires: javapackages-local = %{version}-%{release}
Requires: xmvn-minimal >= 2
Requires: xmvn-mojo >= 2
Requires: xmvn-connector-aether >= 2
# POM files needed by maven itself
Requires: apache-parent
Requires: xmvn-minimal >= 3.0.0
Requires: xmvn-mojo >= 3.0.0
Requires: xmvn-connector-aether >= 3.0.0
# Common Maven plugins required by almost every build. It wouldn't make
# sense to explicitly require them in every package built with Maven.
Requires: maven-assembly-plugin
Requires: maven-compiler-plugin
Requires: maven-jar-plugin
Requires: maven-javadoc-plugin
Requires: maven-resources-plugin
Requires: maven-surefire-plugin
Requires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
Requires: mvn(org.apache.maven.plugins:maven-jar-plugin)
Requires: mvn(org.apache.maven.plugins:maven-resources-plugin)
Requires: mvn(org.apache.maven.plugins:maven-surefire-plugin)
# Tests based on JUnit are very common and JUnit itself is small.
# Include JUnit provider for Surefire just for convenience.
Requires: maven-surefire-provider-junit
# Include JUnit and JUnit provider for Surefire just for convenience.
Requires: mvn(junit:junit)
Requires: mvn(org.apache.maven.surefire:surefire-junit4)
# testng is quite common as well
Requires: maven-surefire-provider-testng
Requires: mvn(org.apache.maven.surefire:surefire-testng)
%description -n maven-local
This package provides macros and scripts to support packaging Maven artifacts.
@ -87,7 +86,7 @@ Summary: Local mode for Gradle
Requires: %{name} = %{version}-%{release}
Requires: javapackages-local = %{version}-%{release}
Requires: gradle >= 2.2.1-2
Requires: xmvn-connector-gradle >= 2
Requires: xmvn-connector-gradle >= 3.0.0
%description -n gradle-local
This package implements local mode for Gradle, which allows artifact
@ -99,30 +98,32 @@ Summary: Local mode for Apache Ivy
Requires: %{name} = %{version}-%{release}
Requires: javapackages-local = %{version}-%{release}
Requires: apache-ivy >= 2.3.0-8
Requires: xmvn-connector-ivy >= 2
Requires: xmvn-connector-ivy >= 3.0.0
%description -n ivy-local
This package implements local mode for Apache Ivy, which allows
artifact resolution using XMvn resolver.
%package -n python3-javapackages
%package -n %{python_prefix}-javapackages
Summary: Module for handling various files for Java packaging
Requires: python3-lxml
Requires: python3-six
Requires: %{python_prefix}-lxml
Requires: %{python_prefix}-six
Obsoletes: python-javapackages < %{version}-%{release}
%description -n python3-javapackages
%description -n %{python_prefix}-javapackages
Module for handling, querying and manipulating of various files for Java
packaging in Linux distributions
%package -n javapackages-local
Summary: Non-essential macros and scripts for Java packaging support
Requires: %{name} = %{version}-%{release}
Requires: xmvn-install >= 2
Requires: xmvn-subst >= 2
Requires: xmvn-resolve >= 2
Requires: xmvn-install >= 3.0.0
Requires: xmvn-subst >= 3.0.0
Requires: xmvn-resolve >= 3.0.0
# Java build systems don't have hard requirement on java-devel, so it should be there
Requires: java-devel
Requires: java-1.8.0-openjdk-devel
Requires: %{python_prefix}-javapackages = %{version}-%{release}
Requires: %{python_prefix}
%description -n javapackages-local
This package provides non-essential macros and scripts to support Java packaging.
@ -130,22 +131,17 @@ This package provides non-essential macros and scripts to support Java packaging
%prep
%setup -q -n javapackages-%{version}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
%configure --pyinterpreter=%{__python3}
%configure --pyinterpreter=%{python_interpreter} \
--default_jdk=%{default_jdk} --default_jre=%{default_jre} \
--rpmmacrodir=%{rpmmacrodir}
./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
sed -i 's|mvn_build.py|& --xmvn-javadoc|' $(find %{buildroot} -name 'macros*.fjava')
sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-*
%if %{without gradle}
rm -rf %{buildroot}%{_bindir}/gradle-local
@ -162,7 +158,7 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
%files -n javapackages-local -f files-local
%files -n maven-local -f files-maven
%files -n maven-local
%if %{with gradle}
%files -n gradle-local -f files-gradle
@ -170,11 +166,13 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
%files -n ivy-local -f files-ivy
%files -n python3-javapackages
%files -n %{python_prefix}-javapackages -f files-python
%license LICENSE
%{python3_sitelib}/javapackages*
%changelog
* Wed Jun 21 2017 Michael Simacek <msimacek@redhat.com> - 5.0.0-1
- Update to upstream version 5.0.0
* Tue Mar 14 2017 Michael Simacek <msimacek@redhat.com> - 4.7.0-16
- Force locale in test to fix failures

3
sources
View File

@ -1,2 +1 @@
a7b39f51f97e91c337190c9c49162a7f javapackages-4.6.0.tar.xz
454f2bd47c2743a83d2b09f560538715 javapackages-4.7.0.tar.xz
SHA512 (5.0.0.tar.gz) = f5412474257d516bdd638f2bda4e0b816caddba67ee00211646459db526d3a62aba694549038df29463604af99e4609af5a1ba9a3b733576a51e6ddc7cfc26ca