Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] snapcast: fix man page and conf file installation
@ 2020-09-18  2:50 amak79
  2020-09-26  8:16 ` [PR PATCH] [Merged]: " Johnnynator
  0 siblings, 1 reply; 2+ messages in thread
From: amak79 @ 2020-09-18  2:50 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is a new pull request by amak79 against master on the void-packages repository

https://github.com/amak79/void-packages snapcast
https://github.com/void-linux/void-packages/pull/24961

snapcast: fix man page and conf file installation


A patch file from https://github.com/void-linux/void-packages/pull/24961.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-snapcast-24961.patch --]
[-- Type: text/x-diff, Size: 1615 bytes --]

From b4bb3f3df944dda8bc1926ec2da404872310eb47 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Fri, 18 Sep 2020 12:10:57 +1000
Subject: [PATCH] snapcast: fix man page and conf file installation

---
 srcpkgs/snapcast/template | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/snapcast/template b/srcpkgs/snapcast/template
index 0167f05ad3d..4c6c27fe939 100644
--- a/srcpkgs/snapcast/template
+++ b/srcpkgs/snapcast/template
@@ -1,9 +1,10 @@
 # Template file for 'snapcast'
 pkgname=snapcast
 version=0.21.0
-revision=1
+revision=2
 build_style=cmake
-configure_args="-DBUILD_WITH_TREMOR=OFF -DBUILD_WITH_AVAHI=$(vopt_if avahi ON OFF)"
+configure_args="-DBUILD_WITH_TREMOR=OFF -DBUILD_WITH_AVAHI=$(vopt_if avahi ON OFF)
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc"
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel boost-devel expat-devel libflac-devel libsoxr-devel
  libvorbis-devel opus-devel $(vopt_if avahi avahi-libs-devel)"
@@ -34,8 +35,8 @@ snapclient_package() {
 	make_dirs="/var/lib/snapclient 0750 _snapclient _snapclient"
 
 	pkg_install() {
-		vmove /usr/bin/snapclient
-		vman client/snapclient.1
+		vmove usr/bin/snapclient
+		vmove usr/share/man/man1/snapclient.1
 		vsv snapclient
 	}
 }
@@ -50,9 +51,10 @@ snapserver_package() {
 	conf_files="/etc/snapserver.conf"
 
 	pkg_install() {
-		vmove /usr/bin/snapserver
-		vman server/snapserver.1
-		vconf server/etc/snapserver.conf
+		vmove usr/bin/snapserver
+		vmove usr/share/man/man1/snapserver.1
+		vmove usr/share/snapserver/snapweb
+		vmove etc/snapserver.conf
 		vsv snapserver
 	}
 }

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PR PATCH] [Merged]: snapcast: fix man page and conf file installation
  2020-09-18  2:50 [PR PATCH] snapcast: fix man page and conf file installation amak79
@ 2020-09-26  8:16 ` Johnnynator
  0 siblings, 0 replies; 2+ messages in thread
From: Johnnynator @ 2020-09-26  8:16 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 854 bytes --]

There's a merged pull request on the void-packages repository

snapcast: fix man page and conf file installation
https://github.com/void-linux/void-packages/pull/24961

Description:
Snapcast 0.21.0 added install targets for the man pages. This causes a file collision of the base and sub packages man pages.
```
# xbps-install snapserver
...
ERROR: snapserver-0.21.0_1: file `/usr/share/man/man1/snapserver.1' already installed by package snapcast-0.21.0_1.
Transaction failed! see above for errors.

# xbps-install snapclient
...
ERROR: snapclient-0.21.0_1: file `/usr/share/man/man1/snapclient.1' already installed by package snapcast-0.21.0_1.
Transaction failed! see above for errors.
```
An install target was also added for the conf file which results in it being installed by the base `snapcast` package in `/usr/etc/snapserver.conf`.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-09-26  8:17 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-18  2:50 [PR PATCH] snapcast: fix man page and conf file installation amak79
2020-09-26  8:16 ` [PR PATCH] [Merged]: " Johnnynator

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).