From 0bc577f03368fb1a7824d5468bb668ab780c7561 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Mon, 2 Mar 2009 13:50:26 +0000
Subject: * Put the current version in a separate file so that it can be used
 in   the release expression.

---
 Makefile.am  |  2 +-
 configure.ac |  2 +-
 release.nix  | 13 ++++++++-----
 version      |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 version

diff --git a/Makefile.am b/Makefile.am
index 46f6d1c..d53983b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = src tests
 
-EXTRA_DIST = COPYING README patchelf.spec patchelf.spec.in
+EXTRA_DIST = COPYING README patchelf.spec patchelf.spec.in version
 
 patchelf.spec: patchelf.spec.in
 	sed -e "s^@version\@^$(VERSION)^g" < patchelf.spec.in > patchelf.spec
diff --git a/configure.ac b/configure.ac
index 9987fd7..b37b186 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT(patchelf, m4_esyscmd([echo -n 0.5$VERSION_SUFFIX]))
+AC_INIT(patchelf, m4_esyscmd([echo -n $(cat ./version)$VERSION_SUFFIX]))
 AC_CONFIG_SRCDIR(Makefile.am)
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 
diff --git a/release.nix b/release.nix
index 7d619c9..db820ec 100644
--- a/release.nix
+++ b/release.nix
@@ -14,13 +14,14 @@ let
 
       releaseTools.makeSourceTarball {
         name = "patchelf-tarball";
+        version = builtins.readFile ./version;
         src = patchelfSrc;
         inherit officialRelease;
       };
 
 
     coverage =
-      { tarball ? {path = jobs.tarball {};}
+      { tarball ? jobs.tarball {}
       , nixpkgs ? {path = ../nixpkgs;}
       }:
 
@@ -34,7 +35,7 @@ let
 
 
     build =
-      { tarball ? {path = jobs.tarball {};}
+      { tarball ? jobs.tarball {}
       , nixpkgs ? {path = ../nixpkgs;}
       , system ? "i686-linux"
       }:
@@ -56,6 +57,8 @@ let
     rpm_fedora10i386 = makeRPM_i686 (diskImages: diskImages.fedora10i386) 40;
     rpm_fedora10x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora10x86_64) 40;
     rpm_opensuse103i386 = makeRPM_i686 (diskImages: diskImages.opensuse103i386) 40;
+    rpm_opensuse110i386 = makeRPM_i686 (diskImages: diskImages.opensuse110i386) 40;
+    rpm_opensuse110x86_64 = makeRPM_x86_64 (diskImages: diskImages.opensuse110x86_64) 40;
 
     
     deb_debian40i386 = makeDeb_i686 (diskImages: diskImages.debian40i386) 40;
@@ -76,14 +79,14 @@ let
 
   makeRPM =
     system: diskImageFun: prio:
-    { tarball ? {path = jobs.tarball {};}
+    { tarball ? jobs.tarball {}
     , nixpkgs ? {path = ../nixpkgs;}
     }:
 
     with import nixpkgs.path {inherit system;};
 
     releaseTools.rpmBuild rec {
-      name = "patchelf-rpm-${diskImage.name}";
+      name = "patchelf-rpm";
       src = tarball;
       diskImage = diskImageFun vmTools.diskImages;
       meta = { schedulingPriority = toString prio; };
@@ -95,7 +98,7 @@ let
   
   makeDeb =
     system: diskImageFun: prio:
-    { tarball ? {path = jobs.tarball {};}
+    { tarball ? jobs.tarball {}
     , nixpkgs ? {path = ../nixpkgs;}
     }:
 
diff --git a/version b/version
new file mode 100644
index 0000000..ea2303b
--- /dev/null
+++ b/version
@@ -0,0 +1 @@
+0.5
\ No newline at end of file
-- 
cgit v0.12