[Oracleasm-commits] jlbec commits r323 - in trunk: . vendor/rhel4 vendor/sles9

svn-commits at oss.oracle.com svn-commits at oss.oracle.com
Mon Nov 21 22:54:58 CST 2005


Author: jlbec
Date: 2005-11-21 22:54:56 -0600 (Mon, 21 Nov 2005)
New Revision: 323

Added:
   trunk/vendor/rhel4/oracleasm.spec-generic.in
   trunk/vendor/sles9/oracleasm.spec-generic.in
Removed:
   trunk/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic.in
   trunk/vendor/sles9/oracleasm-2.6.5.spec-generic.in
Modified:
   trunk/configure.in
   trunk/vendor/rhel4/Makefile
   trunk/vendor/rhel4/Vendor.make
   trunk/vendor/sles9/
   trunk/vendor/sles9/Makefile
   trunk/vendor/sles9/Vendor.make
Log:

o Change the magic rpm make targets to take full kernel versions.  This
  is in preparation for detected targets



Modified: trunk/configure.in
===================================================================
--- trunk/configure.in	2005-11-22 03:24:52 UTC (rev 322)
+++ trunk/configure.in	2005-11-22 04:54:56 UTC (rev 323)
@@ -166,6 +166,6 @@
 AC_OUTPUT([Config.make
 include/linux/asm_module_version.h
 vendor/common/oracleasm-support.spec-generic
-vendor/sles9/oracleasm-2.6.5.spec-generic
-vendor/rhel4/oracleasm-2.6.9-EL.spec-generic
+vendor/sles9/oracleasm.spec-generic
+vendor/rhel4/oracleasm.spec-generic
 ])

Modified: trunk/vendor/rhel4/Makefile
===================================================================
--- trunk/vendor/rhel4/Makefile	2005-11-22 03:24:52 UTC (rev 322)
+++ trunk/vendor/rhel4/Makefile	2005-11-22 04:54:56 UTC (rev 323)
@@ -2,11 +2,11 @@
 
 include $(TOPDIR)/Preamble.make
 
-DIST_FILES = 					\
-	oracleasm-2.6.9-EL.spec-generic.in	\
-	kernel.guess				\
-	rpmarch.guess				\
-	Vendor.make				\
+DIST_FILES = 				\
+	oracleasm.spec-generic.in	\
+	kernel.guess			\
+	rpmarch.guess			\
+	Vendor.make			\
 	vendor.guess
 
 include $(TOPDIR)/Postamble.make

Modified: trunk/vendor/rhel4/Vendor.make
===================================================================
--- trunk/vendor/rhel4/Vendor.make	2005-11-22 03:24:52 UTC (rev 322)
+++ trunk/vendor/rhel4/Vendor.make	2005-11-22 04:54:56 UTC (rev 323)
@@ -5,17 +5,17 @@
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess tools $(TOPDIR))
 MODULEARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess module $(TOPDIR))
 
-$(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-%.spec: $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic
+$(TOPDIR)/vendor/rhel4/oracleasm-%.spec: $(TOPDIR)/vendor/rhel4/oracleasm.spec-generic
 	SPECVER="$@"; \
-		SPECVER="$${SPECVER#*oracleasm-2.6.9-}"; \
-		SPECVER="$${SPECVER%.EL.spec}"; \
-		sed -e 's/@@SVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
+		SPECVER="$${SPECVER#*oracleasm-}"; \
+		SPECVER="$${SPECVER%.spec}"; \
+		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
 
-rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-%.EL.spec
-	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-2.6.9-$(patsubst rhel4_%_srpm,%,$@).EL.spec
+rhel4_%_srpm: dist $(TOPDIR)/vendor/rhel4/oracleasm-%.spec
+	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-$(patsubst rhel4_%_srpm,%,$@).spec
 
 rhel4_%_rpm: rhel4_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "oracleasm-2.6.9-$(patsubst rhel4_%_rpm,%,$@).EL-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst rhel4_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
 
 
 include $(TOPDIR)/vendor/common/Vendor.make

Deleted: trunk/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic.in
===================================================================
--- trunk/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic.in	2005-11-22 03:24:52 UTC (rev 322)
+++ trunk/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic.in	2005-11-22 04:54:56 UTC (rev 323)
@@ -1,253 +0,0 @@
-#
-# Spec file for oracleasm
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-# Because RPM is dumb
-%define _unpackaged_files_terminate_build 0
-
-# Turn on's and off's
-%define buildup		1
-%define buildsmp	0
-%define buildhugemem	0
-
-%ifarch i686
-%define karch		i686
-%define buildsmp	1
-%define buildhugemem	1
-%endif
-
-%ifarch x86_64
-%define karch		x86_64
-%define buildsmp	1
-%endif
-
-%ifarch ia32e
-%define karch		ia32e
-%endif
-
-%ifarch ia64
-%define karch		ia64
-%endif
-
-%ifarch ppc64
-%define karch		ppc64
-%endif
-
-%ifarch s390x
-%define karch		s390x
-%endif
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define base		2.6.9
-%define sver		@@SVER@@
-%define kver		%{base}-%{sver}.EL
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     2.0.0
-# Minimum oracleasmlib version that supports positive ASM_ERR_NODEV.
-%define min_enodev	2.0.1
-
-Summary: The Oracle Automatic Storage Management library driver.
-Name: oracleasm-%{kver}
-Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: oracleasm- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/oracleasm/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: Joel Becker <joel.becker at oracle.com>
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-devel = %{kver}
-
-
-BuildRoot: %{_tmppath}/oracleasm-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for the default kernel.
-
-%if %{buildsmp}
-%package -n oracleasm-%{kver}smp
-Summary: The Oracle Automatic Storage Management library driver for SMP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: oracleasm = %{version}
-Requires: kernel-smp = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-smp-devel = %{kver}
-
-%description -n oracleasm-%{kver}smp
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildhugemem}
-%package -n oracleasm-%{kver}hugemem
-Summary: The Oracle Automatic Storage Management library driver for NUMA systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-hugemem = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-hugemem-devel = %{kver}
-
-%description -n oracleasm-%{kver}hugemem
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for large memory SMP kernels.
-%endif
-
-
-
-%prep
-%setup -n oracleasm-%{version}
-
-
-%build
-
-local_configure()
-{
-	./configure					\
-		--prefix=%{_prefix}			\
-		--exec-prefix=%{_exec_prefix}		\
-		--bindir=%{_bindir}			\
-		--sbindir=%{_sbindir}			\
-		--sysconfdir=%{_sysconfdir}		\
-		--datadir=%{_datadir}			\
-		--includedir=%{_includedir}		\
-		--libdir=%{_libdir}			\
-		--libexecdir=%{_libexecdir}		\
-		--localstatedir=%{_localstatedir}	\
-		--sharedstatedir=%{_sharedstatedir}	\
-		--mandir=%{_mandir}			\
-		--infodir=%{_infodir}			\
-		--with-vendor=rhel4			\
-		--with-vendorkernel="$1"
-}
-
-%if %{buildup}
-local_configure "%{kver}"
-
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildsmp}
-local_configure "%{kver}smp"
-
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}smp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}smp/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildhugemem}
-local_configure "%{kver}hugemem"
-
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}hugemem/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}hugemem/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-
-%install
-
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-
-%if %{buildup}
-%post -n oracleasm-%{kver}
-depmod -ae %{kver}
-
-%files -n oracleasm-%{kver}
-%defattr(-,root,root)
-/lib/modules/%{kver}/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildsmp}
-%post -n oracleasm-%{kver}smp
-depmod -ae %{kver}smp
-
-%files -n oracleasm-%{kver}smp
-%defattr(-,root,root)
-/lib/modules/%{kver}smp/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildhugemem}
-%post -n oracleasm-%{kver}hugemem
-depmod -ae %{kver}hugemem
-
-%files -n oracleasm-%{kver}hugemem
-%defattr(-,root,root)
-/lib/modules/%{kver}hugemem/kernel/drivers/addon/oracleasm
-%endif
-
-
-%changelog
-* Fri Feb 04 2005 Joel Becker <joel.becker at oracle.com>
-- Make RHEL4 specfile.
-
-* Tue Sep 21 2004 Joel Becker <joel.becker at oracle.com>
-- Make SLES9 specfile.
-
-* Tue Jan 13 2004 Joel Becker <joel.becker at oracle.com>
-- Make kernel-only.
-
-* Thu Nov 20 2003 Joel Becker <joel.becker at oracle.com>
-- Add x86 and ia64 targets.
-
-* Wed Nov 19 2003 Joel Becker <joel.becker at oracle.com>
-- Make the UL SP3 changes.
-
-* Wed Nov 12 2003 Joel Becker <joel.becker at oracle.com>
-- Start the ASM rename.
-
-* Thu Oct 30 2003 Joel Becker <joel.becker at oracle.com>
-- Created EL3 version
-
-* Mon Jun 23 2003 Joel Becker <joel.becker at oracle.com>
-- Added osm-lib bits
-
-* Fri Jun 20 2003 Joel Becker <joel.becker at oracle.com>
-- Initial RPM
-

Copied: trunk/vendor/rhel4/oracleasm.spec-generic.in (from rev 320, trunk/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic.in)
===================================================================
--- trunk/vendor/rhel4/oracleasm-2.6.9-EL.spec-generic.in	2005-11-22 01:44:10 UTC (rev 320)
+++ trunk/vendor/rhel4/oracleasm.spec-generic.in	2005-11-22 04:54:56 UTC (rev 323)
@@ -0,0 +1,251 @@
+#
+# Spec file for oracleasm
+#
+
+# Macros
+# This one is hardcoded because, well, it belongs there
+%define _prefix /usr
+# Because RPM is dumb
+%define _unpackaged_files_terminate_build 0
+
+# Turn on's and off's
+%define buildup		1
+%define buildsmp	0
+%define buildhugemem	0
+
+%ifarch i686
+%define karch		i686
+%define buildsmp	1
+%define buildhugemem	1
+%endif
+
+%ifarch x86_64
+%define karch		x86_64
+%define buildsmp	1
+%endif
+
+%ifarch ia32e
+%define karch		ia32e
+%endif
+
+%ifarch ia64
+%define karch		ia64
+%endif
+
+%ifarch ppc64
+%define karch		ppc64
+%endif
+
+%ifarch s390x
+%define karch		s390x
+%endif
+
+
+# This must be changed to the minimum ABI compat kernel version expected
+%define kver		@@KVER@@
+
+# The minimum -support package required for the kernel bits.
+%define support_ver     2.0.0
+# Minimum oracleasmlib version that supports positive ASM_ERR_NODEV.
+%define min_enodev	2.0.1
+
+Summary: The Oracle Automatic Storage Management library driver.
+Name: oracleasm-%{kver}
+Version: @DIST_VERSION@
+Release: @@PKG_VERSION@@
+Copyright: GPL
+Group: System Environment/Kernel
+Source: oracleasm- at DIST_VERSION@.tar.gz
+URL: http://oss.oracle.com/projects/oracleasm/
+Distribution: Oracle
+Vendor: Oracle Corporation
+Packager: Joel Becker <joel.becker at oracle.com>
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-devel = %{kver}
+
+
+BuildRoot: %{_tmppath}/oracleasm-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
+
+
+%description
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for the default kernel.
+
+%if %{buildsmp}
+%package -n oracleasm-%{kver}smp
+Summary: The Oracle Automatic Storage Management library driver for SMP systems.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: oracleasm = %{version}
+Requires: kernel-smp = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-smp-devel = %{kver}
+
+%description -n oracleasm-%{kver}smp
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for symmetric multiprocessor kernels.
+%endif
+
+
+%if %{buildhugemem}
+%package -n oracleasm-%{kver}hugemem
+Summary: The Oracle Automatic Storage Management library driver for NUMA systems.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-hugemem = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-hugemem-devel = %{kver}
+
+%description -n oracleasm-%{kver}hugemem
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for large memory SMP kernels.
+%endif
+
+
+
+%prep
+%setup -n oracleasm-%{version}
+
+
+%build
+
+local_configure()
+{
+	./configure					\
+		--prefix=%{_prefix}			\
+		--exec-prefix=%{_exec_prefix}		\
+		--bindir=%{_bindir}			\
+		--sbindir=%{_sbindir}			\
+		--sysconfdir=%{_sysconfdir}		\
+		--datadir=%{_datadir}			\
+		--includedir=%{_includedir}		\
+		--libdir=%{_libdir}			\
+		--libexecdir=%{_libexecdir}		\
+		--localstatedir=%{_localstatedir}	\
+		--sharedstatedir=%{_sharedstatedir}	\
+		--mandir=%{_mandir}			\
+		--infodir=%{_infodir}			\
+		--with-vendor=rhel4			\
+		--with-vendorkernel="$1"
+}
+
+%if %{buildup}
+local_configure "%{kver}"
+
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{buildsmp}
+local_configure "%{kver}smp"
+
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}smp/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}smp/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{buildhugemem}
+local_configure "%{kver}hugemem"
+
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}hugemem/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}hugemem/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+
+%install
+
+
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+
+
+%if %{buildup}
+%post -n oracleasm-%{kver}
+depmod -ae %{kver}
+
+%files -n oracleasm-%{kver}
+%defattr(-,root,root)
+/lib/modules/%{kver}/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{buildsmp}
+%post -n oracleasm-%{kver}smp
+depmod -ae %{kver}smp
+
+%files -n oracleasm-%{kver}smp
+%defattr(-,root,root)
+/lib/modules/%{kver}smp/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{buildhugemem}
+%post -n oracleasm-%{kver}hugemem
+depmod -ae %{kver}hugemem
+
+%files -n oracleasm-%{kver}hugemem
+%defattr(-,root,root)
+/lib/modules/%{kver}hugemem/kernel/drivers/addon/oracleasm
+%endif
+
+
+%changelog
+* Fri Feb 04 2005 Joel Becker <joel.becker at oracle.com>
+- Make RHEL4 specfile.
+
+* Tue Sep 21 2004 Joel Becker <joel.becker at oracle.com>
+- Make SLES9 specfile.
+
+* Tue Jan 13 2004 Joel Becker <joel.becker at oracle.com>
+- Make kernel-only.
+
+* Thu Nov 20 2003 Joel Becker <joel.becker at oracle.com>
+- Add x86 and ia64 targets.
+
+* Wed Nov 19 2003 Joel Becker <joel.becker at oracle.com>
+- Make the UL SP3 changes.
+
+* Wed Nov 12 2003 Joel Becker <joel.becker at oracle.com>
+- Start the ASM rename.
+
+* Thu Oct 30 2003 Joel Becker <joel.becker at oracle.com>
+- Created EL3 version
+
+* Mon Jun 23 2003 Joel Becker <joel.becker at oracle.com>
+- Added osm-lib bits
+
+* Fri Jun 20 2003 Joel Becker <joel.becker at oracle.com>
+- Initial RPM
+


Property changes on: trunk/vendor/sles9
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
oracleasm.init
*.spec
oracleasm-2.6.5.spec-generic

   + .*.sw?
oracleasm.init
*.spec
*.spec-generic


Modified: trunk/vendor/sles9/Makefile
===================================================================
--- trunk/vendor/sles9/Makefile	2005-11-22 03:24:52 UTC (rev 322)
+++ trunk/vendor/sles9/Makefile	2005-11-22 04:54:56 UTC (rev 323)
@@ -3,7 +3,7 @@
 include $(TOPDIR)/Preamble.make
 
 DIST_FILES =				\
-	oracleasm-2.6.5.spec-generic.in	\
+	oracleasm.spec-generic.in	\
 	kernel.guess			\
 	rpmarch.guess			\
 	Vendor.make			\

Modified: trunk/vendor/sles9/Vendor.make
===================================================================
--- trunk/vendor/sles9/Vendor.make	2005-11-22 03:24:52 UTC (rev 322)
+++ trunk/vendor/sles9/Vendor.make	2005-11-22 04:54:56 UTC (rev 323)
@@ -6,17 +6,17 @@
 MODULEARCH = $(shell $(TOPDIR)/vendor/sles9/rpmarch.guess module $(TOPDIR))
 
 
-$(TOPDIR)/vendor/sles9/oracleasm-2.6.5-%.spec: $(TOPDIR)/vendor/sles9/oracleasm-2.6.5.spec-generic
+$(TOPDIR)/vendor/sles9/oracleasm-%.spec: $(TOPDIR)/vendor/sles9/oracleasm.spec-generic
 	SPECVER="$@"; \
-		SPECVER="$${SPECVER#*oracleasm-2.6.5-}"; \
+		SPECVER="$${SPECVER#*oracleasm-}"; \
 		SPECVER="$${SPECVER%.spec}"; \
-		sed -e 's/@@SVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
+		sed -e 's/@@KVER@@/'$${SPECVER}'/' -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' < $< > $@
 
-sles9_%_srpm: dist $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-%.spec
-	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/sles9/oracleasm-2.6.5-$(patsubst sles9_%_srpm,%,$@).spec
+sles9_%_srpm: dist $(TOPDIR)/vendor/sles9/oracleasm-%.spec
+	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/sles9/oracleasm-$(patsubst sles9_%_srpm,%,$@).spec
 
 sles9_%_rpm: sles9_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "oracleasm-2.6.5-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
 
 
 include $(TOPDIR)/vendor/common/Vendor.make

Deleted: trunk/vendor/sles9/oracleasm-2.6.5.spec-generic.in
===================================================================
--- trunk/vendor/sles9/oracleasm-2.6.5.spec-generic.in	2005-11-22 03:24:52 UTC (rev 322)
+++ trunk/vendor/sles9/oracleasm-2.6.5.spec-generic.in	2005-11-22 04:54:56 UTC (rev 323)
@@ -1,580 +0,0 @@
-#
-# Spec file for oracleasm
-#
-
-# Macros
-# This one is hardcoded because, well, it belongs there
-%define _prefix /usr
-# Because RPM is dumb
-%define _unpackaged_files_terminate_build 0
-
-# Turn on's and off's
-%define builddefault		1
-%define buildsmp		1
-%define buildbigsmp		1
-%define build64kpagesize	0
-%define buildsn2		0
-%define buildiseries64		0
-%define buildpmac64		0
-%define buildpseries64		0
-%define builds390		0
-%define builds390x		0
-
-%ifarch %{ix86}
-%define karch i386
-%endif
-
-%ifarch x86_64 ia32e
-%define karch x86_64
-
-%define buildbigsmp		0
-%endif
-
-%ifarch ia64
-%define karch ia64
-
-%define buildsmp		0
-%define buildbigsmp		0
-%define build64kpagesize	1
-%define buildsn2		1
-%endif
-
-%ifarch ppc64
-%define karch ppc64
-
-%define builddefault		0
-%define buildsmp		0
-%define buildbigsmp		0
-%define buildiseries64		1
-%define buildpmac64		1
-%define buildpseries64		1
-%endif
-
-%ifarch s390
-%define karch s390
-
-%define builddefault		0
-%define buildsmp		0
-%define buildbigsmp		0
-%define builds390		1
-%endif
-
-%ifarch s390x
-%define karch s390
-
-%define builddefault		0
-%define buildsmp		0
-%define buildbigsmp		0
-%define builds390x		1
-%endif
-
-
-# This must be changed to the minimum ABI compat kernel version expected
-%define base		2.6.5
-%define sver		@@SVER@@
-%define kver		%{base}-%{sver}
-
-# The minimum -support package required for the kernel bits.
-%define support_ver     2.0.0
-# Minimum oracleasmlib version that supports positive ASM_ERR_NODEV.
-%define min_enodev	2.0.1
-
-Summary: The Oracle Automatic Storage Management library driver.
-Name: oracleasm-%{kver}
-Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
-Copyright: GPL
-Group: System Environment/Kernel
-Source: oracleasm- at DIST_VERSION@.tar.gz
-URL: http://oss.oracle.com/projects/oracleasm/
-Distribution: Oracle
-Vendor: Oracle Corporation
-Packager: Joel Becker <joel.becker at oracle.com>
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-default = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-
-BuildRoot: %{_tmppath}/oracleasm-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
-
-
-%description
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for the default kernel.
-
-%if %{builddefault}
-%package default
-Summary: The Oracle Automatic Storage Management library driver for UP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: oracleasm = %{version}
-Requires: kernel-default = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description default
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for the default kernel.
-%endif
-
-
-%if %{buildsmp}
-%package smp
-Summary: The Oracle Automatic Storage Management library driver for SMP systems.
-Group: System Environment/Kernel
-AutoReqProv: no
-Provides: oracleasm = %{version}
-Requires: kernel-smp = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description smp
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for symmetric multiprocessor kernels.
-%endif
-
-
-%if %{buildbigsmp}
-%package bigsmp
-Summary: The Oracle Automatic Storage Management library driver for NUMA systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-bigsmp = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description bigsmp
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for large memory SMP kernels.
-%endif
-
-
-%if %{build64kpagesize}
-%package 64k-pagesize
-Summary: The Oracle Automatic Storage Management library driver for Itanium kernels with a 64KB pagesize.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-64k-pagesize = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description 64k-pagesize
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for Itanium kernels with a 64KB pagesize.
-%endif
-
-
-%if %{buildsn2}
-%package sn2
-Summary: The Oracle Automatic Storage Management library driver for Altix systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-sn2 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description sn2
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for UP Itanium2 kernels.
-%endif
-
-
-%if %{buildiseries64}
-%package iseries64
-Summary: The Oracle Automatic Storage Management library driver for IBM iSeries systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-iseries64 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description iseries64
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM iSeries systems.
-%endif
-
-
-%if %{buildpmac64}
-%package pmac64
-Summary: The Oracle Automatic Storage Management library driver for 64-bit Power Macintosh kernels.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-pmac64 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description pmac64
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for 64-bit Power Macintosh kernels.
-%endif
-
-
-%if %{buildpseries64}
-%package pseries64
-Summary: The Oracle Automatic Storage Management library driver for IBM pSeries systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-pseries64 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description pseries64
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM pSeries systems.
-%endif
-
-
-%if %{builds390}
-%package s390
-Summary: The Oracle Automatic Storage Management library driver for IBM S/390 31-bit systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-s390 = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description s390
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM S/390 31-bit systems.
-%endif
-
-
-%if %{builds390x}
-%package s390x
-Summary: The Oracle Automatic Storage Management library driver for IBM zSeries systems.
-Group: System Environment/Kernel
-Provides: oracleasm = %{version}
-AutoReqProv: no
-Requires: kernel-s390x = %{kver}
-Requires: oracleasm-support >= %{support_ver}
-Conflicts: oracleasmlib < %{min_enodev}
-BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
-
-%description s390x
-Kernel driver for the Oracle Automatic Storage Management library.
-This package is compiled for IBM zSeries systems.
-%endif
-
-
-
-%prep
-%setup -n oracleasm-%{version}
-
-
-%build
-
-local_configure()
-{
-	./configure					\
-		--prefix=%{_prefix}			\
-		--exec-prefix=%{_exec_prefix}		\
-		--bindir=%{_bindir}			\
-		--sbindir=%{_sbindir}			\
-		--sysconfdir=%{_sysconfdir}		\
-		--datadir=%{_datadir}			\
-		--includedir=%{_includedir}		\
-		--libdir=%{_libdir}			\
-		--libexecdir=%{_libexecdir}		\
-		--localstatedir=%{_localstatedir}	\
-		--sharedstatedir=%{_sharedstatedir}	\
-		--mandir=%{_mandir}			\
-		--infodir=%{_infodir}			\
-		--with-vendor=sles9			\
-		--with-vendorkernel="$1"
-}
-
-%if %{builddefault}
-local_configure "%{kver}-default"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildsmp}
-local_configure "%{kver}-smp"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildbigsmp}
-local_configure "%{kver}-bigsmp"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{build64kpagesize}
-local_configure "%{kver}-64k-pagesize"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildsn2}
-local_configure "%{kver}-sn2"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildiseries64}
-local_configure "%{kver}-iseries64"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildpmac64}
-local_configure "%{kver}-pmac64"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{buildpseries64}
-local_configure "%{kver}-pseries64"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{builds390}
-local_configure "%{kver}-s390"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-%if %{builds390x}
-local_configure "%{kver}-s390x"
-make QUIET=1
-make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
-
-# 2.6 kbuild can't do this install nicely
-EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/extra"
-INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/kernel/drivers/addon/oracleasm"
-mkdir -p "${INST_MODLIB}"
-mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
-
-make clean
-%endif
-
-
-
-%install
-
-
-
-%clean
-rm -rf "$RPM_BUILD_ROOT"
-
-
-
-%if %{builddefault}
-%post default
-depmod -ae %{kver}-default
-
-%files default
-%defattr(-,root,root)
-/lib/modules/%{kver}-default/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildsmp}
-%post smp
-depmod -ae %{kver}-smp
-
-%files smp
-%defattr(-,root,root)
-/lib/modules/%{kver}-smp/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildbigsmp}
-%post bigsmp
-depmod -ae %{kver}-bigsmp
-
-%files bigsmp
-%defattr(-,root,root)
-/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{build64kpagesize}
-%post 64k-pagesize
-depmod -ae %{kver}-64k-pagesize
-
-%files 64k-pagesize
-%defattr(-,root,root)
-/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildsn2}
-%post sn2
-depmod -ae %{kver}-sn2/
-
-%files sn2
-%defattr(-,root,root)
-/lib/modules/%{kver}-sn2/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildiseries64}
-%post iseries64
-depmod -ae %{kver}-iseries64
-
-%files iseries64
-%defattr(-,root,root)
-/lib/modules/%{kver}-iseries64/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildpmac64}
-%post pmac64
-depmod -ae %{kver}-pmac64
-
-%files pmac64
-%defattr(-,root,root)
-/lib/modules/%{kver}-pmac64/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{buildpseries64}
-%post pseries64
-depmod -ae %{kver}-pseries64
-
-%files pseries64
-%defattr(-,root,root)
-/lib/modules/%{kver}-pseries64/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{builds390}
-%post s390
-depmod -ae %{kver}-s390
-
-%files s390
-%defattr(-,root,root)
-/lib/modules/%{kver}-s390/kernel/drivers/addon/oracleasm
-%endif
-
-
-%if %{builds390x}
-%post s390x
-depmod -ae %{kver}-s390x
-
-%files s390x
-%defattr(-,root,root)
-/lib/modules/%{kver}-s390x/kernel/drivers/addon/oracleasm
-%endif
-
-
-
-%changelog
-* Tue Sep 21 2004 Joel Becker <joel.becker at oracle.com>
-- Make SLES9 specfile.
-
-* Tue Jan 13 2004 Joel Becker <joel.becker at oracle.com>
-- Make kernel-only.
-
-* Thu Nov 20 2003 Joel Becker <joel.becker at oracle.com>
-- Add x86 and ia64 targets.
-
-* Wed Nov 19 2003 Joel Becker <joel.becker at oracle.com>
-- Make the UL SP3 changes.
-
-* Wed Nov 12 2003 Joel Becker <joel.becker at oracle.com>
-- Start the ASM rename.
-
-* Thu Oct 30 2003 Joel Becker <joel.becker at oracle.com>
-- Created EL3 version
-
-* Mon Jun 23 2003 Joel Becker <joel.becker at oracle.com>
-- Added osm-lib bits
-
-* Fri Jun 20 2003 Joel Becker <joel.becker at oracle.com>
-- Initial RPM
-

Copied: trunk/vendor/sles9/oracleasm.spec-generic.in (from rev 322, trunk/vendor/sles9/oracleasm-2.6.5.spec-generic.in)
===================================================================
--- trunk/vendor/sles9/oracleasm-2.6.5.spec-generic.in	2005-11-22 03:24:52 UTC (rev 322)
+++ trunk/vendor/sles9/oracleasm.spec-generic.in	2005-11-22 04:54:56 UTC (rev 323)
@@ -0,0 +1,578 @@
+#
+# Spec file for oracleasm
+#
+
+# Macros
+# This one is hardcoded because, well, it belongs there
+%define _prefix /usr
+# Because RPM is dumb
+%define _unpackaged_files_terminate_build 0
+
+# Turn on's and off's
+%define builddefault		1
+%define buildsmp		1
+%define buildbigsmp		1
+%define build64kpagesize	0
+%define buildsn2		0
+%define buildiseries64		0
+%define buildpmac64		0
+%define buildpseries64		0
+%define builds390		0
+%define builds390x		0
+
+%ifarch %{ix86}
+%define karch i386
+%endif
+
+%ifarch x86_64 ia32e
+%define karch x86_64
+
+%define buildbigsmp		0
+%endif
+
+%ifarch ia64
+%define karch ia64
+
+%define buildsmp		0
+%define buildbigsmp		0
+%define build64kpagesize	1
+%define buildsn2		1
+%endif
+
+%ifarch ppc64
+%define karch ppc64
+
+%define builddefault		0
+%define buildsmp		0
+%define buildbigsmp		0
+%define buildiseries64		1
+%define buildpmac64		1
+%define buildpseries64		1
+%endif
+
+%ifarch s390
+%define karch s390
+
+%define builddefault		0
+%define buildsmp		0
+%define buildbigsmp		0
+%define builds390		1
+%endif
+
+%ifarch s390x
+%define karch s390
+
+%define builddefault		0
+%define buildsmp		0
+%define buildbigsmp		0
+%define builds390x		1
+%endif
+
+
+# This must be changed to the minimum ABI compat kernel version expected
+%define kver		@@KVER@@
+
+# The minimum -support package required for the kernel bits.
+%define support_ver     2.0.0
+# Minimum oracleasmlib version that supports positive ASM_ERR_NODEV.
+%define min_enodev	2.0.1
+
+Summary: The Oracle Automatic Storage Management library driver.
+Name: oracleasm-%{kver}
+Version: @DIST_VERSION@
+Release: @@PKG_VERSION@@
+Copyright: GPL
+Group: System Environment/Kernel
+Source: oracleasm- at DIST_VERSION@.tar.gz
+URL: http://oss.oracle.com/projects/oracleasm/
+Distribution: Oracle
+Vendor: Oracle Corporation
+Packager: Joel Becker <joel.becker at oracle.com>
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-default = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+
+BuildRoot: %{_tmppath}/oracleasm-%{PACKAGE_VERSION}-%{PACKAGE_RELEASE}-root
+
+
+%description
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for the default kernel.
+
+%if %{builddefault}
+%package default
+Summary: The Oracle Automatic Storage Management library driver for UP systems.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: oracleasm = %{version}
+Requires: kernel-default = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description default
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for the default kernel.
+%endif
+
+
+%if %{buildsmp}
+%package smp
+Summary: The Oracle Automatic Storage Management library driver for SMP systems.
+Group: System Environment/Kernel
+AutoReqProv: no
+Provides: oracleasm = %{version}
+Requires: kernel-smp = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description smp
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for symmetric multiprocessor kernels.
+%endif
+
+
+%if %{buildbigsmp}
+%package bigsmp
+Summary: The Oracle Automatic Storage Management library driver for NUMA systems.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-bigsmp = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description bigsmp
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for large memory SMP kernels.
+%endif
+
+
+%if %{build64kpagesize}
+%package 64k-pagesize
+Summary: The Oracle Automatic Storage Management library driver for Itanium kernels with a 64KB pagesize.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-64k-pagesize = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description 64k-pagesize
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for Itanium kernels with a 64KB pagesize.
+%endif
+
+
+%if %{buildsn2}
+%package sn2
+Summary: The Oracle Automatic Storage Management library driver for Altix systems.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-sn2 = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description sn2
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for UP Itanium2 kernels.
+%endif
+
+
+%if %{buildiseries64}
+%package iseries64
+Summary: The Oracle Automatic Storage Management library driver for IBM iSeries systems.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-iseries64 = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description iseries64
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for IBM iSeries systems.
+%endif
+
+
+%if %{buildpmac64}
+%package pmac64
+Summary: The Oracle Automatic Storage Management library driver for 64-bit Power Macintosh kernels.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-pmac64 = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description pmac64
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for 64-bit Power Macintosh kernels.
+%endif
+
+
+%if %{buildpseries64}
+%package pseries64
+Summary: The Oracle Automatic Storage Management library driver for IBM pSeries systems.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-pseries64 = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description pseries64
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for IBM pSeries systems.
+%endif
+
+
+%if %{builds390}
+%package s390
+Summary: The Oracle Automatic Storage Management library driver for IBM S/390 31-bit systems.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-s390 = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description s390
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for IBM S/390 31-bit systems.
+%endif
+
+
+%if %{builds390x}
+%package s390x
+Summary: The Oracle Automatic Storage Management library driver for IBM zSeries systems.
+Group: System Environment/Kernel
+Provides: oracleasm = %{version}
+AutoReqProv: no
+Requires: kernel-s390x = %{kver}
+Requires: oracleasm-support >= %{support_ver}
+Conflicts: oracleasmlib < %{min_enodev}
+BuildRequires: kernel-source = %{kver}, kernel-syms = %{kver}
+
+%description s390x
+Kernel driver for the Oracle Automatic Storage Management library.
+This package is compiled for IBM zSeries systems.
+%endif
+
+
+
+%prep
+%setup -n oracleasm-%{version}
+
+
+%build
+
+local_configure()
+{
+	./configure					\
+		--prefix=%{_prefix}			\
+		--exec-prefix=%{_exec_prefix}		\
+		--bindir=%{_bindir}			\
+		--sbindir=%{_sbindir}			\
+		--sysconfdir=%{_sysconfdir}		\
+		--datadir=%{_datadir}			\
+		--includedir=%{_includedir}		\
+		--libdir=%{_libdir}			\
+		--libexecdir=%{_libexecdir}		\
+		--localstatedir=%{_localstatedir}	\
+		--sharedstatedir=%{_sharedstatedir}	\
+		--mandir=%{_mandir}			\
+		--infodir=%{_infodir}			\
+		--with-vendor=sles9			\
+		--with-vendorkernel="$1"
+}
+
+%if %{builddefault}
+local_configure "%{kver}-default"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-default/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{buildsmp}
+local_configure "%{kver}-smp"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-smp/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{buildbigsmp}
+local_configure "%{kver}-bigsmp"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{build64kpagesize}
+local_configure "%{kver}-64k-pagesize"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{buildsn2}
+local_configure "%{kver}-sn2"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-sn2/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{buildiseries64}
+local_configure "%{kver}-iseries64"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-iseries64/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{buildpmac64}
+local_configure "%{kver}-pmac64"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pmac64/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{buildpseries64}
+local_configure "%{kver}-pseries64"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-pseries64/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{builds390}
+local_configure "%{kver}-s390"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+%if %{builds390x}
+local_configure "%{kver}-s390x"
+make QUIET=1
+make DESTDIR="$RPM_BUILD_ROOT" INSTALL_MOD_PATH='$(DESTDIR)' install 
+
+# 2.6 kbuild can't do this install nicely
+EXTRA_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/extra"
+INST_MODLIB="${RPM_BUILD_ROOT}/lib/modules/%{kver}-s390x/kernel/drivers/addon/oracleasm"
+mkdir -p "${INST_MODLIB}"
+mv "${EXTRA_MODLIB}"/oracleasm.ko "${INST_MODLIB}/"
+
+make clean
+%endif
+
+
+
+%install
+
+
+
+%clean
+rm -rf "$RPM_BUILD_ROOT"
+
+
+
+%if %{builddefault}
+%post default
+depmod -ae %{kver}-default
+
+%files default
+%defattr(-,root,root)
+/lib/modules/%{kver}-default/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{buildsmp}
+%post smp
+depmod -ae %{kver}-smp
+
+%files smp
+%defattr(-,root,root)
+/lib/modules/%{kver}-smp/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{buildbigsmp}
+%post bigsmp
+depmod -ae %{kver}-bigsmp
+
+%files bigsmp
+%defattr(-,root,root)
+/lib/modules/%{kver}-bigsmp/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{build64kpagesize}
+%post 64k-pagesize
+depmod -ae %{kver}-64k-pagesize
+
+%files 64k-pagesize
+%defattr(-,root,root)
+/lib/modules/%{kver}-64k-pagesize/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{buildsn2}
+%post sn2
+depmod -ae %{kver}-sn2/
+
+%files sn2
+%defattr(-,root,root)
+/lib/modules/%{kver}-sn2/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{buildiseries64}
+%post iseries64
+depmod -ae %{kver}-iseries64
+
+%files iseries64
+%defattr(-,root,root)
+/lib/modules/%{kver}-iseries64/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{buildpmac64}
+%post pmac64
+depmod -ae %{kver}-pmac64
+
+%files pmac64
+%defattr(-,root,root)
+/lib/modules/%{kver}-pmac64/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{buildpseries64}
+%post pseries64
+depmod -ae %{kver}-pseries64
+
+%files pseries64
+%defattr(-,root,root)
+/lib/modules/%{kver}-pseries64/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{builds390}
+%post s390
+depmod -ae %{kver}-s390
+
+%files s390
+%defattr(-,root,root)
+/lib/modules/%{kver}-s390/kernel/drivers/addon/oracleasm
+%endif
+
+
+%if %{builds390x}
+%post s390x
+depmod -ae %{kver}-s390x
+
+%files s390x
+%defattr(-,root,root)
+/lib/modules/%{kver}-s390x/kernel/drivers/addon/oracleasm
+%endif
+
+
+
+%changelog
+* Tue Sep 21 2004 Joel Becker <joel.becker at oracle.com>
+- Make SLES9 specfile.
+
+* Tue Jan 13 2004 Joel Becker <joel.becker at oracle.com>
+- Make kernel-only.
+
+* Thu Nov 20 2003 Joel Becker <joel.becker at oracle.com>
+- Add x86 and ia64 targets.
+
+* Wed Nov 19 2003 Joel Becker <joel.becker at oracle.com>
+- Make the UL SP3 changes.
+
+* Wed Nov 12 2003 Joel Becker <joel.becker at oracle.com>
+- Start the ASM rename.
+
+* Thu Oct 30 2003 Joel Becker <joel.becker at oracle.com>
+- Created EL3 version
+
+* Mon Jun 23 2003 Joel Becker <joel.becker at oracle.com>
+- Added osm-lib bits
+
+* Fri Jun 20 2003 Joel Becker <joel.becker at oracle.com>
+- Initial RPM
+



More information about the Oracleasm-commits mailing list