Fix optdepends, fix license, use ${} for all variables

2 files changed, 25 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 44351237b5ce..1996d1a1864a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,23 @@
 pkgbase = syncplay-git
 	pkgdesc = synchronize watching movies on mplayer2, vlc, mpv, and mpc-hc on many computers
 	pkgver = 1.7.1.r3.gb22c9ab
-	pkgrel = 1
+	pkgrel = 2
 	url = http://syncplay.pl/
 	arch = any
-	license = Apache
+	license = Apache-2.0
 	makedepends = git
 	depends = hicolor-icon-theme
 	depends = python
 	depends = python-twisted
+	optdepends = mplayer2: media player
+	optdepends = mpv: media player
 	optdepends = pyside6: GUI
-	optdepends = python-service-identity: TLS
 	optdepends = python-certifi: TLS
+	optdepends = python-pem: TLS
+	optdepends = python-pyopenssl: TLS
+	optdepends = python-pyqt5: GUI
+	optdepends = python-service-identity: TLS
+	optdepends = vlc: media player
 	provides = syncplay
 	conflicts = syncplay
 	backup = etc/syncplay/server.conf
diff --git a/PKGBUILD b/PKGBUILD
index 5beafe5ac876..d232f9bb8392 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,26 @@
 
 pkgname=syncplay-git
 pkgver=1.7.1.r3.gb22c9ab
-pkgrel=1
+pkgrel=2
 pkgdesc="synchronize watching movies on mplayer2, vlc, mpv, and mpc-hc on many computers"
 arch=('any')
 url="http://syncplay.pl/"
-license=('Apache')
+license=('Apache-2.0')
 depends=('hicolor-icon-theme' 'python' 'python-twisted')
-optdepends=('pyside6: GUI'
+optdepends=('mplayer2: media player'
+            'mpv: media player'
+            'pyside6: GUI'
+            'python-certifi: TLS'
+            'python-pem: TLS'
+            'python-pyopenssl: TLS'
+            'python-pyqt5: GUI'
             'python-service-identity: TLS'
-            'python-certifi: TLS')
+            'vlc: media player')
 makedepends=('git')
 provides=('syncplay')
 conflicts=('syncplay')
 backup=("etc/syncplay/server.conf")
-source=("$pkgname"::'git+https://github.com/Syncplay/syncplay.git'
+source=("${pkgname}"::'git+https://github.com/Syncplay/syncplay.git'
         syncplay@.service
         server.conf)
 sha256sums=('SKIP'
@@ -23,20 +29,20 @@ sha256sums=('SKIP'
             'df3c7656024d60c59664c79f4890f7780a2c5b8b537ac61b017e16b3d4420808')
 
 pkgver() {
-  cd "$pkgname"
+  cd "${pkgname}"
 
   git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 package() {
-  cd $srcdir
+  cd ${srcdir}
 
   # systemd unit and its config file
   install -Dm644 syncplay@.service ${pkgdir}/usr/lib/systemd/system/syncplay@.service
-  install -Dm644 server.conf "$pkgdir"/etc/syncplay/server.conf
+  install -Dm644 server.conf "${pkgdir}"/etc/syncplay/server.conf
 
-  cd $pkgname
+  cd ${pkgname}
 
   # actual program
-  make DESTDIR="$pkgdir" install
+  make DESTDIR="${pkgdir}" install
 }