[javapackages-tools/f21] Scan lib64/ in OSGi dep generators
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Fri Nov 28 11:29:21 UTC 2014
commit cf1737689e80618493bfe76bba90b96131d0132a
Author: Mikolaj Izdebski <mizdebsk at 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 at 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 at 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 at 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 at 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 at 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 at 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 at redhat.com> - 4.1.0-7
+- Scan lib64/ in OSGi dep generators
+- Related: rhbz#1166156
+
* Wed Nov 26 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 4.1.0-6
- Revert adding namespace support in %%mvn_artifact
More information about the scm-commits
mailing list