From ffd693dcf76434cc4eba4a815f7f5c4d7098cda1 Mon Sep 17 00:00:00 2001 From: Coly Li Date: Fri, 15 Apr 2011 12:17:26 +0000 Subject: [PATCH 1/2] - update ocfs2-tools to 1.8.0 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=25 --- ocfs2-tools.changes | 5 +++++ ocfs2-tools.spec | 11 ++++++++--- ocfs2-tools.tar.bz2 | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 49aee73..547ce83 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 15 12:46:03 UTC 2011 - i@coly.li + +- update ocfs2-tools to 1.8.0 + ------------------------------------------------------------------- Thu Dec 2 08:09:49 UTC 2010 - i@coly.li diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 7cbcb94..4af3f54 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -22,7 +22,7 @@ Name: ocfs2-tools BuildRequires: e2fsprogs-devel glib2-devel libcorosync-devel libdlm-devel libopenais-devel libpacemaker-devel libxml2-devel libxslt-devel python-devel python-gtk-devel readline-devel update-desktop-files Summary: Oracle Cluster File System 2 Core Tools Version: 1.6.3 -Release: 1 +Release: 2 License: GPLv2+ Group: System/Filesystems Source: ocfs2-tools.tar.bz2 @@ -36,7 +36,7 @@ Patch105: bug-470741-debug_start_failures.patch Patch106: ocfs2-devel.diff Patch107: reflink-no-syscall.patch Patch201: bug-543119-o2dlm.patch -Patch202: fix-configure-check-libs.patch +Patch202: fix-configure-check-libs.patch Url: http://oss.oracle.com/projects/ocfs2-tools/ Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 PreReq: %insserv_prereq %fillup_prereq @@ -129,7 +129,7 @@ Authors: export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" export PROJECT="ocfs2-tools" autoreconf -fi -I /usr/share/aclocal -%configure --disable-debug --prefix=/usr --mandir=%{_mandir} --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes +%configure --disable-debug --prefix=/usr --mandir=%{_mandir} --enable-ocfs2console=yes --enable-dynamic-fsck=yes --enable-dynamic-ctl=yes make OPTS="$RPM_OPT_FLAGS" cd reflink @@ -197,7 +197,9 @@ fi %{_sbindir}/o2image %{_sbindir}/debugfs.ocfs2 %{_sbindir}/ocfs2_controld.pcmk +%{_sbindir}/o2hbmonitor %{_bindir}/reflink +%{_bindir}/o2info %config %{_sysconfdir}/udev/rules.d/51-ocfs2.rules %{_mandir}/man8/debugfs.ocfs2.8* %{_mandir}/man8/fsck.ocfs2.8* @@ -208,6 +210,7 @@ fi %{_mandir}/man8/ocfs2_hb_ctl.8* %{_mandir}/man8/mount.ocfs2.8* %{_mandir}/man8/o2image.8.gz +%{_mandir}/man1/o2info.1.gz %doc COPYING CREDITS MAINTAINERS %doc documentation/users_guide.txt %dir /usr/lib/ocf @@ -226,11 +229,13 @@ fi /sbin/rco2cb /sbin/rcocfs2 /sbin/o2cb_ctl +/sbin/o2cb %{_sysconfdir}/init.d/o2cb %{_sysconfdir}/init.d/ocfs2 %{_mandir}/man8/o2cb_ctl.8* /var/adm/fillup-templates/sysconfig.o2cb %{_mandir}/man7/o2cb.7.gz +%{_mandir}/man8/o2cb.8.gz %doc README.O2CB %files devel diff --git a/ocfs2-tools.tar.bz2 b/ocfs2-tools.tar.bz2 index 9364607..0ec0c00 100644 --- a/ocfs2-tools.tar.bz2 +++ b/ocfs2-tools.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9914ed380cf0409689c06c691177d437a5615ffbb39d8083b414e2d499ac467 -size 1238521 +oid sha256:98bb639816d4ff6e0e77185d1aa860baca073de8e7cedd59e3db19d2c97d9636 +size 1263265 From d7bb8fe235cb3893ae5c0f5d61ea84bf648b1df5 Mon Sep 17 00:00:00 2001 From: Coly Li Date: Fri, 15 Apr 2011 13:26:45 +0000 Subject: [PATCH 2/2] - Make ocfs2-kmp a Recommend instead of a Requires. This allows easier building of packages which in turn depend on ocfs2-tools. OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/ocfs2-tools?expand=0&rev=26 --- ocfs2-tools.changes | 6 ++++++ ocfs2-tools.spec | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ocfs2-tools.changes b/ocfs2-tools.changes index 547ce83..0454f81 100644 --- a/ocfs2-tools.changes +++ b/ocfs2-tools.changes @@ -21,6 +21,12 @@ Wed Oct 6 05:39:20 UTC 2010 - i@coly.li - update ocfs2-tools to 1.6.3 - remove gcc45-ftbfs-deb-565100.patch, the fix is in upstream now. +------------------------------------------------------------------- +Wed Jul 28 21:35:46 PDT 2010 - mfasheh@novell.com + +- Make ocfs2-kmp a Recommend instead of a Requires. This allows easier + building of packages which in turn depend on ocfs2-tools. + ------------------------------------------------------------------- Wed Jun 30 14:12:48 UTC 2010 - i@coly.li diff --git a/ocfs2-tools.spec b/ocfs2-tools.spec index 4af3f54..afc37d8 100644 --- a/ocfs2-tools.spec +++ b/ocfs2-tools.spec @@ -43,6 +43,10 @@ PreReq: %insserv_prereq %fillup_prereq AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: libdlm openais +%if %suse_version < 1120 +# There's no separate kmp for openSUSE 11.2 +Recommends: ocfs2-kmp +%endif %description OCFS is the Oracle Cluster File System.