From 22c439ba3605bdef6f757cff1673b8c8a33f469a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 28 Nov 2014 12:27:47 +0100 Subject: [PATCH] Scan lib64/ in OSGi dep generators - Related: rhbz#1166156 --- ...end-dependencies-to-metadata-if-we-h.patch | 2 +- ...script-to-inject-extra-JVM-arguments.patch | 2 +- ...-independent-location-of-abrt-java-c.patch | 2 +- 0004-Make-sure-_libdir-is-not-use.patch | 2 +- ...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(-) create mode 100644 0006-Scan-lib64-in-OSGi-dep-generators.patch 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 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 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 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 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 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 +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 - 4.2.0-10 +- Scan lib64/ in OSGi dep generators +- Related: rhbz#1166156 + * Wed Nov 26 2014 Mikolaj Izdebski - 4.2.0-9 - Revert adding namespace support in %%mvn_artifact