Blob Blame Raw
From fad76ad79a58627fa9aa074089c01ae1057cc6d4 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Thu, 30 Oct 2014 09:18:08 +0100
Subject: [PATCH 4/6] Make sure %{_libdir} is not use

Javapackages as noarch package cannot safely reference libdir.
---
 build                             | 1 -
 configure                         | 2 --
 depgenerators/fileattrs/osgi.attr | 2 +-
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/build b/build
index 05e5d0a..7151563 100755
--- a/build
+++ b/build
@@ -54,7 +54,6 @@ expand()
 
     sed \
         -e "s|%{bindir}|${bindir}|" \
-        -e "s|%{libdir}|${libdir}|" \
         -e "s|%{datadir}|${datadir}|" \
         -e "s|%{javaconfdir}|${javaconfdir}|" \
         -e "s|%{javadir}|${javadir}|" \
diff --git a/configure b/configure
index b6797db..f691b62 100755
--- a/configure
+++ b/configure
@@ -35,7 +35,6 @@ set -e
 vars="
 bindir
 datadir
-libdir
 localstatedir
 mandir
 prefix
@@ -72,7 +71,6 @@ eval $(for _; do echo "$_"; done |
 test -z "${prefix}" && prefix="/usr/local"
 test -z "${bindir}" && bindir="${prefix}/bin"
 test -z "${datadir}" && datadir="${prefix}/share"
-test -z "${libdir}" && libdir="${prefix}/lib"
 test -z "${localstatedir}" && localstatedir="${prefix}/var"
 test -z "${mandir}" && mandir="${datadir}/man"
 test -z "${rundir}" && rundir="${localstatedir}/run"
diff --git a/depgenerators/fileattrs/osgi.attr b/depgenerators/fileattrs/osgi.attr
index d0c1145..ae858b5 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$|((%{_libdir}|%{_datadir}).*/MANIFEST.MF))
+%__osgi_path	^(.*\\.jar$|((%{_prefix}/lib|%{_datadir})/.*/MANIFEST.MF))
 
-- 
1.9.3