summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Moore2016-02-02 09:59:48 -0500
committerTom Moore2016-02-02 09:59:48 -0500
commit3e0f4e27029e2d8f4b1595b7087ca6c9a9bcf48e (patch)
treeaf262f230a23e1735306917a52ae857d24e674ba
parent1035b24929c77249b81373ff4d660ed621da7a9c (diff)
downloadaur-3e0f4e27029e2d8f4b1595b7087ca6c9a9bcf48e.tar.gz
Changed makedepends to makedepends_i686 and makedepends_x86_64. Condensed conditionals into single lines.
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD19
2 files changed, 9 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c95629240e3c..ec3dc95a5bcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Tue Feb 2 01:42:32 UTC 2016
+# Tue Feb 2 14:59:43 UTC 2016
pkgbase = plex-media-server
pkgdesc = Plex Media Server
pkgver = 0.9.15.2.1663
- pkgrel = 3
+ pkgrel = 4
url = https://plex.tv/
install = plex-media-server.install
arch = arm
@@ -11,7 +11,6 @@ pkgbase = plex-media-server
arch = i686
arch = x86_64
license = custom
- makedepends = prelink
depends = systemd
conflicts = plexmediaserver
conflicts = plexmediaserver-plexpass
@@ -28,8 +27,10 @@ pkgbase = plex-media-server
source_armv7h = https://downloads.plex.tv/plex-media-server/0.9.15.2.1663-7efd046/PlexMediaServer-0.9.15.2.1663-7efd046-arm7.spk
sha256sums_armv7h = 704a63c14329f99b941749ec4fd9285ff43e3eb53ffa6910295143b3c6b1f8ba
source_i686 = https://downloads.plex.tv/plex-media-server/0.9.15.2.1663-7efd046/plexmediaserver-0.9.15.2.1663-7efd046.i386.rpm
+ makedepends_i686 = prelink
sha256sums_i686 = 0ee9891b82563a1351001ed6f5a20011a887d9d81c9d2092dad2965240ee5d5a
source_x86_64 = https://downloads.plex.tv/plex-media-server/0.9.15.2.1663-7efd046/plexmediaserver-0.9.15.2.1663-7efd046.x86_64.rpm
+ makedepends_x86_64 = prelink
sha256sums_x86_64 = f06225807c6284914bca1cfaec4490d594c53a2c794d916b321658388d40f9cf
pkgname = plex-media-server
diff --git a/PKGBUILD b/PKGBUILD
index 04adf612bdd7..f37cff07c683 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,12 +9,14 @@
pkgname=plex-media-server
pkgver=0.9.15.2.1663
_pkgsum=7efd046
-pkgrel=3
+pkgrel=4
pkgdesc='Plex Media Server'
arch=('arm' 'armv7h' 'i686' 'x86_64')
url='https://plex.tv/'
license=('custom')
depends=('systemd')
+makedepends_i686=('prelink')
+makedepends_x86_64=('prelink')
replaces=('plexmediaserver')
conflicts=('plexmediaserver' 'plexmediaserver-plexpass')
backup=('etc/conf.d/plexmediaserver')
@@ -34,22 +36,11 @@ sha256sums_armv7h=('704a63c14329f99b941749ec4fd9285ff43e3eb53ffa6910295143b3c6b1
sha256sums_i686=('0ee9891b82563a1351001ed6f5a20011a887d9d81c9d2092dad2965240ee5d5a')
sha256sums_x86_64=('f06225807c6284914bca1cfaec4490d594c53a2c794d916b321658388d40f9cf')
-# Fix for arm compilation provided by tahayassen
- if [[ $CARCH != arm* ]]; then
- makedepends=('prelink')
- fi
-
prepare() {
- if [[ $CARCH =~ arm* ]]; then
- mkdir -p usr/lib/plexmediaserver
- tar -xf package.tgz -C usr/lib/plexmediaserver/
- fi
+ [[ $CARCH =~ arm* ]] && mkdir -p usr/lib/plexmediaserver && tar -xf package.tgz -C usr/lib/plexmediaserver/
#Fix for SELinux and Grsecurity
-
- if [[ $CARCH != arm* ]]; then
- execstack -c usr/lib/plexmediaserver/libgnsdk_dsp.so*
- fi
+ [[ $CARCH != arm* ]] && execstack -c usr/lib/plexmediaserver/libgnsdk_dsp.so*
}
package() {