[Ocfs2-commits] manish commits r1405 - in trunk: . vendor/redhat vendor/unitedlinux

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Mon Aug 30 19:10:21 CDT 2004


Author: manish
Date: 2004-08-30 19:10:20 -0500 (Mon, 30 Aug 2004)
New Revision: 1405

Removed:
   trunk/vendor/redhat/ocfs2-2.4.18-e.spec.in
   trunk/vendor/redhat/ocfs2-2.4.9-e.spec.in
   trunk/vendor/unitedlinux/ocfs2-2.4.19-4GB-SMP.spec.in
   trunk/vendor/unitedlinux/ocfs2-2.4.19-4GB.spec.in
   trunk/vendor/unitedlinux/ocfs2-2.4.19-64GB-SMP.spec.in
Modified:
   trunk/configure.in
   trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in
   trunk/vendor/unitedlinux/ocfs2-2.4.21.spec-generic.in
Log:
Update for ocfs2-support, remove spec files for obsolete kernels


Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2004-08-30 19:20:50 UTC (rev 1404)
+++ trunk/configure.in	2004-08-31 00:10:20 UTC (rev 1405)
@@ -313,11 +313,6 @@
 AC_SUBST(GCCINC)
 
 AC_OUTPUT([Config.make
-vendor/redhat/ocfs2-2.4.9-e.spec
-vendor/redhat/ocfs2-2.4.18-e.spec
 vendor/redhat/ocfs2-2.4.21-EL.spec
-vendor/unitedlinux/ocfs2-2.4.19-64GB-SMP.spec
-vendor/unitedlinux/ocfs2-2.4.19-4GB-SMP.spec
-vendor/unitedlinux/ocfs2-2.4.19-4GB.spec
 vendor/unitedlinux/ocfs2-2.4.21.spec-generic
 ])

Deleted: trunk/vendor/redhat/ocfs2-2.4.18-e.spec.in
===================================================================
--- trunk/vendor/redhat/ocfs2-2.4.18-e.spec.in	2004-08-30 19:20:50 UTC (rev 1404)
+++ trunk/vendor/redhat/ocfs2-2.4.18-e.spec.in	2004-08-31 00:10:20 UTC (rev 1405)
@@ -1,172 +0,0 @@
-#
-# Spec file for ocfs2
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-
-# Turn on's and off's (summit and debug not used but added
-# for future proofing)
-%define chicks 		1
-%define buildup		1
-%define buildsmp	1
-%define buildenterprise	0
-%define buildsummit	0
-%define builddebug	0
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define base 2.4.18-e
-%define kver %{base}.37
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 2
-Name: ocfs2-%{base}
-Version: @DIST_VERSION@
-Release: @RPM_VERSION@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: ocfs2- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/ocfs2/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: nobody <nobody at oracle.com>
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: kernel >= %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source >= %{kver}
-
-
-BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-uniprocessor kernels.
-
-%if %{buildsmp}
-%package smp
-Summary: The Oracle Cluster Filesystem Version 2 for SMP systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-smp >= %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source >= %{kver}
-AutoReqProv: no
-
-
-%description smp
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-symmetric multiprocessor kernels.
-%endif
-
-
-%if %{builddebug}
-%package debug
-Summary: The Oracle Cluster Filesystem Version 2 for debugging systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-debug >= %{kver}
-Requires: ocfs-support >= %{support_ver}
-BuildRequires: kernel-source >= %{kver}
-AutoReqProv: no
-
-
-%description debug
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-debugging kernels.
-%endif
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-# Hack to find a good source tree
-KVER=""
-if test -d "/usr/src/linux-%{kver}"; then
-    KVER="%{kver}"
-else
-    CURKVER="`uname -r | awk '{sub(/smp$|enterprise$|summit$|debug$/,"");print}'`"
-    case "$CURKVER" in
-    %{base}*)
-        if test -d "/usr/src/linux-${CURKVER}"; then
-            KVER="${CURKVER}"
-        fi
-        ;;
-    *)
-        ;;
-    esac
-fi
-
-if test -z "$KVER" ; then
-    if test -d "/usr/src/linux-2.4" ; then
-        KPATH="/usr/src/linux-2.4"
-    elif test -d "/usr/src/linux" ; then
-        KPATH="/usr/src/linux"
-    else
-        echo "No kernel tree to build from!" >&2
-        exit 1
-    fi
-else
-    KPATH="/usr/src/linux-${KVER}"
-fi
-    
-%configure --with-kernel="${KPATH}"
-cd src
-
-%if %{buildup}
-make KVER=up QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{base}-ABI/ocfs2" install 
-%endif
-
-%if %{buildsmp}
-make clean
-make KVER=smp QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{base}-smp-ABI/ocfs2" install 
-%endif
-
-%if %{builddebug}
-make clean
-make KVER=debug QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}-debug-ABI/ocfs2" install 
-%endif
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%if %{buildup}
-%post
-/etc/init.d/ocfs2 link
-
-%files
-%defattr(-,root,root)
-/lib/modules/%{base}-ABI/ocfs2
-%endif
-
-%if %{buildsmp}
-%post smp
-/etc/init.d/ocfs2 link
-
-%files smp
-%defattr(-,root,root)
-/lib/modules/%{base}-smp-ABI/ocfs2
-%endif
-
-%if %{builddebug}
-%files debug
-%defattr(-,root,root)
-/lib/modules/%{base}-debug-ABI/ocfs2
-%endif
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Modified: trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in
===================================================================
--- trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in	2004-08-30 19:20:50 UTC (rev 1404)
+++ trunk/vendor/redhat/ocfs2-2.4.21-EL.spec.in	2004-08-31 00:10:20 UTC (rev 1405)
@@ -53,7 +53,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: kernel >= %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source >= %{kver}
 
 
@@ -70,7 +70,7 @@
 Group: System Environment/Kernel
 Provides: ocfs2 = %{version}
 Requires: kernel-smp >= %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source >= %{kver}
 AutoReqProv: no
 
@@ -87,7 +87,7 @@
 Group: System Environment/Kernel
 Provides: ocfs2 = %{version}
 Requires: kernel-hugemem >= %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source >= %{kver}
 AutoReqProv: no
 
@@ -104,7 +104,7 @@
 Group: System Environment/Kernel
 Provides: ocfs2 = %{version}
 Requires: kernel-debug >= %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source >= %{kver}
 AutoReqProv: no
 

Deleted: trunk/vendor/redhat/ocfs2-2.4.9-e.spec.in
===================================================================
--- trunk/vendor/redhat/ocfs2-2.4.9-e.spec.in	2004-08-30 19:20:50 UTC (rev 1404)
+++ trunk/vendor/redhat/ocfs2-2.4.9-e.spec.in	2004-08-31 00:10:20 UTC (rev 1405)
@@ -1,210 +0,0 @@
-#
-# Spec file for ocfs2
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-
-# Turn on's and off's (summit and debug not used but added
-# for future proofing)
-%define chicks 		1
-%define buildup		1
-%define buildsmp	1
-%define buildenterprise	1
-%define buildsummit	1
-%define builddebug	0
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define base 2.4.9-e
-%define kver %{base}.25
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 2
-Name: ocfs2-%{base}
-Version: @DIST_VERSION@
-Release: @RPM_VERSION@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: ocfs2- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/ocfs2/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: nobody <nobody at oracle.com>
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-Requires: kernel >= %{kver}
-Requires: ocfs-support >= %{support_ver}
-#Obsoletes: 
-BuildRequires: kernel-source >= %{kver}
-
-
-BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-uniprocessor kernels.
-
-%if %{buildsmp}
-%package smp
-Summary: The Oracle Cluster Filesystem Version 2 for SMP systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-smp >= %{kver}
-Requires: ocfs-support >= %{support_ver}
-#Obsoletes: 
-BuildRequires: kernel-source >= %{kver}
-AutoReqProv: no
-
-
-%description smp
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildenterprise}
-%package enterprise
-Summary: The Oracle Cluster Filesystem Version 2 for enterprise systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-enterprise >= %{kver}
-Requires: ocfs-support >= %{support_ver}
-#Obsoletes: 
-BuildRequires: kernel-source >= %{kver}
-AutoReqProv: no
-
-
-%description enterprise
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-symmetric processor kernels on machines with more than 4GB of RAM.
-%endif
-
-
-%if %{buildsummit}
-%package summit
-Summary: The Oracle Cluster Filesystem Version 2 for summit based systems.
-Group: System Environment/Kernel
-Provides: ocfs2 = %{version}
-Requires: kernel-summit >= %{kver}
-Requires: ocfs-support >= %{support_ver}
-#Obsoletes: 
-BuildRequires: kernel-source >= %{kver}
-AutoReqProv: no
-
-
-%description summit
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-summit based symmetric processor kernels e.g. IBM's x440.
-%endif
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-# Hack to find a good source tree
-KVER=""
-if test -d "/usr/src/linux-%{kver}"; then
-    KVER="%{kver}"
-else
-    echo "No %{kver} kernel tree to build from!" >&2
-    exit 1
-fi
-
-KPATH="/usr/src/linux-${KVER}"
-    
-%configure --with-kernel="${KPATH}" --enable-aio=no
-cd src
-
-%if %{buildup}
-make clean
-make KVER=up QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{base}-ABI/ocfs2" install 
-%endif
-
-%if %{buildsmp}
-make clean
-make KVER=smp QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{base}-smp-ABI/ocfs2" install 
-%endif
-
-%if %{buildenterprise}
-make clean
-make KVER=ent QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{base}-enterprise-ABI/ocfs2" install 
-%endif
-
-%if %{buildsummit}
-cd ..
-# Now to find a summit source tree
-KVER=""
-if test -d "/usr/src/linux-%{kver}summit"; then
-    KVER="%{kver}summit"
-else
-    echo "No %{kver} summit tree to build from!" >&2
-    exit 1
-fi
-
-KPATH="/usr/src/linux-${KVER}"
-    
-%configure --with-kernel="${KPATH}" --enable-aio=no
-cd src
-
-make clean
-make KVER=summit QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{base}-summit-ABI/ocfs2" install 
-%endif
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%if %{buildup}
-%post
-/etc/init.d/ocfs2 link
-
-%files
-%defattr(-,root,root)
-/lib/modules/%{base}-ABI/ocfs2
-%endif
-
-
-%if %{buildsmp}
-%post smp
-/etc/init.d/ocfs2 link
-
-%files smp
-%defattr(-,root,root)
-/lib/modules/%{base}-smp-ABI/ocfs2
-%endif
-
-
-%if %{buildenterprise}
-%post enterprise
-/etc/init.d/ocfs2 link
-
-%files enterprise
-%defattr(-,root,root)
-/lib/modules/%{base}-enterprise-ABI/ocfs2
-%endif
-
-%if %{buildsummit}
-%post summit
-/etc/init.d/ocfs2 link
-
-%files summit
-%defattr(-,root,root)
-/lib/modules/%{base}-summit-ABI/ocfs2
-%endif
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Deleted: trunk/vendor/unitedlinux/ocfs2-2.4.19-4GB-SMP.spec.in
===================================================================
--- trunk/vendor/unitedlinux/ocfs2-2.4.19-4GB-SMP.spec.in	2004-08-30 19:20:50 UTC (rev 1404)
+++ trunk/vendor/unitedlinux/ocfs2-2.4.19-4GB-SMP.spec.in	2004-08-31 00:10:20 UTC (rev 1405)
@@ -1,96 +0,0 @@
-#
-# Spec file for ocfs
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define kver 2.4.19-4GB-SMP
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 2
-Name: ocfs2-%{kver}
-Version: @DIST_VERSION@
-Release: @RPM_VERSION@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: ocfs2- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/ocfs2/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: nobody <nobody at oracle.com>
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-# Requires: kernel >= %{kver}  -- silly UL nodeps
-Requires: k_psmp = 2.4.19-304
-Requires: ocfs-support >= %{support_ver}
-# BuildRequires: kernel-source >= %{kver}  -- silly UL nodeps
-
-
-BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-the United Linux SMP kernel.
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-# Hack to find a good source tree
-KVER=""
-if test -d "/usr/src/linux-%{kver}"; then
-    KVER="%{kver}"
-else
-    CURKVER="`uname -r | awk '{sub(/smp$|enterprise$|summit$|debug$/,"");print}'`"
-    case "$CURKVER" in
-    %{kver}*)
-        if test -d "/usr/src/linux-${CURKVER}"; then
-            KVER="${CURKVER}"
-        fi
-        ;;
-    *)
-        ;;
-    esac
-fi
-
-if test -z "$KVER" ; then
-    if test -d "/usr/src/linux-2.4" ; then
-        KPATH="/usr/src/linux-2.4"
-    elif test -d "/usr/src/linux" ; then
-        KPATH="/usr/src/linux"
-    else
-        echo "No kernel tree to build from!" >&2
-        exit 1
-    fi
-else
-    KPATH="/usr/src/linux-${KVER}"
-fi
-    
-%configure --with-kernel="${KPATH}"
-cd src
-
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}/kernel/drivers/addon/ocfs2" install 
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%files
-%defattr(-,root,root)
-/lib/modules/%{kver}/kernel/drivers/addon/ocfs2
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Deleted: trunk/vendor/unitedlinux/ocfs2-2.4.19-4GB.spec.in
===================================================================
--- trunk/vendor/unitedlinux/ocfs2-2.4.19-4GB.spec.in	2004-08-30 19:20:50 UTC (rev 1404)
+++ trunk/vendor/unitedlinux/ocfs2-2.4.19-4GB.spec.in	2004-08-31 00:10:20 UTC (rev 1405)
@@ -1,91 +0,0 @@
-#
-# Spec file for ocfs2
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define kver 2.4.19-4GB
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 2
-Name: ocfs2-%{kver}
-Version: @DIST_VERSION@
-Release: @RPM_VERSION@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: ocfs2- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/ocfs2/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: nobody <nobody at oracle.com>
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-# Requires: kernel >= %{kver}  -- silly UL nodeps
-Requires: k_deflt = 2.4.19-304
-Requires: ocfs-support >= %{support_ver}
-# BuildRequires: kernel-source >= %{kver}  -- silly UL nodeps
-
-
-BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-the United Linux SMP kernel.
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-# Hack to find a good source tree
-KVER=""
-if test -d "/usr/src/linux-%{kver}"; then
-    KVER="%{kver}"
-else
-    CURKVER="`uname -r | awk '{sub(/smp$|enterprise$|summit$|debug$/,"");print}'`"
-    case "$CURKVER" in
-    %{kver}*)
-        if test -d "/usr/src/linux-${CURKVER}"; then
-            KVER="${CURKVER}"
-        fi
-        ;;
-    *)
-        ;;
-    esac
-fi
-
-if test -z "$KVER" ; then
-    if test -d "/usr/src/linux-2.4" ; then
-        KPATH="/usr/src/linux-2.4"
-    elif test -d "/usr/src/linux" ; then
-        KPATH="/usr/src/linux"
-    else
-        echo "No kernel tree to build from!" >&2
-        exit 1
-    fi
-else
-    KPATH="/usr/src/linux-${KVER}"
-fi
-    
-%configure --with-kernel="${KPATH}"
-cd src
-
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}/kernel/drivers/addon/ocfs2" install 
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Deleted: trunk/vendor/unitedlinux/ocfs2-2.4.19-64GB-SMP.spec.in
===================================================================
--- trunk/vendor/unitedlinux/ocfs2-2.4.19-64GB-SMP.spec.in	2004-08-30 19:20:50 UTC (rev 1404)
+++ trunk/vendor/unitedlinux/ocfs2-2.4.19-64GB-SMP.spec.in	2004-08-31 00:10:20 UTC (rev 1405)
@@ -1,96 +0,0 @@
-#
-# Spec file for ocfs2
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define kver 2.4.19-64GB-SMP
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     @SUPPORT_REQUIRED_VERSION@
-
-Summary: The Oracle Cluster Filesystem Version 2
-Name: ocfs2-%{kver}
-Version: @DIST_VERSION@
-Release: @RPM_VERSION@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: ocfs2- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/ocfs2/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: nobody <nobody at oracle.com>
-Provides: ocfs2 = %{version}
-AutoReqProv: no
-# Requires: kernel >= %{kver}  -- silly UL nodeps
-Requires: k_smp = 2.4.19-304
-Requires: ocfs-support >= %{support_ver}
-# BuildRequires: kernel-source >= %{kver}  -- silly UL nodeps
-
-
-BuildRoot: %{_tmppath}/ocfs2-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-OCFS2 is the Oracle Cluster Filesystem Version 2.  This package is compiled for
-the United Linux SMP kernel.
-
-
-%prep
-%setup -n ocfs2-%{version}
-
-
-%build
-# Hack to find a good source tree
-KVER=""
-if test -d "/usr/src/linux-%{kver}"; then
-    KVER="%{kver}"
-else
-    CURKVER="`uname -r | awk '{sub(/smp$|enterprise$|summit$|debug$/,"");print}'`"
-    case "$CURKVER" in
-    %{kver}*)
-        if test -d "/usr/src/linux-${CURKVER}"; then
-            KVER="${CURKVER}"
-        fi
-        ;;
-    *)
-        ;;
-    esac
-fi
-
-if test -z "$KVER" ; then
-    if test -d "/usr/src/linux-2.4" ; then
-        KPATH="/usr/src/linux-2.4"
-    elif test -d "/usr/src/linux" ; then
-        KPATH="/usr/src/linux"
-    else
-        echo "No kernel tree to build from!" >&2
-        exit 1
-    fi
-else
-    KPATH="/usr/src/linux-${KVER}"
-fi
-    
-%configure --with-kernel="${KPATH}"
-cd src
-
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" MODULEDIR="/lib/modules/%{kver}/kernel/drivers/addon/ocfs2" install 
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-%files
-%defattr(-,root,root)
-/lib/modules/%{kver}/kernel/drivers/addon/ocfs2
-
-
-%changelog
-* Wed Jan 28 2004 Manish Singh <manish.singh at oracle.com>
-- Initial rpm spec file

Modified: trunk/vendor/unitedlinux/ocfs2-2.4.21.spec-generic.in
===================================================================
--- trunk/vendor/unitedlinux/ocfs2-2.4.21.spec-generic.in	2004-08-30 19:20:50 UTC (rev 1404)
+++ trunk/vendor/unitedlinux/ocfs2-2.4.21.spec-generic.in	2004-08-31 00:10:20 UTC (rev 1405)
@@ -54,7 +54,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: k_deflt = %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source = %{kver}
 
 
@@ -72,7 +72,7 @@
 AutoReqProv: no
 Provides: ocfs2 = %{version}
 Requires: k_deflt = %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description deflt
@@ -88,7 +88,7 @@
 AutoReqProv: no
 Provides: ocfs2 = %{version}
 Requires: k_smp = %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description smp
@@ -104,7 +104,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: k_psmp = %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description psmp
@@ -120,7 +120,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: k_numa = %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description numa
@@ -136,7 +136,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: k_itanium2 = %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description itanium2
@@ -152,7 +152,7 @@
 Provides: ocfs2 = %{version}
 AutoReqProv: no
 Requires: k_itanium2-smp = %{kver}
-Requires: ocfs-support >= %{support_ver}
+Requires: ocfs2-support >= %{support_ver}
 BuildRequires: kernel-source = %{kver}
 
 %description itanium2-smp



More information about the Ocfs2-commits mailing list