From 222ebe12302110d690a990b1c5ea592e62e7b37a Mon Sep 17 00:00:00 2001 From: Donald Webster Date: Sat, 4 Feb 2017 07:31:14 -0800 Subject: [PATCH] Add conflict with hwenc, don't bump pkgrel. --- .SRCINFO | 3 ++- PKGBUILD | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d031ca5..cde4e90 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,5 +1,5 @@ # Generated by mksrcinfo v8 -# Fri Feb 3 21:43:17 UTC 2017 +# Sat Feb 4 15:30:49 UTC 2017 pkgbase = plex-media-server-plexpass pkgdesc = Plex Media Server (PlexPass version) pkgver = 1.3.4.3285 @@ -13,6 +13,7 @@ pkgbase = plex-media-server-plexpass provides = plex-media-server conflicts = plex-media-server conflicts = plex-media-server-plexpass-dvr + conflicts = plex-media-server-plexpass-hwenc options = !emptydirs backup = etc/conf.d/plexmediaserver source = plexmediaserver.conf.d diff --git a/PKGBUILD b/PKGBUILD index 9e18991..a777f48 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,7 +22,7 @@ url='https://plex.tv/' license=('custom') options=('!emptydirs') provides=('plex-media-server') -conflicts=('plex-media-server' 'plex-media-server-plexpass-dvr') +conflicts=('plex-media-server' 'plex-media-server-plexpass-dvr' 'plex-media-server-plexpass-hwenc') backup=('etc/conf.d/plexmediaserver') install='plex-media-server.install' source=('plexmediaserver.conf.d'