- up to 2.03.11, deprecation note

- added kernel patch (fix kernel version check)

diff --git a/cluster-kernel.patch b/cluster-kernel.patch
new file mode 100644 (file)
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 {

diff --git a/cman.spec b/cman.spec
index bdddd5011d6063ec94fa27913635fb35b5dbb019..e89b63f34d10c13896ccb72ae3cbbbdccad582ef 100644 (file)
--- a/cman.spec
+++ b/cman.spec
@@ -1,3 +1,4 @@
+# NOTE: obsoleted by -cman subpackages from cluster.spec (3.x)

 #
 # Conditional build:
 %bcond_with    libonly         # build package only with lib (needed bootstrap with ccs)
 #
 # Conditional build:
 %bcond_with    libonly         # build package only with lib (needed bootstrap with ccs)


@@ -5,18 +6,19 @@
 Summary:       General-purpose symmetric cluster manager
 Summary(pl.UTF-8):     Zarządca symetrycznych klastrów ogólnego przeznaczenia
 Name:          cman
 Summary:       General-purpose symmetric cluster manager
 Summary(pl.UTF-8):     Zarządca symetrycznych klastrów ogólnego przeznaczenia
 Name:          cman

-Version:       2.03.10
-Release:       2
+Version:       2.03.11
+Release:       1

 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz
 License:       GPL v2
 Group:         Applications/System
 Source0:       ftp://sources.redhat.com/pub/cluster/releases/cluster-%{version}.tar.gz

-# Source0-md5: 379b560096e315d4b52e238a5c72ba4a
+# Source0-md5: 712b9f583472d1de614641bc0f4a0aaf

 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig

+Patch0:                cluster-kernel.patch

 URL:           http://sources.redhat.com/cluster/cman/
 %{!?with_libonly:BuildRequires:        ccs-devel >= 2.03.10}
 BuildRequires: ncurses-devel
 URL:           http://sources.redhat.com/cluster/cman/
 %{!?with_libonly:BuildRequires:        ccs-devel >= 2.03.10}
 BuildRequires: ncurses-devel

-BuildRequires: openais-devel < 1.0
+%{!?with_libonly:BuildRequires:        openais-devel < 1.0}

 BuildRequires: perl-base
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 BuildRequires: perl-base
 Requires:      %{name}-libs = %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -94,6 +96,7 @@ Biblioteka statyczna CMAN.
 
 %prep
 %setup -q -n cluster-%{version}
 
 %prep
 %setup -q -n cluster-%{version}

+%patch0 -p1

 
 # there are warnings caused by some unused variables
 %{__sed} -i -e 's/-Werror //' %{name}/qdisk/Makefile
 
 # there are warnings caused by some unused variables
 %{__sed} -i -e 's/-Werror //' %{name}/qdisk/Makefile