From adbdb0e89c97d8c573a962a7be7cf713e6ea51d2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Sat, 5 May 2018 21:33:25 +0300 Subject: [PATCH] support tar.xz source --- eventum.spec | 12 ++++++------ update-source.sh | 7 ++++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/eventum.spec b/eventum.spec index c43b5e6..eb38079 100644 --- a/eventum.spec +++ b/eventum.spec @@ -3,19 +3,19 @@ %bcond_with order # with experimental order patch %define rel 1 -#define subver 40 -#define githash e965ea80 +%define subver 6 +%define githash fb792422 %define php_min_version 5.6.0 Summary: Eventum Issue / Bug tracking system Summary(pl.UTF-8): Eventum - system śledzenia spraw/błędów Name: eventum -Version: 3.4.4 +Version: 3.4.2 Release: %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel} License: GPL v2+ Group: Applications/WWW -Source0: https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 605fe70ac0d069fdbef65a83a89e8526 -#Source0: https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.gz +#Source0: https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source0: https://github.com/eventum/eventum/releases/download/snapshot/%{name}-%{version}-%{subver}-g%{githash}.tar.xz +# Source0-md5: 959b620f33b3ca66729da53c18e539c4 Source1: %{name}-apache.conf Source2: %{name}-mail-queue.cron Source3: %{name}-mail-download.cron diff --git a/update-source.sh b/update-source.sh index d956e7a..c006f34 100755 --- a/update-source.sh +++ b/update-source.sh @@ -10,8 +10,11 @@ cd "$dir" if [ -f "$1" ]; then rev=$1 + version=${rev#eventum-} + version=${version%%-*} rev=${rev#eventum-*-} rev=${rev%.tar.gz} + rev=${rev%.tar.xz} elif [ "$1" ]; then rev=$1 else @@ -20,7 +23,7 @@ else # save this under some local ref, so repeated calls don't have to fetch everything git update-ref refs/keep-around/snapshot FETCH_HEAD out=$(git show FETCH_HEAD -s) - tarball=$(echo "$out" | grep -o 'eventum-.*\.tar.gz') + tarball=$(echo "$out" | grep -oE 'eventum-.*\.tar.(gz|xz)') url="$repo_url/releases/download/snapshot/$tarball" test -f "$tarball" || wget -c $url exec "$0" "$tarball" @@ -44,3 +47,5 @@ sed -i -re " s/^[#%](define[ \t]+githash[ \t]+)[0-9a-fg]+\$/%\1$githash/ " $specfile ../builder -ncs -5 $specfile + +git commit -am "up to $version-$rev" -- 2.43.0