diff options
| -rwxr-xr-x | makedeps.sh | 9 | ||||
| -rwxr-xr-x | makesrc.sh | 20 | ||||
| -rw-r--r-- | valkey-bloom.spec | 8 |
3 files changed, 9 insertions, 28 deletions
diff --git a/makedeps.sh b/makedeps.sh index 99ce444..3369a2f 100755 --- a/makedeps.sh +++ b/makedeps.sh @@ -3,9 +3,9 @@ NAME=$(sed -n '/^Name:/{s/.* //;p}' *.spec) VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) MODULE=$(sed -n '/^%global gh_proj/{s/.* //;p}' $NAME.spec) -if [ -f $NAME-$VERSION.tgz ]; then +if [ -f $NAME-$VERSION.tar.gz ]; then echo "+ Unpack" - tar xf $NAME-$VERSION.tgz + tar xf $NAME-$VERSION.tar.gz pushd $MODULE-$VERSION echo "+ Fetch" @@ -14,6 +14,9 @@ if [ -f $NAME-$VERSION.tgz ]; then echo "+ Pack" tar czf ../$NAME-deps-$VERSION.tgz mycargo popd + + echo "+ Clean" + rm -r $MODULE-$VERSION else - echo $NAME-$VERSION.tgz missing + echo $NAME-$VERSION.tar.gz missing fi diff --git a/makesrc.sh b/makesrc.sh deleted file mode 100755 index 1a12fe7..0000000 --- a/makesrc.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_vend/{s/.* //;p}' $NAME.spec) -PROJECT=$(sed -n '/^%global gh_proj/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) - -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" - -echo "Cloning..." -rm -rf $PROJECT-$VERSION -git clone --branch $VERSION --recursive https://github.com/$OWNER/$PROJECT.git $PROJECT-$VERSION - -echo "Archiving..." -tar czf $NAME-$VERSION.tgz --exclude-vcs $PROJECT-$VERSION - -echo "Cleaning..." -rm -rf $PROJECT-$VERSION - -echo "Done." diff --git a/valkey-bloom.spec b/valkey-bloom.spec index 5f76dc1..b8eacff 100644 --- a/valkey-bloom.spec +++ b/valkey-bloom.spec @@ -15,20 +15,18 @@ %global forgeurl https://github.com/%{gh_vend}/%{gh_proj} #global commit afe5de4ce52bb2b80af565a6f297bf330a65d0d8 %global tag %{version} -# for EL-8 to avoid TAG usage -%global archivename %{gh_proj}-%{version} Name: valkey-bloom Version: 1.0.0 +%forgemeta Release: 1%{?dist} Summary: Probabilistic data structures # this module is BSD-3-Clause # rust lilbraries are Apache-2.0, MIT, BSD-2-CLAUSE License: BSD-3-Clause AND BSD-2-CLAUSE AND Apache-2.0 AND MIT URL: %{forgeurl} -Source0: %{name}-%{version}.tgz -Source1: makesrc.sh -# get full git snapshot with submodules +Source0: %{forgesource} +# get rust dependencies Source2: %{name}-deps-%{version}.tgz Source3: makedeps.sh |