From 0488b164de85e2fe8dc0bd67c3a0c3dfe9343a10 Mon Sep 17 00:00:00 2001
From: Andreas Baumann <mail@andreasbaumann.cc>
Date: Thu, 8 Feb 2018 08:20:46 +0100
Subject: reverted naming of shims for gcc-lib, glibc and ca-certificates

---
 create_ca-certificates-utils_shim.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'create_ca-certificates-utils_shim.sh')

diff --git a/create_ca-certificates-utils_shim.sh b/create_ca-certificates-utils_shim.sh
index 2f73102..dbaacbf 100755
--- a/create_ca-certificates-utils_shim.sh
+++ b/create_ca-certificates-utils_shim.sh
@@ -18,15 +18,13 @@ if test ! -f $STAGE1_CHROOT/packages/$TARGET_CPU/ca-certificates-utils-shim-2017
 	size=$(du -sk --apparent-size pkg/)
 	size="$(( ${size%%[^0-9]*} * 1024 ))"
 	cat > pkg/ca-certificates-utils-shim/.PKGINFO <<EOF
-pkgname = ca-certificates-utils-shim
+pkgname = ca-certificates-utils
 pkgver = 20170307-1
 pkgdesc = Common CA certificates (utilities, from host machine)
 url = http://pkgs.fedoraproject.org/cgit/rpms/ca-certificates.git
 builddate = $BUILDDATE
 size = $size
 arch = any
-provides = ca-certificates-utils
-conflict = ca-certificates-utils
 EOF
 
 	cd pkg/ca-certificates-utils-shim || exit 1
@@ -38,7 +36,7 @@ EOF
 	rm -rf  $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db*
 	rm -rf  $STAGE1_CHROOT/packages/$TARGET_CPU/temp.files*
 	repo-add $STAGE1_CHROOT/packages/$TARGET_CPU/temp.db.tar.gz $STAGE1_CHROOT/packages/$TARGET_CPU/*pkg.tar.xz
-	sudo pacman --force --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy ca-certificates-utils-shim
+	sudo pacman --force --noconfirm --config $STAGE1_CHROOT/etc/pacman.conf -r $STAGE1_CHROOT -Syy ca-certificates-utils
 
 fi
 
-- 
cgit v1.2.3-54-g00ecf