diff options
| author | Chih-Hsuan Yen | 2022-07-02 11:05:49 +0800 |
|---|---|---|
| committer | Chih-Hsuan Yen | 2022-07-02 11:05:49 +0800 |
| commit | 2ea3df2bca21f142b67eedb03aaf739f0cb7fff4 (patch) | |
| tree | 3053fce68c9b2181ecc5bf35b9e5e76f2e4d8868 | |
| parent | 6e9c3f513940cfde3938fd465d464f0bd2c253fd (diff) | |
| download | aur-2ea3df2bca21f142b67eedb03aaf739f0cb7fff4.tar.gz | |
fix conflicts between split packages
Fixes https://aur.archlinux.org/packages/input-leap-git#comment-872110
| -rw-r--r-- | .SRCINFO | 10 | ||||
| -rw-r--r-- | PKGBUILD | 8 |
2 files changed, 9 insertions, 9 deletions
@@ -1,6 +1,6 @@ pkgbase = input-leap-git pkgdesc = Open-source KVM software - pkgver = 2.4.0+178+gfc398830 + pkgver = 2.4.0+197+ga9ffcbec pkgrel = 2 url = https://github.com/input-leap/input-leap arch = x86_64 @@ -37,8 +37,8 @@ pkgname = input-leap-headless-git depends = libxtst depends = libxi depends = openssl - provides = input-leap-headless=2.4.0+178+gfc398830 - provides = barrier-headless=2.4.0+178+gfc398830 + provides = input-leap-headless=2.4.0+197+ga9ffcbec + provides = barrier-headless=2.4.0+197+ga9ffcbec conflicts = input-leap-headless conflicts = barrier-headless @@ -47,7 +47,7 @@ pkgname = input-leap-git depends = input-leap-headless-git depends = avahi depends = qt5-base - provides = input-leap=2.4.0+178+gfc398830 - provides = barrier=2.4.0+178+gfc398830 + provides = input-leap=2.4.0+197+ga9ffcbec + provides = barrier=2.4.0+197+ga9ffcbec conflicts = input-leap conflicts = barrier @@ -5,7 +5,7 @@ _pkgname=input-leap pkgbase=$_pkgname-git pkgname=($_pkgname-headless-git $_pkgname-git) -pkgver=2.4.0+178+gfc398830 +pkgver=2.4.0+197+ga9ffcbec pkgrel=2 pkgdesc="Open-source KVM software" arch=(x86_64) @@ -69,7 +69,7 @@ package_input-leap-headless-git() { install -Dm644 doc/barrier.conf* -t "$pkgdir"/usr/share/doc/$pkgname # Now go and delete the GUI-related files: - for file in /usr/bin/barrier /usr/share/applications /usr/share/icons; do + for file in /usr/bin/barrier /usr/share/applications /usr/share/icons /usr/share/metainfo; do rm -rv "${pkgdir}/${file}" done } @@ -85,7 +85,7 @@ package_input-leap-git() { # Now go and delete files that are already in # input-leap-headless-git: - for file in /usr/bin/barrier{s,c}; do - rm -v "${pkgdir}/${file}" + for file in /usr/bin/barrier{s,c} /usr/share/man; do + rm -rv "${pkgdir}/${file}" done } |