From cb2b13975f178c3d1fd77e2edb3754b6f5e46720da44f24bfbabb5eab14bfc03 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Mon, 2 Nov 2009 15:08:11 +0000 Subject: [PATCH] Accepting request 23586 from Base:System Copy from Base:System/kbd based on submit request 23586 from user michal-m OBS-URL: https://build.opensuse.org/request/show/23586 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kbd?expand=0&rev=31 --- kbd-1.14.1.tar.bz2 | 4 ++-- kbd.changes | 5 +++++ kbd.spec | 2 +- repack_kbd.sh | 5 +++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/kbd-1.14.1.tar.bz2 b/kbd-1.14.1.tar.bz2 index 9abe604..4ba7345 100644 --- a/kbd-1.14.1.tar.bz2 +++ b/kbd-1.14.1.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:93cbc8521404932e3db6a687b1e1a5580426aa4c28a92712fb585f5414a5a9c4 -size 777427 +oid sha256:43ff08968d189b2cdddbea00797a75f3a6d6b79f100e22ea2663d5d968448c09 +size 789357 diff --git a/kbd.changes b/kbd.changes index 2bc7677..3ba38dd 100644 --- a/kbd.changes +++ b/kbd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 2 13:48:13 CET 2009 - mmarek@suse.cz + +- do not include '.' in the repacked tarball (bnc#544975). + ------------------------------------------------------------------- Thu Oct 1 15:09:51 CEST 2009 - mmarek@suse.cz diff --git a/kbd.spec b/kbd.spec index 324e6c3..c97b99b 100644 --- a/kbd.spec +++ b/kbd.spec @@ -24,7 +24,7 @@ License: GPL v2 or later Group: System/Console AutoReqProv: on Version: 1.14.1 -Release: 19 +Release: 20 Summary: Keyboard and Font Utilities Source: kbd-%{version}.tar.bz2 Source1: kbd_fonts.tar.bz2 diff --git a/repack_kbd.sh b/repack_kbd.sh index 1513a72..8ed40aa 100644 --- a/repack_kbd.sh +++ b/repack_kbd.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # # repackage kbd source tar ball, # to remove fonts that forbid commercial distribution. @@ -8,6 +8,7 @@ tmpdir=`mktemp -d` in="$1" +name="${in%.tar.*}" # recent gnu tar can autodetect gzip / bzip2 if ! tar xf "$in" -C $tmpdir; then @@ -17,6 +18,6 @@ fi echo removing files... find $tmpdir -iname \*agafari\* | tee /dev/tty | xargs rm -tar jcf $in-repack.tar.bz2 -C $tmpdir . +tar jcf $name-repack.tar.bz2 -C $tmpdir $name rm -rf $tmpdir