Add conflicts with plex-media-server-plexpass-dvr.

This commit is contained in:
Donald Webster
2016-09-13 11:18:33 -07:00
parent a54898e0a0
commit 625fd7552a
2 changed files with 5 additions and 4 deletions
+3 -2
View File
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8 # Generated by mksrcinfo v8
# Tue Sep 13 17:48:45 UTC 2016 # Tue Sep 13 18:18:16 UTC 2016
pkgbase = plex-media-server-plexpass pkgbase = plex-media-server-plexpass
pkgdesc = Plex Media Server (PlexPass version) pkgdesc = Plex Media Server (PlexPass version)
pkgver = 1.1.4.2757 pkgver = 1.1.4.2757
pkgrel = 1 pkgrel = 2
url = https://plex.tv/ url = https://plex.tv/
install = plex-media-server.install install = plex-media-server.install
arch = armv7h arch = armv7h
@@ -12,6 +12,7 @@ pkgbase = plex-media-server-plexpass
license = custom license = custom
provides = plex-media-server provides = plex-media-server
conflicts = plex-media-server conflicts = plex-media-server
conflicts = plex-media-server-plexpass-dvr
options = !emptydirs options = !emptydirs
backup = etc/conf.d/plexmediaserver backup = etc/conf.d/plexmediaserver
source = plexmediaserver.conf.d source = plexmediaserver.conf.d
+2 -2
View File
@@ -13,14 +13,14 @@
pkgname=plex-media-server-plexpass pkgname=plex-media-server-plexpass
pkgver=1.1.4.2757 pkgver=1.1.4.2757
_pkgsum=24ffd60 _pkgsum=24ffd60
pkgrel=1 pkgrel=2
pkgdesc='Plex Media Server (PlexPass version)' pkgdesc='Plex Media Server (PlexPass version)'
arch=('armv7h' 'i686' 'x86_64') arch=('armv7h' 'i686' 'x86_64')
url='https://plex.tv/' url='https://plex.tv/'
license=('custom') license=('custom')
options=('!emptydirs') options=('!emptydirs')
provides=('plex-media-server') provides=('plex-media-server')
conflicts=('plex-media-server') conflicts=('plex-media-server' 'plex-media-server-plexpass-dvr')
backup=('etc/conf.d/plexmediaserver') backup=('etc/conf.d/plexmediaserver')
install='plex-media-server.install' install='plex-media-server.install'
source=('plexmediaserver.conf.d' source=('plexmediaserver.conf.d'