[Ocfs2-commits] manish commits r1838 - in trunk: . vendor/redhat vendor/suse

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-01-24 16:35:54 -0600 (Mon, 24 Jan 2005)
New Revision: 1838

Modified:
   trunk/Config.make.in
   trunk/configure.in
   trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in
   trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
Log:
Depend on ocfs2-tools now, since ocfs2-support is no longer created


Modified: trunk/Config.make.in
===================================================================
--- trunk/Config.make.in	2005-01-24 21:13:37 UTC (rev 1837)
+++ trunk/Config.make.in	2005-01-24 22:35:54 UTC (rev 1838)
@@ -11,7 +11,7 @@
 MICRO_VERSION = @MICRO_VERSION@
 EXTRA_VERSION = @EXTRA_VERSION@
 
-SUPPORT_REQUIRED_VERSION = @SUPPORT_REQUIRED_VERSION@
+TOOLS_REQUIRED_VERSION = @TOOLS_REQUIRED_VERSION@
 
 SHELL = @SHELL@
 

Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-01-24 21:13:37 UTC (rev 1837)
+++ trunk/configure.in	2005-01-24 22:35:54 UTC (rev 1838)
@@ -14,7 +14,7 @@
 RPM_VERSION=1
 
 # Required version of ocfs-tools
-SUPPORT_REQUIRED_VERSION=0.99.0
+TOOLS_REQUIRED_VERSION=0.99.1
 
 DIST_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
 VERSION=$DIST_VERSION-$EXTRA_VERSION
@@ -28,7 +28,7 @@
 AC_SUBST(VERSION)
 AC_SUBST(RPM_VERSION)
 
-AC_SUBST(SUPPORT_REQUIRED_VERSION)
+AC_SUBST(TOOLS_REQUIRED_VERSION)
 
 AC_CANONICAL_HOST
 

Modified: trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in
===================================================================
--- trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in	2005-01-24 21:13:37 UTC (rev 1837)
+++ trunk/vendor/redhat/ocfs2-2.4.21-EL.spec-generic.in	2005-01-24 22:35:54 UTC (rev 1838)
@@ -38,8 +38,8 @@
 %define sver %{generic}
 %define kver %{base}-%{sver}.EL
 
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
+# The minimum tools package required for the kernel bits.
+%define tools_ver     @TOOLS_REQUIRED_VERSION@
 
 Summary: The Oracle Cluster Filesystem 2
 Name: ocfs2-%{kver}
@@ -55,7 +55,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 
@@ -72,7 +72,7 @@
 Group: System Environment/Kernel
 Provides: ocfs2 = %{version}
 Requires: kernel-smp = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 AutoReqProv: no
 
@@ -89,7 +89,7 @@
 Group: System Environment/Kernel
 Provides: ocfs2 = %{version}
 Requires: kernel-hugemem = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 AutoReqProv: no
 
@@ -106,7 +106,7 @@
 Group: System Environment/Kernel
 Provides: ocfs2 = %{version}
 Requires: kernel-debug = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 AutoReqProv: no
 

Modified: trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in
===================================================================
--- trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in	2005-01-24 21:13:37 UTC (rev 1837)
+++ trunk/vendor/suse/ocfs2-2.6.5.spec-generic.in	2005-01-24 22:35:54 UTC (rev 1838)
@@ -72,8 +72,8 @@
 %define sver		%{generic}
 %define kver		%{base}-%{sver}
 
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
+# The minimum tools package required for the kernel bits.
+%define tools_ver     @TOOLS_REQUIRED_VERSION@
 
 Summary: The Oracle Cluster Filesystem 2.
 Name: ocfs2-%{kver}
@@ -89,7 +89,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel-default = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 
@@ -107,7 +107,7 @@
 AutoReqProv: no
 Provides: ocfs2 = %{version}
 Requires: kernel-default = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description default
@@ -123,7 +123,7 @@
 AutoReqProv: no
 Provides: ocfs2 = %{version}
 Requires: kernel-smp = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description smp
@@ -139,7 +139,7 @@
 AutoReqProv: no
 Provides: ocfs2 = %{version}
 Requires: kernel-bigsmp = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description bigsmp
@@ -155,7 +155,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel-64k-pagesize = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description 64k-pagesize
@@ -171,7 +171,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel-sn2 = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description sn2
@@ -187,7 +187,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel-iseries64 = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description iseries64
@@ -203,7 +203,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel-pmac64 = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description pmac64
@@ -219,7 +219,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel-pseries64 = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description pseries64
@@ -235,7 +235,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel-s390 = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description s390
@@ -251,7 +251,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel-s390x = %{kver}
-Requires: ocfs2-support >= %{support_ver}
+Requires: ocfs2-tools >= %{tools_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description s390x