From 8031d741d2ed314ffc2555fda4a71329b3d41370 Mon Sep 17 00:00:00 2001
From: Goldwyn Rodrigues <rgoldwyn@suse.com>
Date: Mon, 12 Aug 2013 20:16:37 +0000
Subject: [PATCH] Accepting request 186797 from
 home:goldwynr:branches:network:ha-clustering:Factory

add libraries in devel

OBS-URL: https://build.opensuse.org/request/show/186797
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=63
---
 libocfs2-needs-libaio.patch | 11 +++++++++++
 ocfs2-tools.changes         | 12 +++++++-----
 ocfs2-tools.spec            | 12 ++++++++----
 3 files changed, 26 insertions(+), 9 deletions(-)
 create mode 100644 libocfs2-needs-libaio.patch

diff --git a/libocfs2-needs-libaio.patch b/libocfs2-needs-libaio.patch
new file mode 100644
index 0000000..e351024
--- /dev/null
+++ b/libocfs2-needs-libaio.patch
@@ -0,0 +1,11 @@
+Index: ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2.pc.in
+===================================================================
+--- ocfs2-tools-1.8.2+git.1361836695.ff84eb5.orig/ocfs2.pc.in	2013-04-02 04:38:06.452732480 -0500
++++ ocfs2-tools-1.8.2+git.1361836695.ff84eb5/ocfs2.pc.in	2013-08-09 16:51:54.933245397 -0500
+@@ -7,5 +7,5 @@ Name: ocfs2
+ Description: Userspace ocfs2 library
+ Version: @VERSION@
+ Requires: o2dlm o2cb com_err
+-Libs: -L${libdir} -locfs2
++Libs: -L${libdir} -locfs2 -laio
+ Cflags: -I${includedir}
diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes
index 5506567..e1ebb70 100644
--- a/ocfs2-tools.changes
+++ b/ocfs2-tools.changes
@@ -1,15 +1,17 @@
 -------------------------------------------------------------------
+Fri Aug  9 13:55:01 CDT 2013 - rgoldwyn@suse.com
 
+- Add libraries back in devel package. This is required for
+  ocfs2-test
+- libocfs2-needs-libaio.patch: Add -laio to ocfs2.pc
+
+-------------------------------------------------------------------
 Tue Aug  6 09:21:41 CDT 2013 - rgoldwyn@suse.com
+
 - Fix FS protocol versions: 
   + 0003-Remove-daemon-protocol-versions-and-consolidate-fs-v.patch
   - 0003-Hard-code-protocol-versions.patch
 
--------------------------------------------------------------------
-Mon Aug  5 07:40:31 CDT 2013 - rgoldwyn@suse.com
-
-- Add libcorosync4 and libdlm3 in Requires.
-
 -------------------------------------------------------------------
 Wed Jul 31 08:01:02 CDT 2013 - rgoldwyn@suse.com
 
diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec
index 1e6706f..c097c3e 100644
--- a/ocfs2-tools.spec
+++ b/ocfs2-tools.spec
@@ -49,6 +49,7 @@ Patch216:       0001-Remove-pacemaker-ais-stuff.patch
 Patch217:       0002-Add-corosync-cfg-to-get-configuration-information.patch
 Patch218:       0003-Remove-daemon-protocol-versions-and-consolidate-fs-v.patch
 Patch219:       0005-Add-cluster_name-and-stack-name.patch
+Patch220:       libocfs2-needs-libaio.patch
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -69,8 +70,6 @@ Requires(pre):  %insserv_prereq
 Requires:       /sbin/chkconfig
 Requires:       e2fsprogs
 Requires:       glib2 >= 2.2.3
-Requires:       libcorosync4
-Requires:       libdlm3
 Requires:       modutils
 Requires:       net-tools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -151,6 +150,7 @@ managing the file system.
 %patch217 -p1
 %patch218 -p1
 %patch219 -p1
+%patch220 -p1
 
 %build
 export PROJECT="ocfs2-tools"
@@ -188,8 +188,9 @@ cd ..
 mv %{buildroot}/{,/usr}/sbin/o2image
 mv %{buildroot}/{,/usr}/sbin/debugfs.ocfs2
 mv %{buildroot}/{,/usr}/sbin/ocfs2_controld.pcmk
-find %{buildroot} -name '*.a' -type f -print0 | xargs -0 rm -f
-find %{buildroot} -name '*.la' -type f -print0 | xargs -0 rm -f
+chmod a-x %{buildroot}/%{_libdir}/libo2cb.a
+chmod a-x %{buildroot}/%{_libdir}/libo2dlm.a
+chmod a-x %{buildroot}/%{_libdir}/libocfs2.a
 python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}/ocfs2interface', ddir='%{py_sitedir}/ocfs2interface')"
 
 %preun o2cb
@@ -270,5 +271,8 @@ python -c "import compileall; compileall.compile_dir('%{buildroot}/%{py_sitedir}
 %{_libdir}/pkgconfig/o2cb.pc
 %{_libdir}/pkgconfig/o2dlm.pc
 %{_libdir}/pkgconfig/ocfs2.pc
+%{_libdir}/libo2cb.a
+%{_libdir}/libo2dlm.a
+%{_libdir}/libocfs2.a
 
 %changelog