From 5c7bc90c4643ad1128268398921fe27beab2bb7b Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 30 Sep 2011 13:16:22 +0200 Subject: [PATCH] Use %DIST% keyword instead of plain DIST --- create_symlinks_in_rpms_to_install_dir.sh | 4 ++-- version_core | 2 +- version_gui | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/create_symlinks_in_rpms_to_install_dir.sh b/create_symlinks_in_rpms_to_install_dir.sh index 0796238..7dd5959 100755 --- a/create_symlinks_in_rpms_to_install_dir.sh +++ b/create_symlinks_in_rpms_to_install_dir.sh @@ -6,14 +6,14 @@ SRC_ROOT=../.. : DIST=fc14 rm -fr rpms_to_install/* -VERSION_CORE=$(cat version_core | sed "s/DIST/$DIST/") +VERSION_CORE=$(cat version_core | sed "s/%DIST%/$DIST/") ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-appvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-appvm ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-appvm-libs-$VERSION_CORE.rpm rpms_to_install/qubes-core-appvm-libs ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-commonvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-commonvm ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-netvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-netvm ln -s $SRC_ROOT/core/rpm/x86_64/qubes-core-proxyvm-$VERSION_CORE.rpm rpms_to_install/qubes-core-proxyvm -VERSION_GUI=$(cat version_gui | sed "s/DIST/$DIST/") +VERSION_GUI=$(cat version_gui | sed "s/%DIST%/$DIST/") ln -s $SRC_ROOT/gui/rpm/x86_64/qubes-gui-vm-$VERSION_GUI.rpm rpms_to_install/qubes-gui-vm VERSION_XEN=$(cat version_xen) diff --git a/version_core b/version_core index 31b594c..e97e06d 100644 --- a/version_core +++ b/version_core @@ -1 +1 @@ -1.6.30-1.DIST.x86_64 +1.6.30-1.%DIST%.x86_64 diff --git a/version_gui b/version_gui index 627e722..d66ccb1 100644 --- a/version_gui +++ b/version_gui @@ -1 +1 @@ -1.3.6-1.DIST.x86_64 +1.3.6-1.%DIST%.x86_64