[Oracleasm-commits] jlbec commits r376 - in trunk/vendor: common fc6 rhas21 rhel3 rhel4 rhel5 sles10 sles8 sles9

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2007-05-02 18:13:20 -0700 (Wed, 02 May 2007)
New Revision: 376

Modified:
   trunk/vendor/common/Vendor.make
   trunk/vendor/common/oracleasm-headers.spec-generic.in
   trunk/vendor/fc6/Vendor.make
   trunk/vendor/fc6/oracleasm.spec-generic.in
   trunk/vendor/rhas21/Vendor.make
   trunk/vendor/rhel3/Vendor.make
   trunk/vendor/rhel4/Vendor.make
   trunk/vendor/rhel4/oracleasm.spec-generic.in
   trunk/vendor/rhel5/
   trunk/vendor/rhel5/Vendor.make
   trunk/vendor/rhel5/oracleasm.spec-generic.in
   trunk/vendor/sles10/Vendor.make
   trunk/vendor/sles10/oracleasm.spec-generic.in
   trunk/vendor/sles8/Vendor.make
   trunk/vendor/sles9/Vendor.make
   trunk/vendor/sles9/oracleasm.spec-generic.in
Log:
Add VENDOR_EXTENSION to the RPM release value.  This allows us to
differentiate between the 2.0.3-1 RPM on SLES9 and RHEL4, etc.




Modified: trunk/vendor/common/Vendor.make
===================================================================
--- trunk/vendor/common/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/common/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -3,19 +3,28 @@
 #
 
 # This Vendor.make expects TOOLSARCH set by someone including it
-# It also expects PKG_VERSION and INCLUDE_REQUIRES to be set.
+# It also expects PKG_VERSION, INCLUDE_REQUIRES, and VENDOR_EXTENSION to be
+# set.
 
 
 RPMBUILD = $(shell /usr/bin/which rpmbuild 2>/dev/null || /usr/bin/which rpm 2>/dev/null || echo /bin/false)
 RPM_TOPDIR = `pwd`
 
-$(TOPDIR)/oracleasm-headers-$(DIST_VERSION)-$(PKG_VERSION).src.rpm: dist $(TOPDIR)/vendor/common/oracleasm-headers.spec-generic
-	sed -e 's/@@PKG_VERSION@@/'$(PKG_VERSION)'/' -e 's/@@INCLUDE_REQUIRES@@/'$(INCLUDE_REQUIRES)'/' < "$(TOPDIR)/vendor/common/oracleasm-headers.spec-generic" > "$(TOPDIR)/vendor/common/oracleasm-headers.spec"
+ifndef VENDOR_EXTENSION
+VENDOR_EXTENSION = common
+endif
+
+$(TOPDIR)/oracleasm-headers-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm: dist $(TOPDIR)/vendor/common/oracleasm-headers.spec-generic
+	sed -e 's,@@PKG_VERSION@@,'$(PKG_VERSION)',g' \
+		-e 's,@@INCLUDE_REQUIRES@@,'$(INCLUDE_REQUIRES)',g' \
+		-e 's,@@VENDOR_EXTENSION@@,'$(VENDOR_EXTENSION)',g' \
+		< "$(TOPDIR)/vendor/common/oracleasm-headers.spec-generic" \
+		> "$(TOPDIR)/vendor/common/oracleasm-headers.spec"
 	$(RPMBUILD) -bs --define "_sourcedir $(RPM_TOPDIR)" --define "_srcrpmdir $(RPM_TOPDIR)" "$(TOPDIR)/vendor/common/oracleasm-headers.spec"
 	rm "$(TOPDIR)/vendor/common/oracleasm-headers.spec"
 
-headers_srpm: $(TOPDIR)/oracleasm-headers-$(DIST_VERSION)-$(PKG_VERSION).src.rpm
+headers_srpm: $(TOPDIR)/oracleasm-headers-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm
 
 headers_rpm: headers_srpm
-	$(RPMBUILD) --rebuild $(TOOLSARCH) "oracleasm-headers-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	$(RPMBUILD) --rebuild $(TOOLSARCH) "oracleasm-headers-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm"
 

Modified: trunk/vendor/common/oracleasm-headers.spec-generic.in
===================================================================
--- trunk/vendor/common/oracleasm-headers.spec-generic.in	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/common/oracleasm-headers.spec-generic.in	2007-05-03 01:13:20 UTC (rev 376)
@@ -16,7 +16,7 @@
 Summary: The Oracle Automatic Storage Management driver ABI headers.
 Name: oracleasm-headers
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.@@VENDOR_EXTENSION@@
 License: GPL
 Group: System Environment/Kernel
 Source: oracleasm- at DIST_VERSION@.tar.gz

Modified: trunk/vendor/fc6/Vendor.make
===================================================================
--- trunk/vendor/fc6/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/fc6/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -4,6 +4,7 @@
 
 TOOLSARCH = $(shell $(TOPDIR)/vendor/fc6/rpmarch.guess tools $(TOPDIR))
 MODULEARCH = $(shell $(TOPDIR)/vendor/fc6/rpmarch.guess module $(TOPDIR))
+VENDOR_EXTENSION = fc6
 
 $(TOPDIR)/vendor/fc6/oracleasm-%.spec: $(TOPDIR)/vendor/fc6/oracleasm.spec-generic
 	SPECVER="$@"; \
@@ -23,7 +24,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/fc6/oracleasm-$(patsubst fc6_%_srpm,%,$@).spec
 
 fc6_%_rpm: fc6_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst fc6_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst fc6_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm"
 
 
 # Package required for /usr/include/linux

Modified: trunk/vendor/fc6/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/fc6/oracleasm.spec-generic.in	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/fc6/oracleasm.spec-generic.in	2007-05-03 01:13:20 UTC (rev 376)
@@ -40,7 +40,7 @@
 Summary: The Oracle Automatic Storage Management library driver.
 Name: oracleasm-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.fc6
 License: GPL
 Group: System Environment/Kernel
 Source: oracleasm- at DIST_VERSION@.tar.gz

Modified: trunk/vendor/rhas21/Vendor.make
===================================================================
--- trunk/vendor/rhas21/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/rhas21/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -1,8 +1,9 @@
 #
-# RHEL 3
+# RHAS 2.1
 #
 
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhas21/rpmarch.guess tools $(TOPDIR))
+VENDOR_EXTENSION = as21
 
 # Package required for /usr/include/linux
 INCLUDE_REQUIRES = kernel-headers

Modified: trunk/vendor/rhel3/Vendor.make
===================================================================
--- trunk/vendor/rhel3/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/rhel3/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -3,6 +3,7 @@
 #
 
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel3/rpmarch.guess tools $(TOPDIR))
+VENDOR_EXTENSION = el3
 
 # Package required for /usr/include/linux
 INCLUDE_REQUIRES = glibc-kernheaders

Modified: trunk/vendor/rhel4/Vendor.make
===================================================================
--- trunk/vendor/rhel4/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/rhel4/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -4,6 +4,7 @@
 
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess tools $(TOPDIR))
 MODULEARCH = $(shell $(TOPDIR)/vendor/rhel4/rpmarch.guess module $(TOPDIR))
+VENDOR_EXTENSION = el4
 
 $(TOPDIR)/vendor/rhel4/oracleasm-%.spec: $(TOPDIR)/vendor/rhel4/oracleasm.spec-generic
 	SPECVER="$@"; \
@@ -23,7 +24,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/oracleasm-$(patsubst rhel4_%_srpm,%,$@).spec
 
 rhel4_%_rpm: rhel4_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst rhel4_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst rhel4_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm"
 
 
 # Package required for /usr/include/linux

Modified: trunk/vendor/rhel4/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/rhel4/oracleasm.spec-generic.in	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/rhel4/oracleasm.spec-generic.in	2007-05-03 01:13:20 UTC (rev 376)
@@ -56,7 +56,7 @@
 Summary: The Oracle Automatic Storage Management library driver.
 Name: oracleasm-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.el4
 License: GPL
 Group: System Environment/Kernel
 Source: oracleasm- at DIST_VERSION@.tar.gz


Property changes on: trunk/vendor/rhel5
___________________________________________________________________
Name: svn:ignore
   + oracleasm.spec-generic
.*.sw?


Modified: trunk/vendor/rhel5/Vendor.make
===================================================================
--- trunk/vendor/rhel5/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/rhel5/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -4,6 +4,7 @@
 
 TOOLSARCH = $(shell $(TOPDIR)/vendor/rhel5/rpmarch.guess tools $(TOPDIR))
 MODULEARCH = $(shell $(TOPDIR)/vendor/rhel5/rpmarch.guess module $(TOPDIR))
+VENDOR_EXTENSION = el5
 
 $(TOPDIR)/vendor/rhel5/oracleasm-%.spec: $(TOPDIR)/vendor/rhel5/oracleasm.spec-generic
 	SPECVER="$@"; \
@@ -15,7 +16,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel5/oracleasm-$(patsubst rhel5_%_srpm,%,$@).spec
 
 rhel5_%_rpm: rhel5_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst rhel5_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst rhel5_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm"
 
 
 # Package required for /usr/include/linux

Modified: trunk/vendor/rhel5/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/rhel5/oracleasm.spec-generic.in	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/rhel5/oracleasm.spec-generic.in	2007-05-03 01:13:20 UTC (rev 376)
@@ -48,7 +48,7 @@
 Summary: The Oracle Automatic Storage Management library driver.
 Name: oracleasm-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.el5
 License: GPL
 Group: System Environment/Kernel
 Source: oracleasm- at DIST_VERSION@.tar.gz

Modified: trunk/vendor/sles10/Vendor.make
===================================================================
--- trunk/vendor/sles10/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/sles10/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -4,6 +4,7 @@
 
 TOOLSARCH = $(shell $(TOPDIR)/vendor/sles10/rpmarch.guess tools $(TOPDIR))
 MODULEARCH = $(shell $(TOPDIR)/vendor/sles10/rpmarch.guess module $(TOPDIR))
+VENDOR_EXTENSION = SLE10
 
 
 $(TOPDIR)/vendor/sles10/oracleasm-%.spec: $(TOPDIR)/vendor/sles10/oracleasm.spec-generic
@@ -16,7 +17,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/sles10/oracleasm-$(patsubst sles10_%_srpm,%,$@).spec
 
 sles10_%_rpm: sles10_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst sles10_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst sles10_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm"
 
 
 include $(TOPDIR)/vendor/common/Vendor.make

Modified: trunk/vendor/sles10/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/sles10/oracleasm.spec-generic.in	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/sles10/oracleasm.spec-generic.in	2007-05-03 01:13:20 UTC (rev 376)
@@ -80,7 +80,7 @@
 Summary: The Oracle Automatic Storage Management library driver.
 Name: oracleasm-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.SLE10
 License: GPL
 Group: System Environment/Kernel
 Source: oracleasm- at DIST_VERSION@.tar.gz

Modified: trunk/vendor/sles8/Vendor.make
===================================================================
--- trunk/vendor/sles8/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/sles8/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -1,8 +1,9 @@
 #
-# SLES 9
+# SLES 8
 #
 
 TOOLSARCH = $(shell $(TOPDIR)/vendor/sles8/rpmarch.guess tools $(TOPDIR))
+VENDOR_EXTENSION = SLE8
 
 # Package required for /usr/include/linux
 INCLUDE_REQUIRES = glibc-devel

Modified: trunk/vendor/sles9/Vendor.make
===================================================================
--- trunk/vendor/sles9/Vendor.make	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/sles9/Vendor.make	2007-05-03 01:13:20 UTC (rev 376)
@@ -4,6 +4,7 @@
 
 TOOLSARCH = $(shell $(TOPDIR)/vendor/sles9/rpmarch.guess tools $(TOPDIR))
 MODULEARCH = $(shell $(TOPDIR)/vendor/sles9/rpmarch.guess module $(TOPDIR))
+VENDOR_EXTENSION = SLE9
 
 
 $(TOPDIR)/vendor/sles9/oracleasm-%.spec: $(TOPDIR)/vendor/sles9/oracleasm.spec-generic
@@ -16,7 +17,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/sles9/oracleasm-$(patsubst sles9_%_srpm,%,$@).spec
 
 sles9_%_rpm: sles9_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "oracleasm-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).$(VENDOR_EXTENSION).src.rpm"
 
 
 # Package required for /usr/include/linux

Modified: trunk/vendor/sles9/oracleasm.spec-generic.in
===================================================================
--- trunk/vendor/sles9/oracleasm.spec-generic.in	2007-04-19 01:01:22 UTC (rev 375)
+++ trunk/vendor/sles9/oracleasm.spec-generic.in	2007-05-03 01:13:20 UTC (rev 376)
@@ -80,7 +80,7 @@
 Summary: The Oracle Automatic Storage Management library driver.
 Name: oracleasm-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.SLE9
 License: GPL
 Group: System Environment/Kernel
 Source: oracleasm- at DIST_VERSION@.tar.gz