summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-08-03 13:45:39 -0400
committerDavid P <megver83@parabola.nu>2020-08-03 13:45:39 -0400
commit750b5c220d5b4b127cb2246789f55e5bb45092a1 (patch)
tree5b6fac3a63ab2102673ec62098661cb73d30061d
parentdf8e506430eace494269045027a6de9b177ab286 (diff)
libre/parabolaiso: conflict with mkinitcpio-archiso
Signed-off-by: David P <megver83@parabola.nu>
-rw-r--r--libre/parabolaiso/PKGBUILD11
1 files changed, 7 insertions, 4 deletions
diff --git a/libre/parabolaiso/PKGBUILD b/libre/parabolaiso/PKGBUILD
index 9036d1490..1e635682c 100644
--- a/libre/parabolaiso/PKGBUILD
+++ b/libre/parabolaiso/PKGBUILD
@@ -7,15 +7,12 @@
pkgbase=parabolaiso
pkgname=(parabolaiso mkinitcpio-parabolaiso)
pkgver=46.1
-pkgrel=1
+pkgrel=2
pkgdesc='Tools for creating Parabola GNU/Linux-libre live and install iso images'
arch=('any')
license=('GPL3')
url='https://git.parabola.nu/parabolaiso.git/'
makedepends=('git')
-provides=("archiso=$pkgver")
-conflicts=('archiso')
-replaces=(${conflicts[@]})
source=("git+https://git.parabola.nu/packages/parabolaiso.git#tag=v${pkgver}?signed")
sha256sums=('SKIP')
validpgpkeys=(6DB9C4B4F0D8C0DC432CF6E4227CA7C556B2BA78) # David P.
@@ -25,6 +22,9 @@ package_parabolaiso() {
'squashfs-tools')
optdepends=('edk2-ovmf: for emulating UEFI with run_archiso'
'qemu: for run_parabolaiso')
+ provides=("archiso=$pkgver")
+ conflicts=('archiso')
+ replaces=(${conflicts[@]})
cd "${pkgbase}"
make DESTDIR="${pkgdir}" install
}
@@ -32,6 +32,9 @@ package_parabolaiso() {
package_mkinitcpio-parabolaiso() {
pkgdesc='Mkinitcpio hooks and scripts for parabolaiso'
depends=('mkinitcpio')
+ provides=("mkinitcpio-archiso=$pkgver")
+ conflicts=('mkinitcpio-archiso')
+ replaces=(${conflicts[@]})
cd "${pkgbase}"
make DESTDIR="${pkgdir}" install-initcpio
}