From 8673315fd846338fd52f16c6b6c4017e20f7d593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Sun, 29 Nov 2020 18:56:43 +0700 Subject: [PATCH] freedroidRPG: remove noarch --- srcpkgs/freedroidRPG-data | 1 - srcpkgs/freedroidRPG/template | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) delete mode 120000 srcpkgs/freedroidRPG-data diff --git a/srcpkgs/freedroidRPG-data b/srcpkgs/freedroidRPG-data deleted file mode 120000 index d5d81bcaf86..00000000000 --- a/srcpkgs/freedroidRPG-data +++ /dev/null @@ -1 +0,0 @@ -freedroidRPG \ No newline at end of file diff --git a/srcpkgs/freedroidRPG/template b/srcpkgs/freedroidRPG/template index 8d4fbd70207..e3e7a01fd33 100644 --- a/srcpkgs/freedroidRPG/template +++ b/srcpkgs/freedroidRPG/template @@ -1,20 +1,20 @@ # Template file for 'freedroidRPG' pkgname=freedroidRPG version=0.16.1 -revision=1 +revision=2 wrksrc=${pkgname,,}-${version} build_style=gnu-configure hostmakedepends="pkg-config python" makedepends="SDL_gfx-devel SDL_image-devel SDL_mixer-devel libjpeg-turbo-devel libvorbis-devel lua53-devel libpng-devel" -depends="${pkgname}-data>=${version}_${revision}" short_desc="Role playing game featuring Tux and evil robots" maintainer="Jürgen Buchmüller " -license="GPL-3" +license="GPL-2.0-or-later" homepage="http://www.freedroid.org/" distfiles="http://ftp.osuosl.org/pub/freedroid/${pkgname}-${version%.*}/${pkgname}-${version}.tar.gz" checksum=426df175034b12095e7498fd80c907e507667c960ee1da331d9e5566d1b09358 python_version=2 +replaces="freedroidRPG-data>=0" if [ "$XBPS_TARGET_LIBC" = "musl" ]; then configure_args+=" --disable-backtrace" @@ -41,11 +41,3 @@ post_install() { sed -i ${PKGDESTDIR}/usr/share/applications/${pkgname,,}.desktop \ -e "/^Exec/s;=${pkgname};=${script};" } - -freedroidRPG-data_package() { - short_desc+=" - data files" - archs=noarch - pkg_install() { - vmove usr/share/freedroidrpg - } -}