[packages/gfs] - up to 2.03.11, deprecation note - added kernel patch (fix kernel version check)

[qboosh]

commit 79cfe38772f3dabb07e2ff0d65d1e39ccc28d9fd
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue May 15 18:48:56 2018 +0200

    - up to 2.03.11, deprecation note
    - added kernel patch (fix kernel version check)

 cluster-kernel.patch | 15 +++++++++++++++
 gfs.spec             | 37 ++++++++++++++++++++++++++++++-------
 2 files changed, 45 insertions(+), 7 deletions(-)
---
diff --git a/gfs.spec b/gfs.spec
index 1dfa089..1f61ab2 100644
--- a/gfs.spec
+++ b/gfs.spec
@@ -1,18 +1,22 @@
+# NOTE: obsolete, for 3rd generation cluster see cluster.spec
 Summary:	Shared-disk cluster file system
 Summary(pl.UTF-8):	Klastrowy system plików na współdzielonym dysku
 Name:		gfs
-Version:	2.03.10
+Version:	2.03.11
 Release:	1
 Epoch:		1
 License:	GPL v2+
 Group:		Applications/System
 Source0:	ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
-# Source0-md5:	379b560096e315d4b52e238a5c72ba4a
+# Source0-md5:	712b9f583472d1de614641bc0f4a0aaf
 Patch0:		%{name}-blkid.patch
+Patch1:		cluster-kernel.patch
 URL:		http://sources.redhat.com/cluster/gfs/
 BuildRequires:	libblkid-devel >= 2.16
 BuildRequires:	ncurses-devel
 BuildRequires:	perl-base
+# some parts point to gfs2 components
+Requires:	gfs2 = %{epoch}:%{version}
 Requires:	libblkid >= 2.16
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -42,6 +46,7 @@ wszystkich innych maszynach w klastrze.
 %prep
 %setup -q -n cluster-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 ./configure \
@@ -51,7 +56,7 @@ wszystkich innych maszynach w klastrze.
 	--incdir=%{_includedir} \
 	--ncursesincdir=%{_includedir}/ncurses \
 	--libdir=%{_libdir} \
-	--libexecdir=%{_libdir} \
+	--libexecdir=%{_libexecdir} \
 	--mandir=%{_mandir} \
 	--prefix=%{_prefix} \
 	--sbindir=%{_sbindir} \
@@ -66,17 +71,35 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C %{name} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# fake for man pages links check
+touch $RPM_BUILD_ROOT%{_mandir}/man8/gfs2_edit.8
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/fsck.gfs
-%attr(755,root,root) %{_sbindir}/gfs_*
+%attr(755,root,root) %{_sbindir}/gfs_debug
+%attr(755,root,root) %{_sbindir}/gfs_fsck
+%attr(755,root,root) %{_sbindir}/gfs_grow
+%attr(755,root,root) %{_sbindir}/gfs_jadd
+%attr(755,root,root) %{_sbindir}/gfs_mkfs
+%attr(755,root,root) %{_sbindir}/gfs_quota
+%attr(755,root,root) %{_sbindir}/gfs_tool
 %attr(755,root,root) %{_sbindir}/mkfs.gfs
-%attr(755,root,root) %{_sbindir}/mount.gfs
-%attr(755,root,root) %{_sbindir}/umount.gfs
 # TODO: PLDify
 #%attr(754,root,root) /etc/rc.d/init.d/gfs
 %{_mandir}/man8/gfs.8*
-%{_mandir}/man8/gfs_*.8*
+%{_mandir}/man8/gfs_fsck.8*
+%{_mandir}/man8/gfs_grow.8*
+%{_mandir}/man8/gfs_jadd.8*
+%{_mandir}/man8/gfs_mkfs.8*
+%{_mandir}/man8/gfs_mount.8*
+%{_mandir}/man8/gfs_quota.8*
+%{_mandir}/man8/gfs_tool.8*
+# links to gfs2
+%attr(755,root,root) %{_sbindir}/gfs_edit
+%attr(755,root,root) %{_sbindir}/mount.gfs
+%attr(755,root,root) %{_sbindir}/umount.gfs
+%{_mandir}/man8/gfs_edit.8*
diff --git a/cluster-kernel.patch b/cluster-kernel.patch
new file mode 100644
index 0000000..e140656
--- /dev/null
+++ b/cluster-kernel.patch
@@ -0,0 +1,15 @@
+--- cluster-2.03.11/configure.orig	2009-01-22 13:33:51.000000000 +0100
++++ cluster-2.03.11/configure	2018-05-14 21:46:55.682776792 +0200
+@@ -270,9 +270,9 @@
+ 	return 1;
+     }
+     # checking VERSION, PATCHLEVEL and SUBLEVEL for the supplied kernel
+-    if ($build_version >= $version[0] &&
+-        $build_patchlevel >= $version[1] &&
+-        $build_sublevel >= $version[2]) {
++    if ($build_version > $version[0] || ($build_version == $version[0] &&
++        ($build_patchlevel > $version[1] || ($build_patchlevel == $version[1] &&
++        $build_sublevel >= $version[2])))) {
+       print " Current kernel version appears to be OK\n";
+       return 1;
+     } else {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gfs.git/commitdiff/79cfe38772f3dabb07e2ff0d65d1e39ccc28d9fd