pool/ocfs2-tools
4
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Accepting request 186797 from home:goldwynr:branches:network:ha-clustering:Factory

Browse Source 
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
This commit is contained in:
Goldwyn Rodrigues 2013-08-12 20:16:37 +00:00 committed by Git OBS Bridge
parent 7cec29fa90
commit 8031d741d2
3 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libocfs2-needs-libaio.patch Normal file
View File

@ -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}

12
ocfs2-tools.changes
View File

@ -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

12
ocfs2-tools.spec
View File

@ -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