From bfbcd4dbb4bf5c4fff83ebb41195616a1b57dc93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=A0=E8=BD=B6=E7=BE=A4?= Date: Thu, 5 Nov 2015 13:49:33 +0800 Subject: [PATCH 1/2] fix genrpm.sh --- rpm/genrpm.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpm/genrpm.sh b/rpm/genrpm.sh index 3bc2ff60..052eee42 100755 --- a/rpm/genrpm.sh +++ b/rpm/genrpm.sh @@ -58,8 +58,8 @@ pushd `git rev-parse --show-toplevel` git archive v${version} --format=${format} --prefix=${name}-${version}/ -o rpm/SOURCES/${name}-${version}.${format} pushd rpm -sed -i -e "s/^\(Version: \).*$/\1${version}/" \ - -e "s/^\(Source0: %{name}-%{version}\.\).*$/\1${format}/" \ +sed -i -e "s/^\(Version: \).*$/\1${version}/" \ + -e "s/^\(Source0: \).*$/\1${name}-${version}.${format}/" \ SPECS/${spec_name} rpmbuild -bb SPECS/${spec_name} --define "%_topdir `pwd`" From 41b1146360b0627e40b5a2d078354cbbd0a24ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=83=A0=E8=BD=B6=E7=BE=A4?= Date: Thu, 5 Nov 2015 13:50:24 +0800 Subject: [PATCH 2/2] update Version to 2.4.1 --- rpm/SPECS/shadowsocks-libev.spec | 2 +- rpm/genrpm.sh | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rpm/SPECS/shadowsocks-libev.spec b/rpm/SPECS/shadowsocks-libev.spec index 4d0f6325..580aaf2f 100644 --- a/rpm/SPECS/shadowsocks-libev.spec +++ b/rpm/SPECS/shadowsocks-libev.spec @@ -1,5 +1,5 @@ Name: shadowsocks-libev -Version: 2.4.0 +Version: 2.4.1 Release: 1%{?dist} Summary: A lightweight and secure socks5 proxy diff --git a/rpm/genrpm.sh b/rpm/genrpm.sh index 052eee42..fd6f4d93 100755 --- a/rpm/genrpm.sh +++ b/rpm/genrpm.sh @@ -7,12 +7,12 @@ show_help() echo echo -e "Options:" echo -e " -h show this help." - echo -e " -v with argument version (2.4.0 by default)." + echo -e " -v with argument version (2.4.1 by default)." echo -e " -f with argument format (tar.xz by default) used by git archive." echo echo -e "Examples:" - echo -e " to build base on version \`2.4.0' with format \`tar.xz', run:" - echo -e " `basename $0` -f tar.xz -v 2.4.0" + echo -e " to build base on version \`2.4.1' with format \`tar.xz', run:" + echo -e " `basename $0` -f tar.xz -v 2.4.1" } while getopts "hv:f:" opt @@ -48,7 +48,7 @@ get_att_val() fi } -get_att_val version "2.4.0" +get_att_val version "2.4.1" get_att_val format "tar.xz" name="shadowsocks-libev"