From 625fd7552a8d40df43e037f130a21d67a14e8cbe Mon Sep 17 00:00:00 2001
From: Donald Webster <fryfrog@gmail.com>
Date: Tue, 13 Sep 2016 11:18:33 -0700
Subject: [PATCH] Add conflicts with plex-media-server-plexpass-dvr.

---
 .SRCINFO | 5 +++--
 PKGBUILD | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index ba5f24e..9a84ec0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # 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
 	pkgdesc = Plex Media Server (PlexPass version)
 	pkgver = 1.1.4.2757
-	pkgrel = 1
+	pkgrel = 2
 	url = https://plex.tv/
 	install = plex-media-server.install
 	arch = armv7h
@@ -12,6 +12,7 @@ pkgbase = plex-media-server-plexpass
 	license = custom
 	provides = plex-media-server
 	conflicts = plex-media-server
+	conflicts = plex-media-server-plexpass-dvr
 	options = !emptydirs
 	backup = etc/conf.d/plexmediaserver
 	source = plexmediaserver.conf.d
diff --git a/PKGBUILD b/PKGBUILD
index a5583aa..f4b5742 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,14 +13,14 @@
 pkgname=plex-media-server-plexpass
 pkgver=1.1.4.2757
 _pkgsum=24ffd60
-pkgrel=1
+pkgrel=2
 pkgdesc='Plex Media Server (PlexPass version)'
 arch=('armv7h' 'i686' 'x86_64')
 url='https://plex.tv/'
 license=('custom')
 options=('!emptydirs')
 provides=('plex-media-server')
-conflicts=('plex-media-server')
+conflicts=('plex-media-server' 'plex-media-server-plexpass-dvr')
 backup=('etc/conf.d/plexmediaserver')
 install='plex-media-server.install'
 source=('plexmediaserver.conf.d'