Rebuild to simplify split package

PKGBUILD:
Simplify setup of the split package using helper function.
Remove jack2 from provides (jack only provides libjack.so and
libjackserver.so and itself).

2 files changed, 30 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 077bfff287d4..39ab1ba82ad2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = jack
 	pkgdesc = A low-latency audio server
 	pkgver = 0.126.0
-	pkgrel = 3
+	pkgrel = 4
 	url = http://jackaudio.org/
 	arch = x86_64
 	license = GPL
@@ -28,13 +28,14 @@ pkgname = jack
 	depends = libasound.so
 	depends = libsamplerate.so
 	optdepends = celt: NetJACK driver
-	optdepends = jack-docs: for documentation
+	optdepends = jack-docs: for developer documentation
 	optdepends = jack-example-tools: for official JACK example-clients and tools
 	optdepends = libffado: FireWire support
 	optdepends = realtime-privileges: Acquire realtime privileges
-	provides = jack2
 	provides = libjack.so
 	provides = libjackserver.so
 	conflicts = jack2
+	conflicts = pipewire-jack
 
 pkgname = jack-docs
+	pkgdesc = A low-latency audio server - developer documentation
diff --git a/PKGBUILD b/PKGBUILD
index ee6ed3715cb6..9c5b91973641 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,14 +6,14 @@
 pkgbase=jack
 pkgname=(jack jack-docs)
 pkgver=0.126.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A low-latency audio server"
 arch=(x86_64)
 url="http://jackaudio.org/"
 license=(GPL LGPL)
 makedepends=(alsa-lib db celt doxygen git libffado libsamplerate)
 source=(
-  "$pkgname::git+https://github.com/jackaudio/${pkgname}1.git#tag=${pkgver}?signed"
+  "$pkgbase::git+https://github.com/jackaudio/${pkgname}1.git#tag=${pkgver}?signed"
   "git+https://github.com/jackaudio/headers"
 )
 sha512sums=('SKIP'
@@ -22,9 +22,18 @@ b2sums=('SKIP'
         'SKIP')
 validpgpkeys=('62B11043D2F6EB6672D93103CDBAA37ABC74FBA0') # falkTX <falktx@falktx.com>
 
+_pick() {
+  local p="$1" f d; shift
+  for f; do
+    d="$srcdir/$p/${f#$pkgdir/}"
+    mkdir -p "$(dirname "$d")"
+    mv "$f" "$d"
+    rmdir -p --ignore-fail-on-non-empty "$(dirname "$f")"
+  done
+}
+
 prepare() {
-  mv -v "${pkgname}" "${pkgname}-${pkgver}"
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgname}"
   git submodule init
   git config submodule.jack.url "${srcdir}/headers"
   git submodule update
@@ -33,7 +42,7 @@ prepare() {
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd "${pkgbase}"
   ./configure --prefix=/usr \
               --libdir=/usr/lib \
               --with-html-dir=/usr/share/doc/jack
@@ -46,26 +55,25 @@ package_jack() {
   depends=(db gcc-libs glibc libasound.so libsamplerate.so)
   optdepends=(
     'celt: NetJACK driver'
-    'jack-docs: for documentation'
+    'jack-docs: for developer documentation'
     'jack-example-tools: for official JACK example-clients and tools'
     'libffado: FireWire support'
     'realtime-privileges: Acquire realtime privileges'
   )
-  conflicts=(jack2)
-  provides=(jack2 libjack.so libjackserver.so)
+  conflicts=(jack2 pipewire-jack)
+  provides=(libjack.so libjackserver.so)
+
+  make DESTDIR="$pkgdir" install -C "${pkgbase}"
+  install -vDm 644 "${pkgbase}/"{AUTHORS,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
 
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-  install -vDm 644 {AUTHORS,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
-  # remove documentation
-  rm -rf "${pkgdir}/usr/share/doc/${pkgname}/reference"
+  (
+    cd "$pkgdir"
+    _pick jack-docs usr/share/doc/${pkgbase}/reference
+  )
 }
 
 package_jack-docs() {
-  cd "${pkgbase}-${pkgver}"
-  make DESTDIR="$pkgdir" install
-
-  # remove everything provided by jack
-  rm -rf "${pkgdir}/usr/"{bin,include,lib,share/man}
+  pkgdesc+=" - developer documentation"
+  mv -v jack-docs/* "$pkgdir"
 }
 # vim:set ts=2 sw=2 et: