diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2015-12-18 13:19:40 +0100 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2015-12-18 13:24:21 +0100 |
| commit | cd7e5b31dc920bd9a2909e7c5977a2e8e4fdb388 (patch) | |
| tree | 65734665ea45f32964cb5dd75ee4ff818d307d8d | |
| parent | fcd9a28647ea0fc87b52950ac3daafdc5b6ce74f (diff) | |
| download | clufter-cd7e5b31dc920bd9a2909e7c5977a2e8e4fdb388.tar.gz clufter-cd7e5b31dc920bd9a2909e7c5977a2e8e4fdb388.tar.xz clufter-cd7e5b31dc920bd9a2909e7c5977a2e8e4fdb388.zip | |
run-sdist/clufter.spec: fix tests archive arangement
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rwxr-xr-x | __root__/run-sdist | 7 | ||||
| -rw-r--r-- | misc/clufter.spec | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/__root__/run-sdist b/__root__/run-sdist index d05652c..06a111a 100755 --- a/__root__/run-sdist +++ b/__root__/run-sdist @@ -7,10 +7,9 @@ git archive --format=tar HEAD \ cd $(mktemp -d '/var/tmp/pkg-XXXXX') \ && tar xf - \ && python2 setup.py sdist -d "${OLDPWD}/__root__/dist" \ - && tar cJpf "${OLDPWD}/__root__/dist/$( - ls -1t "${OLDPWD}/__root__/dist" | head -n1 \ - | sed s'|\.tar\.gz|-tests.tar.xz|' - )" --transform 's|__root__/||' -- \ + && T=$(ls -1t "${OLDPWD}/__root__/dist" | sed -n '1s|\.tar\.gz||p') \ + && tar cJpf "${OLDPWD}/__root__/dist/${T}-tests.tar.xz" \ + --transform "s|\(__root__/\)\?|${T}/|" -- \ tests/ _go _gone __root__/run-tests ) echo "New source tarballs created: $(ls -1t __root__/dist | head -n2)" diff --git a/misc/clufter.spec b/misc/clufter.spec index 10fd60f..6c43293 100644 --- a/misc/clufter.spec +++ b/misc/clufter.spec @@ -195,7 +195,7 @@ formats and filters. %prep %if "%{clufter_version}" == "%{clufter_version_norm}" %if "0%{clufter_check}" == 2 -%autosetup -p1 -S git -a 1 +%autosetup -p1 -S git -b 1 %else %autosetup -p1 -S git %endif |