java-sig-commits November 2014

java-sig-commits@lists.fedoraproject.org

15 participants
586 discussions

[javapackages] [osgi] Utilize execute_command() function
by Michal Srb 28 Nov '14

28 Nov '14

commit 9d49cef6f570e18346c41741e5048868b6f04bf8 Author: Michal Srb <msrb(a)redhat.com> Date: Fri Nov 28 10:15:49 2014 +0100 [osgi] Utilize execute_command() function python/javapackages/common/osgi.py | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) --- diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py index c475cb4..292fb26 100644 --- a/python/javapackages/common/osgi.py +++ b/python/javapackages/common/osgi.py @@ -39,6 +39,7 @@ import subprocess import javapackages.common.config as config from javapackages.common.manifest import Manifest +from javapackages.common.util import execute_command class OSGiRequire(object): @@ -135,22 +136,22 @@ class OSGiResolver(object): _binpath = "/usr/share/java-utils/p2-install" @staticmethod - def process_metadata(metadata): + def process_metadata(metadata, scl=None): artifacts = metadata.get_provided_artifacts() paths = [] paths.extend([x.get_buildroot_path() for x in artifacts]) - return OSGiResolver.process_paths(paths) + return OSGiResolver.process_paths(paths, scl=scl) @staticmethod - def process_path(path): - bundle = OSGiResolver.process_paths([path]) + def process_path(path, scl=None): + bundle = OSGiResolver.process_paths([path], scl=scl) if bundle: return bundle[0] return None @staticmethod - def process_paths(paths): - return OSGiResolver._call_script(paths) + def process_paths(paths, scl=None): + return OSGiResolver._call_script(paths, scl=scl) @staticmethod def is_available(): @@ -159,16 +160,12 @@ class OSGiResolver(object): return False @staticmethod - def _call_script(paths): - procargs = [OSGiResolver._binpath, "--name", "rpmdepgen", - "--dry-run", "--print-deps"] - procargs.extend(paths) - proc = subprocess.Popen(procargs, shell=False, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, - universal_newlines=True) - stdout, stderr = proc.communicate() - proc.wait() - if proc.returncode != 0: + def _call_script(paths, scl=None): + args = "--name rpmdepgen --dry-run --print-deps" + rc, stdout, stderr = execute_command(OSGiResolver._binpath, + args=[args.split()], + enable_scl=scl) + if rc != 0: raise Exception(stderr) result = stdout.split("\n")[:-1] return [OSGiBundle.from_string(x) for x in result] @@ -209,9 +206,10 @@ def check_path_in_metadata(path, cachedir_path): class OSGiCache(object): - def __init__(self, cachedir): + def __init__(self, cachedir, scl=None): self._cachedir = cachedir self._cache = self._read_osgi_cache() + self._scl = scl if self._cache is None: cache = self._process_osgi_in_buildroot() @@ -238,7 +236,7 @@ class OSGiCache(object): bundle_paths = self._find_possible_bundles() for path in bundle_paths: if OSGiResolver.is_available(): - bundle = OSGiResolver.process_path(path) + bundle = OSGiResolver.process_path(path, scl=self._scl) else: bundle = OSGiBundle.from_manifest(path) if bundle:

1 0

[javapackages] Add auxiliary function for executing external commands
by Michal Srb 28 Nov '14

28 Nov '14

commit 338ce644f8116d3a493bd619df4baed1ca89840d Author: Michal Srb <msrb(a)redhat.com> Date: Fri Nov 28 10:13:20 2014 +0100 Add auxiliary function for executing external commands python/javapackages/common/util.py | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) --- diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py index 325650a..52c6667 100644 --- a/python/javapackages/common/util.py +++ b/python/javapackages/common/util.py @@ -35,6 +35,7 @@ import os import signal import sys import six +import subprocess def kill_parent_process(): @@ -53,3 +54,23 @@ def args_to_unicode(args): for index, arg in enumerate(args): args[index] = arg.decode(sys.getfilesystemencoding()) return args + + +def execute_command(binpath, args=[], env=None, input=None, shell=False, + enable_scl=None): + scl_cmd = "scl enable {scl}" + command = "" + if enable_scl: + scl_cmd = scl_cmd.format(scl=enable_scl) + command = scl_cmd + " && " + shell = True + command = [command + binpath] + command.extend(args) + + proc = subprocess.Popen(command, shell=shell, + stdout=subprocess.PIPE, stderr=subprocess.PIPE, + stdin=subprocess.PIPE, universal_newlines=True, + env=env) + stdout, stderr = proc.communicate(input=None) + proc.wait() + return proc.returncode, stdout, stderr

1 0

[javapackages] Move cachedir variable to global scope
by Michal Srb 28 Nov '14

28 Nov '14

commit a698852e1b18d8d414874eb06387e98e69f0c06e Author: Michal Srb <msrb(a)redhat.com> Date: Fri Nov 28 09:27:18 2014 +0100 Move cachedir variable to global scope depgenerators/maven.req | 19 +++++++++---------- depgenerators/osgi.prov | 12 +++++------- depgenerators/osgi.req | 11 +++++------ 3 files changed, 19 insertions(+), 23 deletions(-) --- diff --git a/depgenerators/maven.req b/depgenerators/maven.req index ae0be86..fd6018a 100755 --- a/depgenerators/maven.req +++ b/depgenerators/maven.req @@ -54,8 +54,7 @@ _log = logging.getLogger("maven.req") class TagBuilder(object): - def __init__(self, filelist=None, cachedir=None): - self.cachedir = cachedir + def __init__(self, filelist=None): if filelist == None: filelist = sys.stdin @@ -73,22 +72,22 @@ class TagBuilder(object): metadata = None # get all provided artifacts - self.provided_artifacts = Metadata.read_provided_artifacts_from_cache(self.cachedir) + self.provided_artifacts = Metadata.read_provided_artifacts_from_cache(_cachedir) if self.provided_artifacts is None: metadata = Metadata(self.metadata_paths or self._gather_metadata_files()) - self.provided_artifacts = metadata.write_provided_artifacts_to_cache(self.cachedir) or [] + self.provided_artifacts = metadata.write_provided_artifacts_to_cache(_cachedir) or [] # get all skipped artifacts - self.skipped_artifacts = Metadata.read_skipped_artifacts_from_cache(self.cachedir) + self.skipped_artifacts = Metadata.read_skipped_artifacts_from_cache(_cachedir) if self.skipped_artifacts is None: metadata = Metadata(self.metadata_paths or self._gather_metadata_files()) - self.skipped_artifacts = metadata.write_skipped_artifacts_to_cache(self.cachedir) or [] + self.skipped_artifacts = metadata.write_skipped_artifacts_to_cache(_cachedir) or [] # get all provided OSGi bundles - self.provided_osgi = Metadata.read_provided_osgi_from_cache(self.cachedir) + self.provided_osgi = Metadata.read_provided_osgi_from_cache(_cachedir) if self.provided_osgi is None: metadata = Metadata(self.metadata_paths or self._gather_metadata_files()) - self.provided_osgi = metadata.write_provided_osgi_to_cache(self.cachedir) or {} + self.provided_osgi = metadata.write_provided_osgi_to_cache(_cachedir) or {} curr_metadata = Metadata(paths[0]) self.print_requires(curr_metadata) @@ -400,11 +399,11 @@ class TagBuilder(object): if __name__ == "__main__": try: if len(sys.argv) > 1: - cachedir = get_cachedir(sys.argv[1]) + _cachedir = get_cachedir(sys.argv[1]) else: raise Exception("Missing param: cachedir") init_logging() - builder = TagBuilder(cachedir=cachedir) + builder = TagBuilder() except Exception: traceback.print_exc(file=sys.stderr) # rpmbuild ignores non-zero exit codes, but this is bad. Make sure diff --git a/depgenerators/osgi.prov b/depgenerators/osgi.prov index 839ae40..c729f47 100755 --- a/depgenerators/osgi.prov +++ b/depgenerators/osgi.prov @@ -44,13 +44,11 @@ _log = logging.getLogger("osgi.prov") class TagBuilder(object): - def __init__(self, filelist=None, cachedir=None): - self.cachedir = cachedir - + def __init__(self, filelist=None): if filelist == None: filelist = sys.stdin paths = [x.rstrip() for x in filelist.readlines()] - cache = OSGiCache(self.cachedir) + cache = OSGiCache(_cachedir) provides = [] for path in paths: @@ -61,7 +59,7 @@ class TagBuilder(object): # check if OSGi provides for this path were handled by metadata # if so, move on - if check_path_in_metadata(path, self.cachedir): + if check_path_in_metadata(path, _cachedir): continue bundle = cache.get_bundle_for_path(path) @@ -76,11 +74,11 @@ class TagBuilder(object): if __name__ == "__main__": try: if len(sys.argv) > 1: - cachedir = get_cachedir(sys.argv[1]) + _cachedir = get_cachedir(sys.argv[1]) else: raise Exception("Missing param: cachedir") init_logging() - builder = TagBuilder(cachedir=cachedir) + builder = TagBuilder() except Exception: traceback.print_exc(file=sys.stderr) # rpmbuild ignores non-zero exit codes, but this is bad. Make sure diff --git a/depgenerators/osgi.req b/depgenerators/osgi.req index d14db73..181aac2 100755 --- a/depgenerators/osgi.req +++ b/depgenerators/osgi.req @@ -46,13 +46,12 @@ _log = logging.getLogger("osgi.req") class TagBuilder(object): - def __init__(self, filelist=None, cachedir=None): - self.cachedir = cachedir + def __init__(self, filelist=None): if filelist == None: filelist = sys.stdin paths = [x.rstrip() for x in filelist.readlines()] - cache = OSGiCache(self.cachedir) + cache = OSGiCache(_cachedir) requires = [] for path in paths: @@ -62,7 +61,7 @@ class TagBuilder(object): # check if OSGi requires for this path were handled by metadata # if so, move on - if check_path_in_metadata(path, self.cachedir): + if check_path_in_metadata(path, _cachedir): continue bundle = cache.get_bundle_for_path(path) @@ -84,11 +83,11 @@ class TagBuilder(object): if __name__ == "__main__": try: if len(sys.argv) > 1: - cachedir = get_cachedir(sys.argv[1]) + _cachedir = get_cachedir(sys.argv[1]) else: raise Exception("Missing param: cachedir") init_logging() - builder = TagBuilder(cachedir=cachedir) + builder = TagBuilder() except Exception: traceback.print_exc(file=sys.stderr) # rpmbuild ignores non-zero exit codes, but this is bad. Make sure

1 0

[javapackages-tools] Remove dependency on libxslt
by Mikolaj Izdebski 28 Nov '14

28 Nov '14

commit aec2dc49573b0cfaedfe18ab265e7410f402cecf Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Nov 28 12:52:00 2014 +0100 Remove dependency on libxslt javapackages-tools.spec | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- diff --git a/javapackages-tools.spec b/javapackages-tools.spec index c0adcca..76e30e5 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -7,7 +7,7 @@ Name: javapackages-tools Version: 4.2.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Macros and scripts for Java packaging support @@ -49,7 +49,6 @@ BuildRequires: javapackages-tools >= 4.0.0 BuildRequires: xmvn-resolve >= 2 Requires: coreutils -Requires: libxslt Requires: lua %if 0%{?with_python3} Requires: python3-javapackages = %{version}-%{release} @@ -248,6 +247,9 @@ popd %doc LICENSE %changelog +* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-11 +- Remove dependency on libxslt + * Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-10 - Scan lib64/ in OSGi dep generators - Related: rhbz#1166156

1 0

[javapackages-tools/f21] Scan lib64/ in OSGi dep generators
by Mikolaj Izdebski 28 Nov '14

28 Nov '14

commit cf1737689e80618493bfe76bba90b96131d0132a Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Nov 28 12:26:05 2014 +0100 Scan lib64/ in OSGi dep generators - Related: rhbz#1166156 ...Mvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch | 2 +- ...pper-script-to-inject-extra-JVM-arguments.patch | 2 +- ...cture-independent-location-of-abrt-java-c.patch | 2 +- 0004-Make-sure-_libdir-is-not-use.patch | 2 +- ...rove-patterns-for-matching-OSGi-manifests.patch | 2 +- 0006-Scan-lib64-in-OSGi-dep-generators.patch | 26 ++++++++++++++++++++ javapackages-tools.spec | 8 +++++- 7 files changed, 38 insertions(+), 6 deletions(-) --- diff --git a/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch b/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch index f692a6e..6d86eaf 100644 --- a/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch +++ b/0001-maven.req-XMvn-sets-resolvedVersion-to-UNKNOWN-for-u.patch @@ -1,7 +1,7 @@ From 7b6fb236b78dadcee14e047e52a342556f210f39 Mon Sep 17 00:00:00 2001 From: Michal Srb <msrb(a)redhat.com> Date: Thu, 10 Jul 2014 15:30:17 +0200 -Subject: [PATCH 1/5] [maven.req] XMvn sets resolvedVersion to UNKNOWN for +Subject: [PATCH 1/6] [maven.req] XMvn sets resolvedVersion to UNKNOWN for unresolvable deps --- diff --git a/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch index 58b0c3e..b65e409 100644 --- a/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch +++ b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch @@ -1,7 +1,7 @@ From 24a1fb2f2f38bb8fdb883e91f34b3f2ca26765a7 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Thu, 30 Oct 2014 15:20:20 +0100 -Subject: [PATCH 2/5] Use wrapper script to inject extra JVM arguments +Subject: [PATCH 2/6] Use wrapper script to inject extra JVM arguments --- install | 1 + diff --git a/0003-Use-architecture-independent-location-of-abrt-java-c.patch b/0003-Use-architecture-independent-location-of-abrt-java-c.patch index 3c28f63..0f8468c 100644 --- a/0003-Use-architecture-independent-location-of-abrt-java-c.patch +++ b/0003-Use-architecture-independent-location-of-abrt-java-c.patch @@ -1,7 +1,7 @@ From b78bd8b88b92962d5f84b344828293d82d20f7ff Mon Sep 17 00:00:00 2001 From: Jakub Filak <jfilak(a)redhat.com> Date: Thu, 30 Oct 2014 08:36:56 +0100 -Subject: [PATCH 3/5] Use architecture-independent location of +Subject: [PATCH 3/6] Use architecture-independent location of abrt-java-connector The connector's library has been moved to architecture-independent diff --git a/0004-Make-sure-_libdir-is-not-use.patch b/0004-Make-sure-_libdir-is-not-use.patch index adb4e82..6afa997 100644 --- a/0004-Make-sure-_libdir-is-not-use.patch +++ b/0004-Make-sure-_libdir-is-not-use.patch @@ -1,7 +1,7 @@ From fad76ad79a58627fa9aa074089c01ae1057cc6d4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Thu, 30 Oct 2014 09:18:08 +0100 -Subject: [PATCH 4/5] Make sure %{_libdir} is not use +Subject: [PATCH 4/6] Make sure %{_libdir} is not use Javapackages as noarch package cannot safely reference libdir. --- diff --git a/0005-Improve-patterns-for-matching-OSGi-manifests.patch b/0005-Improve-patterns-for-matching-OSGi-manifests.patch index 111ef67..9b18934 100644 --- a/0005-Improve-patterns-for-matching-OSGi-manifests.patch +++ b/0005-Improve-patterns-for-matching-OSGi-manifests.patch @@ -1,7 +1,7 @@ From 401ab7370d01627b4fc1a57d454276d788f18e39 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Thu, 20 Nov 2014 16:22:52 +0100 -Subject: [PATCH 5/5] Improve patterns for matching OSGi manifests +Subject: [PATCH 5/6] Improve patterns for matching OSGi manifests --- depgenerators/fileattrs/osgi.attr | 2 +- diff --git a/0006-Scan-lib64-in-OSGi-dep-generators.patch b/0006-Scan-lib64-in-OSGi-dep-generators.patch new file mode 100644 index 0000000..9ed57c1 --- /dev/null +++ b/0006-Scan-lib64-in-OSGi-dep-generators.patch @@ -0,0 +1,26 @@ +From 55af85dae4ade7c26a356cb4fb27c2fe986bc58c Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski <mizdebsk(a)redhat.com> +Date: Fri, 28 Nov 2014 08:37:09 +0100 +Subject: [PATCH 6/6] Scan lib64/ in OSGi dep generators + +Java is exempt from multilib and that's why most of Java packages +install their arch-dependant stuff in /usr/lib/, not %{_libdir}. +Eclipse is an exception here - on some architectures it installs its +bundles in /usr/lib64/. +--- + depgenerators/fileattrs/osgi.attr | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr +index 83e8c8d..a2c614c 100644 +--- a/depgenerators/fileattrs/osgi.attr ++++ b/depgenerators/fileattrs/osgi.attr +@@ -1,4 +1,4 @@ + %__osgi_provides %{_rpmconfigdir}/osgi.prov + %__osgi_requires %{_rpmconfigdir}/osgi.req +-%__osgi_path ^(.*\\.jar|((%{_prefix}/lib|%{_datadir})/.*/META-INF/MANIFEST.MF))$ ++%__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ + +-- +1.9.3 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 6d43137..d7d7155 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -1,6 +1,6 @@ Name: javapackages-tools Version: 4.1.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Macros and scripts for Java packaging support @@ -13,6 +13,7 @@ Patch1: 0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch Patch2: 0003-Use-architecture-independent-location-of-abrt-java-c.patch Patch3: 0004-Make-sure-_libdir-is-not-use.patch Patch4: 0005-Improve-patterns-for-matching-OSGi-manifests.patch +Patch5: 0006-Scan-lib64-in-OSGi-dep-generators.patch BuildArch: noarch @@ -142,6 +143,7 @@ This package provides non-essential macros and scripts to support Java packaging %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build %configure @@ -182,6 +184,10 @@ popd %doc LICENSE %changelog +* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.1.0-7 +- Scan lib64/ in OSGi dep generators +- Related: rhbz#1166156 + * Wed Nov 26 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.1.0-6 - Revert adding namespace support in %%mvn_artifact

1 0

[javapackages-tools] Scan lib64/ in OSGi dep generators
by Mikolaj Izdebski 28 Nov '14

28 Nov '14

commit 22c439ba3605bdef6f757cff1673b8c8a33f469a Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Nov 28 12:27:47 2014 +0100 Scan lib64/ in OSGi dep generators - Related: rhbz#1166156 ...t-Append-dependencies-to-metadata-if-we-h.patch | 2 +- ...pper-script-to-inject-extra-JVM-arguments.patch | 2 +- ...cture-independent-location-of-abrt-java-c.patch | 2 +- 0004-Make-sure-_libdir-is-not-use.patch | 2 +- ...rove-patterns-for-matching-OSGi-manifests.patch | 2 +- 0006-Scan-lib64-in-OSGi-dep-generators.patch | 26 ++++++++++++++++++++ javapackages-tools.spec | 8 +++++- 7 files changed, 38 insertions(+), 6 deletions(-) --- diff --git a/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch b/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch index 67f6cb4..984803d 100644 --- a/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch +++ b/0001-mvn_artifact-Append-dependencies-to-metadata-if-we-h.patch @@ -1,7 +1,7 @@ From eafaa146aace0885d17ff472db0a63aef75f2ce5 Mon Sep 17 00:00:00 2001 From: Michal Srb <msrb(a)redhat.com> Date: Thu, 18 Sep 2014 10:48:07 +0200 -Subject: [PATCH 1/5] [mvn_artifact] Append dependencies to metadata, if we +Subject: [PATCH 1/6] [mvn_artifact] Append dependencies to metadata, if we have them --- diff --git a/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch index fe61427..ff354db 100644 --- a/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch +++ b/0002-Use-wrapper-script-to-inject-extra-JVM-arguments.patch @@ -1,7 +1,7 @@ From dee96bf521cdbae4c80ee328968e1ff5200f2aab Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Thu, 30 Oct 2014 15:20:20 +0100 -Subject: [PATCH 2/5] Use wrapper script to inject extra JVM arguments +Subject: [PATCH 2/6] Use wrapper script to inject extra JVM arguments --- install | 1 + diff --git a/0003-Use-architecture-independent-location-of-abrt-java-c.patch b/0003-Use-architecture-independent-location-of-abrt-java-c.patch index 73a355e..ea40fd5 100644 --- a/0003-Use-architecture-independent-location-of-abrt-java-c.patch +++ b/0003-Use-architecture-independent-location-of-abrt-java-c.patch @@ -1,7 +1,7 @@ From 97ee162d443fd954208c277c43f7195339b01e8d Mon Sep 17 00:00:00 2001 From: Jakub Filak <jfilak(a)redhat.com> Date: Thu, 30 Oct 2014 08:36:56 +0100 -Subject: [PATCH 3/5] Use architecture-independent location of +Subject: [PATCH 3/6] Use architecture-independent location of abrt-java-connector The connector's library has been moved to architecture-independent diff --git a/0004-Make-sure-_libdir-is-not-use.patch b/0004-Make-sure-_libdir-is-not-use.patch index 867d991..27944f7 100644 --- a/0004-Make-sure-_libdir-is-not-use.patch +++ b/0004-Make-sure-_libdir-is-not-use.patch @@ -1,7 +1,7 @@ From bd3bfd39508792f91621cba0b6279eeeef4aa866 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Thu, 30 Oct 2014 09:18:08 +0100 -Subject: [PATCH 4/5] Make sure %{_libdir} is not use +Subject: [PATCH 4/6] Make sure %{_libdir} is not use Javapackages as noarch package cannot safely reference libdir. --- diff --git a/0005-Improve-patterns-for-matching-OSGi-manifests.patch b/0005-Improve-patterns-for-matching-OSGi-manifests.patch index 0d0be97..0a8f8c2 100644 --- a/0005-Improve-patterns-for-matching-OSGi-manifests.patch +++ b/0005-Improve-patterns-for-matching-OSGi-manifests.patch @@ -1,7 +1,7 @@ From f0a2e4226028c4a68d956ef9ac1d4d43fdbe961e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Thu, 20 Nov 2014 16:22:52 +0100 -Subject: [PATCH 5/5] Improve patterns for matching OSGi manifests +Subject: [PATCH 5/6] Improve patterns for matching OSGi manifests --- depgenerators/fileattrs/osgi.attr | 2 +- diff --git a/0006-Scan-lib64-in-OSGi-dep-generators.patch b/0006-Scan-lib64-in-OSGi-dep-generators.patch new file mode 100644 index 0000000..66e844d --- /dev/null +++ b/0006-Scan-lib64-in-OSGi-dep-generators.patch @@ -0,0 +1,26 @@ +From 135a8ac0b704a39c4b5fb74025bf6440a16531af Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski <mizdebsk(a)redhat.com> +Date: Fri, 28 Nov 2014 08:37:09 +0100 +Subject: [PATCH 6/6] Scan lib64/ in OSGi dep generators + +Java is exempt from multilib and that's why most of Java packages +install their arch-dependant stuff in /usr/lib/, not %{_libdir}. +Eclipse is an exception here - on some architectures it installs its +bundles in /usr/lib64/. +--- + depgenerators/fileattrs/osgi.attr | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr +index edacd4d..6d8860a 100644 +--- a/depgenerators/fileattrs/osgi.attr ++++ b/depgenerators/fileattrs/osgi.attr +@@ -2,4 +2,4 @@ + %__osgi_provides_opts %{_builddir}/%{?buildsubdir} + %__osgi_requires %{_rpmconfigdir}/osgi.req + %__osgi_requires_opts %{_builddir}/%{?buildsubdir} +-%__osgi_path ^(.*\\.jar|((%{_prefix}/lib|%{_datadir})/.*/META-INF/MANIFEST.MF))$ ++%__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$ +-- +1.9.3 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9be4b34..c0adcca 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -7,7 +7,7 @@ Name: javapackages-tools Version: 4.2.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Macros and scripts for Java packaging support @@ -22,6 +22,7 @@ Patch4: 0003-Use-architecture-independent-location-of-abrt-java-c.patch Patch5: 0001-fix-rhbz#1155185.patch Patch6: 0004-Make-sure-_libdir-is-not-use.patch Patch7: 0005-Improve-patterns-for-matching-OSGi-manifests.patch +Patch8: 0006-Scan-lib64-in-OSGi-dep-generators.patch BuildArch: noarch @@ -181,6 +182,7 @@ This package provides non-essential macros and scripts to support Java packaging %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %if 0%{?with_python3} find . -name '*.py' | xargs sed -i '1s|^#!.*python|#!%{__python3}|' @@ -246,6 +248,10 @@ popd %doc LICENSE %changelog +* Fri Nov 28 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-10 +- Scan lib64/ in OSGi dep generators +- Related: rhbz#1166156 + * Wed Nov 26 2014 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 4.2.0-9 - Revert adding namespace support in %%mvn_artifact

1 0

Broken dependencies: scirenderer
by Fedora Koji Build System 28 Nov '14

28 Nov '14

scirenderer has broken dependencies in the rawhide tree: On armhfp: scirenderer-1.1.0-4.fc22.noarch requires jogl2 Please resolve this as soon as possible.

1 0

[jogl2] Remove javadoc build as it timeout the ARM builders
by Clément David 28 Nov '14

28 Nov '14

commit b7f75d9711e4a7707b85278895390ba7ca3dc646 Author: Clément DAVID <clement.david(a)scilab-enterprises.com> Date: Fri Nov 28 11:03:13 2014 +0100 Remove javadoc build as it timeout the ARM builders jogl2.spec | 27 ++++----------------------- 1 files changed, 4 insertions(+), 23 deletions(-) --- diff --git a/jogl2.spec b/jogl2.spec index 1843d99..c548c4d 100644 --- a/jogl2.spec +++ b/jogl2.spec @@ -1,6 +1,6 @@ Name: jogl2 Version: 2.2.4 -Release: 2%{?dist} +Release: 3%{?dist} %global src_name jogl-v%{version} Summary: Java bindings for the OpenGL API @@ -42,15 +42,6 @@ and integrates with the AWT and Swing widget sets. It is part of a suite of open-source technologies initiated by the Game Technology Group at Sun Microsystems. -%package javadoc -Summary: Javadoc for jogl2 -Group: Documentation -Requires: jpackage-utils -BuildArch: noarch - -%description javadoc -Javadoc for jogl2. - %package doc Summary: User manual for jogl2 Group: Documentation @@ -119,7 +110,6 @@ xargs -t ant <<EOF -Dgluegen.link=%{_javadocdir}/gluegen2 all - javadoc.all EOF %install @@ -136,34 +126,25 @@ mkdir -p %{buildroot}%{_mavenpomdir} install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.jogamp.jogl:jogl-all" -# Make the javadoc package -mkdir -p %{buildroot}%{_javadocdir}/%{name} -cp -rdf build/javadoc/jogl/javadoc/* %{buildroot}%{_javadocdir}/%{name} -cp LICENSE.txt %{buildroot}%{_javadocdir}/%{name}/ - # Make the doc package mkdir -p %{buildroot}%{_docdir}/%{name} cp -rdf doc/* %{buildroot}%{_docdir}/%{name} cp -t %{buildroot}%{_docdir}/%{name}/ README.txt LICENSE.txt CHANGELOG.txt -# update links to javadoc -find %{buildroot}%{_docdir}/%{name} -name '*.html' \ - -exec sed -i "s|/deployment/jogamp-next/javadoc/jogl/javadoc|%{_javadocdir}/%{name}|g" {} + - %files -f .mfiles %{_docdir}/%{name}/README.txt %{_docdir}/%{name}/LICENSE.txt %{_docdir}/%{name}/CHANGELOG.txt %{_libdir}/%{name} -%files javadoc -%{_javadocdir}/%{name} - %files doc %{_docdir}/%{name}/LICENSE.txt %{_docdir}/%{name} %changelog +* Fri Nov 28 2014 Clément David <c.david86(a)gmail.com> - 2.2.4-3 +- Remove javadoc build as it timeout the ARM builders + * Wed Nov 19 2014 Clément David <c.david86(a)gmail.com> - 2.2.4-2 - Build for arm

1 0

[javapackages] Scan lib64/ in OSGi dep generators
by Mikolaj Izdebski 28 Nov '14

28 Nov '14

commit bad34c99f1668a296e0ff542746ca94b03c4e83a Author: Mikolaj Izdebski <mizdebsk(a)redhat.com> Date: Fri Nov 28 08:37:09 2014 +0100 Scan lib64/ in OSGi dep generators Java is exempt from multilib and that's why most of Java packages install their arch-dependant stuff in /usr/lib/, not %{_libdir}. Eclipse is an exception here - on some architectures it installs its bundles in /usr/lib64/. depgenerators/fileattrs/osgi.attr | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) --- diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr index edacd4d..6d8860a 100644 --- a/depgenerators/fileattrs/osgi.attr +++ b/depgenerators/fileattrs/osgi.attr @@ -2,4 +2,4 @@ %__osgi_provides_opts %{_builddir}/%{?buildsubdir} %__osgi_requires %{_rpmconfigdir}/osgi.req %__osgi_requires_opts %{_builddir}/%{?buildsubdir} -%__osgi_path ^(.*\\.jar|((%{_prefix}/lib|%{_datadir})/.*/META-INF/MANIFEST.MF))$ +%__osgi_path ^(.*\\.jar|((%{_prefix}/lib(64)?|%{_datadir})/.*/META-INF/MANIFEST.MF))$

1 0

[javapackages] [osgi] Fix "AttributeError: 'list' object has no attribute 'get_rpm_str'"
by Michal Srb 28 Nov '14

28 Nov '14

commit 57411c1555dbb2ef4446bf5d30dd8b5f8d081224 Author: Michal Srb <msrb(a)redhat.com> Date: Fri Nov 28 07:05:30 2014 +0100 [osgi] Fix "AttributeError: 'list' object has no attribute 'get_rpm_str'" python/javapackages/common/osgi.py | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) --- diff --git a/python/javapackages/common/osgi.py b/python/javapackages/common/osgi.py index f442ca7..c475cb4 100644 --- a/python/javapackages/common/osgi.py +++ b/python/javapackages/common/osgi.py @@ -143,7 +143,10 @@ class OSGiResolver(object): @staticmethod def process_path(path): - return OSGiResolver.process_paths([path]) + bundle = OSGiResolver.process_paths([path]) + if bundle: + return bundle[0] + return None @staticmethod def process_paths(paths): @@ -235,11 +238,11 @@ class OSGiCache(object): bundle_paths = self._find_possible_bundles() for path in bundle_paths: if OSGiResolver.is_available(): - cache.update({path: OSGiResolver.process_path(path)}) + bundle = OSGiResolver.process_path(path) else: bundle = OSGiBundle.from_manifest(path) - if bundle: - cache.update({path: bundle}) + if bundle: + cache.update({path: bundle}) return cache

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

java-sig-commits November 2014