File project.diff of Package ocfs2-tools

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package ocfs2-tools (Revision a0a66d62af25b14766641ca5c828299e)

Currently displaying revision a0a66d62af25b14766641ca5c828299e , Show latest

--- 0001-Use-cmap-for-getting-cluster-name.patch.orig
+++ 0001-Use-cmap-for-getting-cluster-name.patch
@@ -3,7 +3,6 @@ From: Goldwyn Rodrigues <rgoldwyn@suse.c
 Date: Sat, 21 Dec 2013 18:41:04 -0600
 Subject: [PATCH] Use cmap for getting cluster name
 
-Signed-off-by: Goldwyn Rodrigues <rgoldwyn@suse.com>
 ---
  debugfs.ocfs2/Makefile |  2 +-
  libo2cb/o2cb_abi.c     | 79 +++++++++++++++++++++++++++-----------------------
--- _service.orig
+++ _service
@@ -3,7 +3,7 @@
     <param name="url">git://oss.oracle.com/git/ocfs2-tools.git</param>
     <param name="scm">git</param>
     <param name="exclude">.git</param>
-    <param name="versionformat">1.8.2+git.%ct.%h</param>
+    <param name="versionformat">1.8.3+git.%ct.%h</param>
     <param name="revision">master</param>
   </service>
 
--- ocfs2-tools.changes.orig
+++ ocfs2-tools.changes
@@ -1,4 +1,37 @@
 -------------------------------------------------------------------
+Mon Feb  9 03:26:29 UTC 2015 - ghe@suse.com
+
+- Update ocfs2-tools.tar.bz2 to upstream v1.8.3
+- Drop patches (merged upstream):
+  - fix-indexed-dirs.patch
+  - 0001-fswreck-Create-a-loop-in-group-chains.patch
+  - 0002-Break-a-chain-loop-in-group-desc.patch
+  - restore-g_list_append.patch
+  - ocfs2console-libraries-include-aio.patch
+  - libocfs2-needs-libaio.patch
+  - libocfs2-Change-asserts-to-error.patch
+- Drop patches for ocfs2_controld
+  - force-debug.patch
+  - extra-debug.patch
+  - bug-805764-ocfs2-controld.patch
+  - bnc804707-reduce-RR-priority.patch
+  - use-symlink-in-udev-rules.patch
+
+-------------------------------------------------------------------
+Tue Feb 11 16:57:54 UTC 2014 - rgoldwyn@suse.com
+
+- Recommend ocfs2-kmp
+- Autosetup pcmk if no cluster stack found (bnc#862758)
+   + 0006-Auto-setup-pcmk-stack-as-default-if-no-stack-is-setu.patch
+- Err if cannot write to cluster_stack (cluster mismatch)
+   + 0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
+
+-------------------------------------------------------------------
+Mon Feb 10 12:32:37 UTC 2014 - rgoldwyn@suse.com
+
+- Update summary and description for the -o2cb package (bnc#862761)
+
+-------------------------------------------------------------------
 Fri Jan 31 22:21:11 UTC 2014 - rgoldwyn@suse.com
 
 - Use libcmap.so.4 for dlopen in 0001-Use-cmap-for-getting-cluster-name.patch
--- ocfs2-tools.spec.orig
+++ ocfs2-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ocfs2-tools
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 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
@@ -17,7 +17,7 @@
 
 
 Name:           ocfs2-tools
-Version:        1.8.2+git.1361836695.ff84eb5
+Version:        1.8.3+git.1418704844.65fac00
 Release:        0
 Summary:        Oracle Cluster File System 2 Core Tools
 License:        GPL-2.0+
@@ -26,8 +26,6 @@ Url:            http://oss.oracle.com/pr
 Source:         ocfs2-tools-%{version}.tar.gz
 Source1:        o2cb.ocf
 Source2:        reflink.tar.bz2
-Patch101:       force-debug.patch
-Patch102:       extra-debug.patch
 Patch103:       debug-ocfs2_hb_ctl.patch
 Patch105:       bug-470741-debug_start_failures.patch
 Patch106:       ocfs2-devel.diff
@@ -37,21 +35,12 @@ Patch202:       fix-configure-check-libs
 Patch204:       dont-use-var-lock-subsys.patch
 Patch205:       ocfs2-tools-kernel33.patch
 Patch206:       ocfs2-tools-resource.patch
-Patch207:       fix-indexed-dirs.patch
-Patch208:       0001-fswreck-Create-a-loop-in-group-chains.patch
-Patch209:       0002-Break-a-chain-loop-in-group-desc.patch
-Patch210:       restore-g_list_append.patch
-Patch212:       bug-805764-ocfs2-controld.patch
-Patch213:       bnc804707-reduce-RR-priority.patch
-Patch214:       use-symlink-in-udev-rules.patch
-Patch215:       ocfs2console-libraries-include-aio.patch
-Patch220:       libocfs2-needs-libaio.patch
-Patch221:       libocfs2-Change-asserts-to-error.patch
 Patch222:       0001-Use-cmap-for-getting-cluster-name.patch
 Patch223:       0002-Remove-controld-dependency-in-group_join-leave.patch
 Patch224:       0003-Auto-setup-cluster_stack-based-on-what-is-on-disk.patch
 Patch225:       0004-mkfs.ocfs2-Abort-if-cluster-information-is-not-detec.patch
 Patch226:       0005-mkfs-Setup-cluster_stack-if-not-setup-based-on-what-.patch
+Patch227:       0006-Auto-setup-pcmk-stack-as-default-if-no-stack-is-setu.patch
 
 BuildRequires:  autoconf
 BuildRequires:  e2fsprogs-devel
@@ -75,8 +64,7 @@ Requires:       glib2 >= 2.2.3
 Requires:       modutils
 Requires:       net-tools
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if 0%{?suse_version} < 1120
-# There's no separate kmp for openSUSE 11.2
+%if 0%{?suse_version} < 1320
 Recommends:     ocfs2-kmp
 %endif
 
@@ -130,20 +118,18 @@ This package contains the static librari
 OCFS2-aware applications.
 
 %package o2cb
-Summary:        Oracle Cluster File System 2 Core Tools
+Summary:        Oracle Cluster File System 2 tools for the native o2cb stack
 Group:          System/Filesystems
 Requires:       ocfs2-tools = %{version}
 
 %description o2cb
 OCFS is the Oracle Cluster File System.
 
-This package contains the core user-space tools needed for creating and
-managing the file system.
+This package contains the tools to manage the native o2cb stack for the
+OCFS2 filesystem.
 
 %prep
 %setup -q -a 2
-%patch101 -p1
-%patch102 -p1
 %patch103 -p1
 %patch105 -p1
 %patch106 -p1
@@ -153,21 +139,12 @@ managing the file system.
 %patch204 -p1
 %patch205 -p1
 %patch206 -p1
-%patch207 -p1
-%patch208 -p1
-%patch209 -p1
-%patch210 -p1
-%patch212 -p1
-%patch213 -p1
-%patch214 -p1
-%patch215 -p1
-%patch220 -p1
-%patch221 -p1
 %patch222 -p1
 %patch223 -p1
 %patch224 -p1
 %patch225 -p1
 %patch226 -p1
+%patch227 -p1
 
 %build
 export PROJECT="ocfs2-tools"

Places

File project.diff of Package ocfs2-tools (Revision a0a66d62af25b14766641ca5c828299e)

Places