diff --git a/non-ntk-snapshot.sh b/non-ntk-snapshot.sh deleted file mode 100644 index 90cd1b3..0000000 --- a/non-ntk-snapshot.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash - -# $1 - revision number to checkout. -: ${1?"You must either provide desired revision number \"X\" to checkout: `basename $0` X - or fetch the latest revision by: `basename $0` HEAD"} - -set -e - -tmp=$(mktemp -d) - -trap cleanup EXIT -cleanup() { - set +e - [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" -} - -unset CDPATH -pwd=$(pwd) -name=non-ntk -version=1.3.0 - -pushd "$tmp" >/dev/null -echo "Fetching git revision: $1" -git clone git://git.tuxfamily.org/gitroot/non/fltk.git $name-$version |tee $name.stdout -cd $name-$version -git reset $1 -rm -rf .git* .waf* -cd .. -rm -rf $name.stdout -tar jcf "$pwd"/$name-$version-git$1.tar.bz2 $name-$version -echo "Written: $name-$version-git$1.tar.bz2" -popd >/dev/null diff --git a/non-ntk.changes b/non-ntk.changes index 80366d9..842255b 100644 --- a/non-ntk.changes +++ b/non-ntk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Feb 18 12:26:33 UTC 2021 - Edgar Aichinger + +- remove non-ntk-snapshot.sh from package sources (bsc #1182396) + (unused leftover from original fedora package, we don't do snapshot packaging anyways) + ------------------------------------------------------------------- Wed Jul 1 06:46:31 UTC 2020 - Edgar Aichinger diff --git a/non-ntk.spec b/non-ntk.spec index 2e2475b..a8ef425 100644 --- a/non-ntk.spec +++ b/non-ntk.spec @@ -26,11 +26,8 @@ License: GPL-2.0-or-later Group: Development/Libraries/C and C++ URL: https://non.tuxfamily.org/ Source0: non-ntk-%{version}.tar.bz2 -# script to create source tarball from git -# sh non-snapshot.sh $(rev) -Source1: non-ntk-snapshot.sh # no desktop file in tarball -Source2: non-ntk-1.3.0-fluid.desktop +Source1: non-ntk-1.3.0-fluid.desktop # sent upstream via email Patch1: non-ntk-1.3.0-fsf.patch Patch2: non-ntk-unused-shlib.patch @@ -92,7 +89,7 @@ LDFLAGS="%{?__global_ldflags}" ./waf -v configure --prefix=%{_prefix} \ %install ./waf -v install --destdir=%{buildroot} install -d -m 0755 %{buildroot}%{_datadir}/applications -install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/applications/ntk-fluid.desktop +install -D -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/ntk-fluid.desktop rm %{buildroot}%{_libdir}/libntk*.a* %if 0%{?suse_version}