summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDonald Webster2019-03-20 22:02:21 -0700
committerDonald Webster2019-03-20 22:02:21 -0700
commite2cbb93630f2cd87731585c1e38e27a17cbed478 (patch)
treece6c312ebb0a3a296d43ee9a56d53393f733961e
parentabe5d7feecb59542e12a2b8bcf1325ae5308c2c1 (diff)
downloadaur-e2cbb93630f2cd87731585c1e38e27a17cbed478.tar.gz
Dont conflict w/ itself.
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD3
2 files changed, 2 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1290a89adc75..45b09a0234f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,8 +8,7 @@ pkgbase = plex-media-server
arch = armv7h
arch = aarch64
license = custom
- provides = plex-media-server
- conflicts = plex-media-server
+ conflicts = plex-media-server-plexpass
options = !emptydirs
source = plexmediaserver.conf.d
source = plexmediaserver.service
diff --git a/PKGBUILD b/PKGBUILD
index 1ff17f06c7db..ebfc57c96258 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,7 @@ arch=('x86_64' 'armv7h' 'aarch64')
url='https://plex.tv/'
license=('custom')
options=('!emptydirs')
-provides=('plex-media-server')
-conflicts=('plex-media-server')
+conflicts=('plex-media-server-plexpass')
# Commented to override user version
#backup=('etc/conf.d/plexmediaserver')
install='plex-media-server.install'