From 00d7c91453835359c6b7c04a5f527c2c3fba8710 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues Date: Fri, 31 Jan 2014 16:57:09 +0000 Subject: [PATCH 1/2] Accepting request 220505 from home:goldwynr:branches:network:ha-clustering:Factory Use complete filename for libcmap for dlopen() OBS-URL: https://build.opensuse.org/request/show/220505 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=76 --- 0001-Use-cmap-for-getting-cluster-name.patch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/0001-Use-cmap-for-getting-cluster-name.patch b/0001-Use-cmap-for-getting-cluster-name.patch index b40ba57..7e648d8 100644 --- a/0001-Use-cmap-for-getting-cluster-name.patch +++ b/0001-Use-cmap-for-getting-cluster-name.patch @@ -1,8 +1,9 @@ -From 1110d13d756406a6188299bf68db4743cf7c41a3 Mon Sep 17 00:00:00 2001 +From 6423caf73ef9d0f22acf294e100523bc2af3acc9 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues Date: Sat, 21 Dec 2013 18:41:04 -0600 Subject: [PATCH] Use cmap for getting cluster name +Signed-off-by: Goldwyn Rodrigues --- debugfs.ocfs2/Makefile | 2 +- libo2cb/o2cb_abi.c | 79 +++++++++++++++++++++++++++----------------------- @@ -24,7 +25,7 @@ index ca4c9a4..30dfa5f 100644 MANS = debugfs.ocfs2.8 diff --git a/libo2cb/o2cb_abi.c b/libo2cb/o2cb_abi.c -index ae03595..40f8176 100644 +index ae03595..6c3ad73 100644 --- a/libo2cb/o2cb_abi.c +++ b/libo2cb/o2cb_abi.c @@ -35,6 +35,8 @@ @@ -69,7 +70,7 @@ index ae03595..40f8176 100644 - break; - } + -+ lib_handle = dlopen("libcmap.so", RTLD_NOW | RTLD_LOCAL); ++ lib_handle = dlopen("libcmap.so.4", RTLD_NOW | RTLD_LOCAL); + if (!lib_handle) + return ret; + From 3707eb58f0bfe0fcce2c4a01ffa96853b22b45a8 Mon Sep 17 00:00:00 2001 From: Goldwyn Rodrigues Date: Fri, 31 Jan 2014 22:32:53 +0000 Subject: [PATCH 2/2] Accepting request 220525 from home:goldwynr:branches:network:ha-clustering:Factory Updated changelog OBS-URL: https://build.opensuse.org/request/show/220525 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=77 --- ocfs2-tools.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 61eee8c..4ea6b31 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 31 22:21:11 UTC 2014 - rgoldwyn@suse.com + +- Use libcmap.so.4 for dlopen in 0001-Use-cmap-for-getting-cluster-name.patch + to remove dependency on devel package (bnc#860982) + ------------------------------------------------------------------- Fri Dec 27 17:56:21 UTC 2013 - rgoldwyn@suse.com