[Ocfs2-commits] jlbec commits r3016 - in branches/ocfs2-1.2/vendor: ax2 rhel4 rhel5 sles9

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2007-05-03 12:29:17 -0700 (Thu, 03 May 2007)
New Revision: 3016

Modified:
   branches/ocfs2-1.2/vendor/ax2/Vendor.make
   branches/ocfs2-1.2/vendor/ax2/ocfs2.spec-generic.in
   branches/ocfs2-1.2/vendor/rhel4/Vendor.make
   branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in
   branches/ocfs2-1.2/vendor/rhel5/Vendor.make
   branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in
   branches/ocfs2-1.2/vendor/sles9/Vendor.make
   branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
Log:

Introduce VENDOR_EXTENSION.  All RPMs will now have a vendor-specific
extension added to their RPM Release value.  Thus we can differentiate
between 1.2.6-1.el4 for RHEL4 and 1.2.6-1.SLE10 for SLES10, etc.

Signed-off-by: smushran



Modified: branches/ocfs2-1.2/vendor/ax2/Vendor.make
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/Vendor.make	2007-04-24 22:52:08 UTC (rev 3015)
+++ branches/ocfs2-1.2/vendor/ax2/Vendor.make	2007-05-03 19:29:17 UTC (rev 3016)
@@ -15,7 +15,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/ax2/ocfs2-$(patsubst ax2_%_srpm,%,$@).spec
 
 ax2_%_rpm: ax2_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst ax2_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst ax2_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).ax2.src.rpm"
 
 
 packages: $(shell $(TOPDIR)/vendor/ax2/kernel.guess targets)

Modified: branches/ocfs2-1.2/vendor/ax2/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/ax2/ocfs2.spec-generic.in	2007-04-24 22:52:08 UTC (rev 3015)
+++ branches/ocfs2-1.2/vendor/ax2/ocfs2.spec-generic.in	2007-05-03 19:29:17 UTC (rev 3016)
@@ -44,7 +44,7 @@
 Summary: The Oracle Cluster Filesystem 2.
 Name: ocfs2-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.ax2
 License: GPL
 Group: System Environment/Kernel
 Source: ocfs2- at DIST_VERSION@.tar.gz

Modified: branches/ocfs2-1.2/vendor/rhel4/Vendor.make
===================================================================
--- branches/ocfs2-1.2/vendor/rhel4/Vendor.make	2007-04-24 22:52:08 UTC (rev 3015)
+++ branches/ocfs2-1.2/vendor/rhel4/Vendor.make	2007-05-03 19:29:17 UTC (rev 3016)
@@ -23,7 +23,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel4/ocfs2-$(patsubst rhel4_%_srpm,%,$@).spec
 
 rhel4_%_rpm: rhel4_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst rhel4_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst rhel4_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).el4.src.rpm"
 
 
 packages: $(shell $(TOPDIR)/vendor/rhel4/kernel.guess targets)

Modified: branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in	2007-04-24 22:52:08 UTC (rev 3015)
+++ branches/ocfs2-1.2/vendor/rhel4/ocfs2.spec-generic.in	2007-05-03 19:29:17 UTC (rev 3016)
@@ -48,7 +48,7 @@
 Summary: The Oracle Cluster Filesystem 2.
 Name: ocfs2-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.el4
 License: GPL
 Group: System Environment/Kernel
 Source: ocfs2- at DIST_VERSION@.tar.gz

Modified: branches/ocfs2-1.2/vendor/rhel5/Vendor.make
===================================================================
--- branches/ocfs2-1.2/vendor/rhel5/Vendor.make	2007-04-24 22:52:08 UTC (rev 3015)
+++ branches/ocfs2-1.2/vendor/rhel5/Vendor.make	2007-05-03 19:29:17 UTC (rev 3016)
@@ -15,7 +15,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/rhel5/ocfs2-$(patsubst rhel5_%_srpm,%,$@).spec
 
 rhel5_%_rpm: rhel5_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst rhel5_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst rhel5_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).el5.src.rpm"
 
 
 packages: $(shell $(TOPDIR)/vendor/rhel5/kernel.guess targets)

Modified: branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in	2007-04-24 22:52:08 UTC (rev 3015)
+++ branches/ocfs2-1.2/vendor/rhel5/ocfs2.spec-generic.in	2007-05-03 19:29:17 UTC (rev 3016)
@@ -1,5 +1,5 @@
 #
-# Spec file for OCFS2 on RHEL4
+# Spec file for OCFS2 on RHEL5
 #
 
 # Macros
@@ -45,7 +45,7 @@
 Summary: The Oracle Cluster Filesystem 2.
 Name: ocfs2-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.el5
 License: GPL
 Group: System Environment/Kernel
 Source: ocfs2- at DIST_VERSION@.tar.gz

Modified: branches/ocfs2-1.2/vendor/sles9/Vendor.make
===================================================================
--- branches/ocfs2-1.2/vendor/sles9/Vendor.make	2007-04-24 22:52:08 UTC (rev 3015)
+++ branches/ocfs2-1.2/vendor/sles9/Vendor.make	2007-05-03 19:29:17 UTC (rev 3016)
@@ -16,7 +16,7 @@
 	rpmbuild -bs --define "_sourcedir $(TOPDIR)" --define "_srcrpmdir $(TOPDIR)" $(TOPDIR)/vendor/sles9/ocfs2-$(patsubst sles9_%_srpm,%,$@).spec
 
 sles9_%_rpm: sles9_%_srpm
-	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).src.rpm"
+	rpmbuild --rebuild $(MODULEARCH) "ocfs2-$(patsubst sles9_%_rpm,%,$@)-$(DIST_VERSION)-$(PKG_VERSION).SLE9.src.rpm"
 
 
 packages: $(shell $(TOPDIR)/vendor/sles9/kernel.guess targets)

Modified: branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in
===================================================================
--- branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2007-04-24 22:52:08 UTC (rev 3015)
+++ branches/ocfs2-1.2/vendor/sles9/ocfs2.spec-generic.in	2007-05-03 19:29:17 UTC (rev 3016)
@@ -78,7 +78,7 @@
 Summary: The Oracle Cluster Filesystem 2.
 Name: ocfs2-%{kver}
 Version: @DIST_VERSION@
-Release: @@PKG_VERSION@@
+Release: @@PKG_VERSION@@.SLE9
 License: GPL
 Group: System Environment/Kernel
 Source: ocfs2- at DIST_VERSION@.tar.gz