All of lore.kernel.org
 help / color / mirror / Atom feed
From: Gene Czarcinski <gene@czarc.net>
To: linux-btrfs@vger.kernel.org
Cc: Gene Czarcinski <gene@czarc.net>
Subject: [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@czarc.net>
Date: Tue, 22 Jan 2013 12:22:06 -0500	[thread overview]
Message-ID: <1358875326-28636-4-git-send-email-gene@czarc.net> (raw)
In-Reply-To: <1358875326-28636-1-git-send-email-gene@czarc.net>

---
 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


      parent reply	other threads:[~2013-01-22 17:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-22 17:22 [PATCH 0/3] Btrfs-progs Add spec file template and script to create tarball Gene Czarcinski
2013-01-22 17:22 ` [PATCH 1/3] Btrfs-progs Add rpm spec template and " Gene Czarcinski
2013-01-22 17:22 ` [PATCH 2/3] Btrfs-progs Add make archive Gene Czarcinski
2013-01-22 21:52   ` Mike Fleetwood
2013-01-23 15:03     ` Gene Czarcinski
2013-01-22 17:22 ` Gene Czarcinski [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358875326-28636-4-git-send-email-gene@czarc.net \
    --to=gene@czarc.net \
    --cc=linux-btrfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.