[PATCH 3/3] Btrfs-progs Change rpm spec file to be handle version This "optional" patch changes version.sh and the rpm spec file to handle changes in the version and still work properly. The "default" version in version.sh is changed to VERSION and v="$VERSION". The rpm spec file now update \$VERSION which will not change. Signed-off-by: Gene Czarcinski <gene@xxxxxxxxx>

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



---
 btrfs-progs.spec.in | 2 +-
 version.sh          | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/btrfs-progs.spec.in b/btrfs-progs.spec.in
index b64e404..882efc7 100644
--- a/btrfs-progs.spec.in
+++ b/btrfs-progs.spec.in
@@ -22,7 +22,7 @@ check, modify and correct any inconsistencies in the btrfs filesystem.
 
 %prep
 %setup -q -c
-sed -i s/v0.20-rc1/%{real_version}/g $RPM_BUILD_DIR/%{name}-%{version}/version.sh
+sed -i s/\$VERSION/%{real_version}/g $RPM_BUILD_DIR/%{name}-%{version}/version.sh
 
 %build
 make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
diff --git a/version.sh b/version.sh
index b81040e..84513a3 100644
--- a/version.sh
+++ b/version.sh
@@ -6,7 +6,8 @@
 # Copyright 2008, Oracle
 # Released under the GNU GPLv2
  
-v="v0.20-rc1"
+VERSION="v0.20-rc1"
+v="$VERSION"
 
 which git &> /dev/null
 if [ $? == 0 -a -d .git ]; then
-- 
1.8.1

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Filesystem Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux