From 92f820577546180f3bfbf65d8558fc57f33cc966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Mon, 5 Oct 2020 07:27:02 +0700
Subject: [PATCH] Cataclysm-DDA: drop noarch

---
 srcpkgs/Cataclysm-DDA-tiles-data |  1 -
 srcpkgs/Cataclysm-DDA/template   | 15 ++++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 120000 srcpkgs/Cataclysm-DDA-tiles-data

diff --git a/srcpkgs/Cataclysm-DDA-tiles-data b/srcpkgs/Cataclysm-DDA-tiles-data
deleted file mode 120000
index b0eb39be3d..0000000000
--- a/srcpkgs/Cataclysm-DDA-tiles-data
+++ /dev/null
@@ -1 +0,0 @@
-Cataclysm-DDA/
\ No newline at end of file
diff --git a/srcpkgs/Cataclysm-DDA/template b/srcpkgs/Cataclysm-DDA/template
index 6b7ef57eed..218cb89ac3 100644
--- a/srcpkgs/Cataclysm-DDA/template
+++ b/srcpkgs/Cataclysm-DDA/template
@@ -1,7 +1,7 @@
 # Template file for 'Cataclysm-DDA'
 pkgname=Cataclysm-DDA
 version=0.E
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DRELEASE=1 $(vopt_bool backtrace BACKTRACE) -DUSE_HOME_DIR=1 -DPREFIX=/usr"
 hostmakedepends="gettext pkg-config"
@@ -23,8 +23,9 @@ case $XBPS_TARGET_MACHINE in
 	*) build_options_default+=" backtrace";;
 esac
 
+subpackages="Cataclysm-DDA-data"
 if [ "$build_option_tiles" ]; then
-	subpackages="Cataclysm-DDA-tiles-data Cataclysm-DDA-tiles"
+	subpackages+=" Cataclysm-DDA-tiles"
 	post_configure() {
 		local cmake_builddir=build-tiles
 		configure_args+=" -DTILES=ON -DSOUND=ON"
@@ -41,7 +42,6 @@ if [ "$build_option_tiles" ]; then
 		do_install
 	}
 fi
-subpackages+=" Cataclysm-DDA-data"
 
 do_check() {
 	: #needs tap++.h
@@ -50,15 +50,9 @@ do_check() {
 Cataclysm-DDA-tiles_package() {
 	short_desc+=" - SDL tiles version"
 	depends="Cataclysm-DDA-data Cataclysm-DDA-tiles-data"
+	replaces="Cataclysm-DDA-tiles-data>=0"
 	pkg_install() {
 		vmove usr/bin/cataclysm-tiles
-	}
-}
-
-Cataclysm-DDA-tiles-data_package() {
-	short_desc+=" - tiles data files"
-	archs=noarch
-	pkg_install() {
 		vmove usr/share/cataclysm-dda/gfx
 		vmove usr/share/cataclysm-dda/sound
 	}
@@ -66,7 +60,6 @@ Cataclysm-DDA-tiles-data_package() {
 
 Cataclysm-DDA-data_package() {
 	short_desc+=" - data files"
-	archs=noarch
 	pkg_install() {
 		vmove usr/share
 	}