Permalink
Browse files

Set chaos version number.

Put the chaos version before wc's version

Lets us be certain that version numbers are monitonically
increasing (as rpm sees it) without using the Epoch
field in the spec file.  The Epoch field might have caused
issues in the future, which is why I decided to just
reverse our version with Whamcloud's.

Signed-off-by: Christopher J. Morrone <morrone2@llnl.gov>
  • Loading branch information...
1 parent bc24e8e commit dddf11a67b2351dbdcd6aab4bdaf3d6d39ed161d @morrone morrone committed Apr 20, 2012
Showing with 26 additions and 5 deletions.
  1. +26 −0 patches/chaos-version.patch
  2. +0 −5 patches/series
View
26 patches/chaos-version.patch
@@ -0,0 +1,26 @@
+Append a chaos version number.
+
+Index: ldiskfsprogs/version.h
+===================================================================
+--- ldiskfsprogs.orig/version.h 2012-04-19 17:11:19.000000000 -0700
++++ ldiskfsprogs/version.h 2012-04-19 17:12:38.069236493 -0700
+@@ -7,5 +7,5 @@
+ * file may be redistributed under the GNU Public License v2.
+ */
+
+-#define E2FSPROGS_VERSION "1.41.90.wc4"
++#define E2FSPROGS_VERSION "1.41.90.4chaos.wc4"
+ #define E2FSPROGS_DATE "01-Sep-2011"
+Index: ldiskfsprogs/e2fsprogs-RHEL-6.spec.in
+===================================================================
+--- ldiskfsprogs.orig/e2fsprogs-RHEL-6.spec.in 2012-04-19 17:11:20.000000000 -0700
++++ ldiskfsprogs/e2fsprogs-RHEL-6.spec.in 2012-04-19 17:11:35.368445874 -0700
+@@ -4,7 +4,7 @@
+ Summary: Utilities for managing ext2, ext3, and ext4 filesystems
+ Name: @E2FSPROGS@
+ Version: @E2FSPROGS_PKGVER@
+-Release: 7%{?dist}
++Release: 0%{?dist}
+
+ # License tags based on COPYING file distinctions for various components
+ License: GPLv2
View
5 patches/series
@@ -81,10 +81,5 @@ e2fsprogs-rpm_RHEL-6.patch
e2fsprogs-1.40.4-sb_feature_check_ignore.patch
e2fsprogs-rpm_SLES-11.patch
ldiskfsprogs-rename-support.patch
-<<<<<<< HEAD
-||||||| parent of 58711d0... Fix build by compiling without --enable-elf-shlibs
-chaos-version.patch
-=======
static-build.patch
chaos-version.patch
->>>>>>> 58711d0... Fix build by compiling without --enable-elf-shlibs

0 comments on commit dddf11a

Please sign in to comment.