summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcell Meszaros2022-03-25 09:38:29 +0100
committerMarcell Meszaros2022-03-25 09:38:29 +0100
commit85dace77fffbeddece52b42df4ebcdaa1b2316d4 (patch)
tree6ba24ea2b557e6c2afd5c96cc1e41c2db626a8ea
parent4d685fdd141cb841714674a97b54d778039b4ca8 (diff)
downloadaur-85dace77fffbeddece52b42df4ebcdaa1b2316d4.tar.gz
add conflicts=freerdp-102
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD2
2 files changed, 2 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 631dfd56f0b4..60088ccaf2c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -26,6 +26,7 @@ pkgbase = freerdp-1.1.0
provides = freerdp
conflicts = freerdp
conflicts = freerdp-git
+ conflicts = freerdp-102
source = FreeRDP-1.1.0-590fa7dbf6ecab58fb70dd57ef6d3ecfdbfc3c4f.tar.gz::https://github.com/FreeRDP/FreeRDP/archive/590fa7dbf6ecab58fb70dd57ef6d3ecfdbfc3c4f.tar.gz
source = 1001_hide-internal-symbols.patch
source = 1002_update-pkg-config-file.patch
diff --git a/PKGBUILD b/PKGBUILD
index 62801c107c64..5e30384943d0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ license=('GPL')
depends=('openssl-1.0' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage'
'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv' 'libpulse')
makedepends=('krb5' 'cmake' 'xorgproto' 'xmlto' 'docbook-xsl')
-conflicts=('freerdp' 'freerdp-git')
+conflicts=('freerdp' 'freerdp-git' 'freerdp-102')
provides=('freerdp')
_commit='590fa7dbf6ecab58fb70dd57ef6d3ecfdbfc3c4f'
source=("${_projname}-${pkgver}-${_commit}.tar.gz::https://github.com/${_projname}/${_projname}/archive/${_commit}.tar.gz"