[arch-commits] Commit in mpc/trunk (2 files)

[Gaëtan Bisson]

    Date: Friday, May 4, 2018 @ 22:48:54
  Author: bisson
Revision: 323384

upstream update

Modified:
  mpc/trunk/PKGBUILD
Deleted:
  mpc/trunk/2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch

------------------------------------------------+
 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch |   26 -----------------------
 PKGBUILD                                       |   17 ++++-----------
 2 files changed, 5 insertions(+), 38 deletions(-)

Deleted: 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch
===================================================================
--- 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch	2018-05-04 21:48:35 UTC (rev 323383)
+++ 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch	2018-05-04 22:48:54 UTC (rev 323384)
@@ -1,26 +0,0 @@
-From 2d6e3fe90ae2c24d29305037b452b4cb18bceaa0 Mon Sep 17 00:00:00 2001
-From: Max Kellermann <max at musicpd.org>
-Date: Mon, 12 Feb 2018 21:50:44 +0100
-Subject: [PATCH] doc/meson.build: drop bogus "man" from manpage install path
-
-Closes #12
----
- doc/meson.build | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/meson.build b/doc/meson.build
-index fd7e3d6..7793627 100644
---- a/doc/meson.build
-+++ b/doc/meson.build
-@@ -15,9 +15,9 @@ if sphinx.found()
-     'Manpage documentation',
-     output: 'man',
-     input: ['index.rst', 'conf.py'],
--    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@'],
-+    command: [sphinx, '-q', '-b', 'man', '-d', '@OUTDIR@/doctrees', meson.current_source_dir(), '@OUTPUT@/man1'],
-     build_by_default: true,
-     install: true,
--    install_dir: join_paths(get_option('datadir'), 'man', 'man1'),
-+    install_dir: get_option('datadir'),
-   )
- endif

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-04 21:48:35 UTC (rev 323383)
+++ PKGBUILD	2018-05-04 22:48:54 UTC (rev 323384)
@@ -6,8 +6,8 @@
 # Contributor: Link Dupont <link at subpop.net>
 
 pkgname=mpc
-pkgver=0.29
-pkgrel=2
+pkgver=0.30
+pkgrel=1
 pkgdesc='Minimalist command line interface to MPD'
 url='https://www.musicpd.org/clients/mpc/'
 license=('GPL2')
@@ -15,19 +15,12 @@
 makedepends=('meson' 'python-sphinx')
 depends=('libmpdclient')
 validpgpkeys=('0392335A78083894A4301C43236E8A58C6DB4512')
-source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig}
-        '2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch')
-sha256sums=('02f1daec902cb48f8cdaa6fe21c7219f6231b091dddbe437a3a4fb12cb07b9d3'
-            'SKIP'
-	    '2f5c84c3869c8f36924f2707c1e956b49a397d6d93ad20c002a82eaae9ecc6ac')
+source=("https://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"{,.sig})
+sha256sums=('65fc5b0a8430efe9acbe6e261127960682764b20ab994676371bdc797d867fce'
+            'SKIP')
 
 options=('!emptydirs')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../2d6e3fe90ae2c24d29305037b452b4cb18bceaa0.patch
-}
-
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	arch-meson . build