OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocfs2-tools?expand=0&rev=3

ocfs2-tools-1.2.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c0012b1deaad4087823e3907ba6b3d7bee937b6a130c2fa922de762c2101752f
-size 384975

ocfs2-tools-1.2.7-tunefs-path.diff

@@ -0,0 +1,37 @@
+--- a/configure.in	2007-09-29 02:09:07.000000000 +0200
++++ b/configure.in	2007-12-10 21:02:04.186948000 +0100
+@@ -59,11 +59,13 @@ AC_ARG_WITH([root-prefix], [  --with-roo
+ 
+ root_bindir='${root_prefix}/bin'
+ root_sbindir='${root_prefix}/sbin'
++root_usr_sbindir='${root_prefix}/usr/sbin'
+ root_sysconfdir='${root_prefix}/etc'
+ 
+ AC_SUBST(root_prefix)
+ AC_SUBST(root_bindir)
+ AC_SUBST(root_sbindir)
++AC_SUBST(root_usr_sbindir)
+ AC_SUBST(root_sysconfdir)
+ 
+ AC_MSG_CHECKING(for debugging)
+--- a/tunefs.ocfs2/Makefile	2007-09-29 01:53:00.000000000 +0200
++++ b/tunefs.ocfs2/Makefile	2007-12-10 21:03:07.820253000 +0100
+@@ -22,7 +22,7 @@ LIBO2DLM_DEPS = $(TOPDIR)/libo2dlm/libo2
+ LIBO2CB_LIBS = -L$(TOPDIR)/libo2cb -lo2cb
+ LIBO2CB_DEPS = $(TOPDIR)/libo2cb/libo2cb.a
+ 
+-sbindir = $(root_sbindir)
++sbindir = $(root_usr_sbindir)
+ SBIN_PROGRAMS = tunefs.ocfs2
+ 
+ INCLUDES = -I$(TOPDIR)/libocfs2/include -I$(TOPDIR)/libo2dlm/include -I$(TOPDIR)/libo2cb/include -I.
+--- a/Config.make.in.orig	2007-12-10 10:49:04.000000000 -0500
++++ b/Config.make.in	2007-12-10 10:49:18.000000000 -0500
+@@ -24,6 +24,7 @@
+ root_prefix = @root_prefix@
+ root_bindir = @root_bindir@
+ root_sbindir = @root_sbindir@
++root_usr_sbindir = @root_usr_sbindir@
+ root_sysconfdir = @root_sysconfdir@
+ 
+ pyexecdir = @pyexecdir@

ocfs2-tools-1.2.7.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fc70d557423dda788a58b0144747ed792d9df7fedee9876a9dc6be5987a188b0
+size 378472

ocfs2-tools-o_creat-mode.diff

@@ -0,0 +1,11 @@
+--- a/libocfs2/ismounted.c	2007-11-14 18:54:19.000000000 -0500
++++ b/libocfs2/ismounted.c	2008-01-14 10:29:14.000000000 -0500
+@@ -153,7 +153,7 @@
+ is_root:
+ #define TEST_FILE "/.ismount-test-file"		
+ 		*mount_flags |= OCFS2_MF_ISROOT;
+-		fd = open(TEST_FILE, O_RDWR|O_CREAT);
++		fd = open(TEST_FILE, O_RDWR|O_CREAT, 0600);
+ 		if (fd < 0) {
+ 			if (errno == EROFS)
+ 				*mount_flags |= OCFS2_MF_READONLY;

ocfs2-tools.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Mon Jan 14 22:13:41 CET 2008 - jeffm@suse.com
+
+- Update to 1.2.7
+  - Add shrinking journal size support
+  - Fix crash in slotmap
+  - Don't append _netdev for local mounts
+  - Add query support for tunefs
+  - Add remove slot features to tunefs
+
 -------------------------------------------------------------------
 Tue Aug  7 16:55:30 CEST 2007 - jeffm@suse.com
 

ocfs2-tools.spec

@@ -1,7 +1,7 @@
 #
-# spec file for package ocfs2-tools (Version 1.2.6)
+# spec file for package ocfs2-tools (Version 1.2.7)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,7 +13,7 @@
 Name:           ocfs2-tools
 BuildRequires:  e2fsprogs-devel glib2-devel python-devel python-gtk-devel readline-devel update-desktop-files
 Summary:        Oracle Cluster File System 2 Core Tools
-Version:        1.2.6
+Version:        1.2.7
 Release:        1
 License:        GPL v2 or later
 Group:          System/Filesystems
@@ -23,10 +23,12 @@ Patch1:         blkid.m4.diff
 Patch2:         offsetof.diff
 Patch3:         ocfs2-tools-1.2.2.diff
 Patch4:         ocfs2-tools-offsetof.diff
-URL:            http://oss.oracle.com/projects/ocfs2-tools/
+Patch5:         ocfs2-tools-o_creat-mode.diff
+Patch6:         ocfs2-tools-1.2.7-tunefs-path.diff
+Url:            http://oss.oracle.com/projects/ocfs2-tools/
 Requires:       coreutils, net-tools, modutils, e2fsprogs, /sbin/chkconfig, glib2 >= 2.2.3
 PreReq:         %insserv_prereq %fillup_prereq
-AutoReqProv: on
+AutoReqProv:    on
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -46,7 +48,7 @@ Summary:        Oracle Cluster Filesystem 2 GUI tools
 Group:          System/Filesystems
 Obsoletes:      ocfs2-support
 Requires:       ocfs2-tools = %{version}
-AutoReqProv: No
+AutoReqProv:    No
 Requires:       e2fsprogs, glib2 >= 2.2.3, vte >= 0.11.10, python-gtk >= 1.99.16, ocfs2-tools = %{version}
 %{py_requires}
 
@@ -85,6 +87,8 @@ Authors:
 %patch2
 %patch3 -p1
 %patch4 -p0
+%patch5 -p1
+%patch6 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}
@@ -136,7 +140,7 @@ fi
 /sbin/fsck.ocfs2
 /sbin/mkfs.ocfs2
 /sbin/mounted.ocfs2
-/sbin/tunefs.ocfs2
+/usr/sbin/tunefs.ocfs2
 /sbin/o2cb_ctl
 /sbin/mount.ocfs2
 /sbin/ocfs2_hb_ctl
@@ -179,6 +183,13 @@ fi
 %{_libdir}/pkgconfig/ocfs2.pc
 
 %changelog
+* Mon Jan 14 2008 - jeffm@suse.com
+- Update to 1.2.7
+  - Add shrinking journal size support
+  - Fix crash in slotmap
+  - Don't append _netdev for local mounts
+  - Add query support for tunefs
+  - Add remove slot features to tunefs
 * Tue Aug 07 2007 - jeffm@suse.com
 - Update to 1.2.6
   - Support for file attributes field