Hello community, here is the log from the commit of package ocfs2-tools for openSUSE:Factory checked in at 2012-05-03 10:59:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocfs2-tools (Old) and /work/SRC/openSUSE:Factory/.ocfs2-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocfs2-tools", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ocfs2-tools/ocfs2-tools.changes 2011-12-25 17:37:24.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ocfs2-tools.new/ocfs2-tools.changes 2012-05-03 10:59:08.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 24 20:04:54 UTC 2012 - [email protected] + +- Add ocfs2-tools-kernel33.patch: Fix build with kernel 3.3, which + dropped umode_t. + +------------------------------------------------------------------- New: ---- ocfs2-tools-kernel33.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocfs2-tools.spec ++++++ --- /var/tmp/diff_new_pack.ZzFEVv/_old 2012-05-03 10:59:10.000000000 +0200 +++ /var/tmp/diff_new_pack.ZzFEVv/_new 2012-05-03 10:59:10.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package ocfs2-tools # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -49,11 +49,17 @@ Patch202: fix-configure-check-libs.patch Patch203: fix-ocfs2_controld-crmcommon-link.patch Patch204: dont-use-var-lock-subsys.patch +Patch205: ocfs2-tools-kernel33.patch Url: http://oss.oracle.com/projects/ocfs2-tools/ -Requires: net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3 +Requires: /sbin/chkconfig +Requires: e2fsprogs +Requires: glib2 >= 2.2.3 +Requires: modutils +Requires: net-tools PreReq: %insserv_prereq %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: libdlm openais +Requires: libdlm +Requires: openais %if %suse_version < 1120 # There's no separate kmp for openSUSE 11.2 Recommends: ocfs2-kmp @@ -67,10 +73,15 @@ %package -n ocfs2console Summary: Oracle Cluster Filesystem 2 GUI tools +Group: System/Filesystems Obsoletes: ocfs2-support Requires: ocfs2-tools = %{version} AutoReqProv: No -Requires: e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, python-gtk >= 1.99.16, ocfs2-tools = %{version} +Requires: e2fsprogs +Requires: glib2 >= 2.2.3 +Requires: ocfs2-tools = %{version} +Requires: python-gtk >= 1.99.16 +Requires: vte >= 0.11.10 %description -n ocfs2console OCFS is the Oracle Cluster Filesystem. @@ -79,7 +90,10 @@ %package devel Summary: Oracle Cluster File System 2 Development files -Requires: ocfs2-tools = %{version}, libcom_err, libcom_err-devel +Group: System/Filesystems +Requires: libcom_err +Requires: libcom_err-devel +Requires: ocfs2-tools = %{version} %description devel OCFS is the Oracle Cluster File System. @@ -89,6 +103,7 @@ %package o2cb Summary: Oracle Cluster File System 2 Core Tools +Group: System/Filesystems Requires: ocfs2-tools = %{version} %description o2cb @@ -110,6 +125,7 @@ %patch202 -p1 %patch203 -p1 %patch204 -p1 +%patch205 -p1 %build export CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}" ++++++ ocfs2-tools-kernel33.patch ++++++ Index: ocfs2-tools/include/ocfs2-kernel/ocfs2_fs.h =================================================================== --- ocfs2-tools.orig/include/ocfs2-kernel/ocfs2_fs.h +++ ocfs2-tools/include/ocfs2-kernel/ocfs2_fs.h @@ -316,6 +316,9 @@ */ #define OCFS2_CLUSTER_O2CB_GLOBAL_HEARTBEAT (0x01) +// Reintroduce umode_t, which disappeared in kernel 3.3 +typedef unsigned short umode_t; + struct ocfs2_system_inode_info { char *si_name; int si_iflags; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
