Split package

Splitting package for separation of client and server
Changed license to GPL3

2 files changed, 80 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 824ddfd1b326..7a5414b8a676 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,50 @@
 # Generated by mksrcinfo v8
-# Sat Feb  6 18:10:00 UTC 2016
+# Wed Feb 10 15:10:00 UTC 2016
 pkgbase = drawpile
 	pkgdesc = Collaborative drawing program specially made for use with pen tablets
 	pkgver = 1.0.2
-	pkgrel = 3
+	pkgrel = 4
 	url = http://drawpile.net/
-	install = drawpile.install
 	arch = i686
 	arch = x86_64
-	license = GPL2
+	license = GPL3
+	makedepends = karchive
+	makedepends = qt5-multimedia
 	makedepends = qt5-tools
 	makedepends = qt5-svg
 	makedepends = ninja
 	makedepends = cmake
+	source = http://drawpile.net/files/src/drawpile-1.0.2.tar.gz
+	source = drawpile103.patch
+	sha256sums = 012a470316ccca51a28700948cd3f866c9b7fcc8fa9bfa21f27f28e9dc53f019
+	sha256sums = f25371be6b712c079dc1e742f246e2b9b60a9c6b083c3cebf60916c80521e160
+
+pkgname = drawpile
+	pkgdesc = Collaborative drawing program specially made for use with pen tablets (meta package)
+	arch = any
+	depends = drawpile-client
+	depends = drawpile-server
+
+pkgname = drawpile-client
+	pkgdesc = Collaborative drawing program specially made for use with pen tablets (client)
+	depends = drawpile-common
 	depends = karchive
 	depends = qt5-multimedia
-	depends = desktop-file-utils
 	optdepends = kdnssd: automatic service discovery (such as printers)
 	optdepends = giflib: GIF support
 	optdepends = miniupnpc: UPnP support
 	optdepends = qt5-color-widgets: alternative color wheel
+
+pkgname = drawpile-server
+	pkgdesc = Collaborative drawing program specially made for use with pen tablets (server)
+	depends = drawpile-common
+	depends = karchive
 	optdepends = libmicrohttpd: web-admin feature (server dependency)
 	optdepends = libsystemd: systemd and logging support (server dependency)
-	source = http://drawpile.net/files/src/drawpile-1.0.2.tar.gz
-	source = drawpile103.patch
-	sha256sums = 012a470316ccca51a28700948cd3f866c9b7fcc8fa9bfa21f27f28e9dc53f019
-	sha256sums = f25371be6b712c079dc1e742f246e2b9b60a9c6b083c3cebf60916c80521e160
 
-pkgname = drawpile
+pkgname = drawpile-common
+	pkgdesc = Collaborative drawing program specially made for use with pen tablets (common files)
+	install = drawpile.install
+	arch = any
+	depends = desktop-file-utils
 
diff --git a/PKGBUILD b/PKGBUILD
index 35f0d2e7912d..7e6929f9bf35 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,75 +2,87 @@
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
-pkgname=drawpile
+pkgbase='drawpile'
+pkgname=("${pkgbase}"{,'-client','-server','-common'})
 pkgver=1.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Collaborative drawing program specially made for use with pen tablets'
 arch=('i686' 'x86_64')
 url='http://drawpile.net/'
-license=('GPL2')
-depends=('karchive' 'qt5-multimedia' 'desktop-file-utils')
-optdepends=('kdnssd: automatic service discovery (such as printers)'
-	'giflib: GIF support'
-	'miniupnpc: UPnP support'
-	'qt5-color-widgets: alternative color wheel'
-	'libmicrohttpd: web-admin feature (server dependency)'
-	'libsystemd: systemd and logging support (server dependency)')
-makedepends=('qt5-tools' 'qt5-svg' 'ninja' 'cmake')
-install="${pkgname}.install"
-source=("http://drawpile.net/files/src/${pkgname}-${pkgver}.tar.gz"
+license=('GPL3')
+makedepends=('karchive' 'qt5-multimedia' 'qt5-tools' 'qt5-svg' 'ninja' 'cmake')
+source=("http://drawpile.net/files/src/${pkgbase}-${pkgver}.tar.gz"
 	'drawpile103.patch')
 sha256sums=('012a470316ccca51a28700948cd3f866c9b7fcc8fa9bfa21f27f28e9dc53f019'
 	'f25371be6b712c079dc1e742f246e2b9b60a9c6b083c3cebf60916c80521e160')
 
-## SET TO 'SERVER' OR 'CLIENT' FOR BUILDING SERVER OR CLIENT ONLY ##
-_build='BOTH'
-_cmakeargs=('-Wno-dev')
+_cmakeargs+=('-Wno-dev')
 
 ## Used for interactive makepkg later ##
 # msg  "If you wish to only install the server or client set '_build' to 'SERVER' or 'CLIENT' in the provided PKGBUILD file and recompile this package."
 # msg2 "The package 'customizepkg' may be helpful in this case."
 
 prepare() {
-	cd "${pkgname}-${pkgver}"
+	cd "${pkgbase}-${pkgver}"
 
 	msg2 'Applying patches of unofficial Drawpile 1.0.3'
 	patch -p1 -i '../drawpile103.patch'
 }
 
 build() {
-	cd "${pkgname}-${pkgver}"
+	cd "${pkgbase}-${pkgver}"
 
 	# Ensure build is an empty directory
 	rm -rf 'build'
 	mkdir -p 'build'
 	cd 'build'
 
-	if [ -z "${_build}" ]; then
-		_build='BOTH'
-	fi
-
-	if [ "${_build}" == 'CLIENT' ]; then
-		warning 'BUILDING CLIENT ONLY.'
-		_cmakeargs+=('-DSERVER=off')
-	elif [ "${_build}" == 'SERVER' ]; then
-		warning 'BUILDING STAND-ALONE SERVER ONLY.'
-		_cmakeargs+=('-DCLIENT=off')
-	elif [ "${_build}" != 'BOTH' ]; then
-		error "You can set '_build' TO 'SERVER', 'CLIENT' or 'BOTH' only!"
-		return 1
-	fi
-
 	cmake .. -DCMAKE_INSTALL_PREFIX='/usr' -G Ninja "${_cmakeargs[@]}"
 	ninja
 }
 
-package() {
-	cd "${pkgname}-${pkgver}"
+package_drawpile() {
+	pkgdesc+=' (meta package)'
+	arch=('any')
+	depends=('drawpile-client' 'drawpile-server')
+}
+
+package_drawpile-client() {
+	pkgdesc+=' (client)'
+	depends=('drawpile-common' 'karchive' 'qt5-multimedia')
+	optdepends=('kdnssd: automatic service discovery (such as printers)'
+		'giflib: GIF support'
+		'miniupnpc: UPnP support'
+		'qt5-color-widgets: alternative color wheel')
+	cd "${pkgbase}-${pkgver}"
 
 	DESTDIR="${pkgdir}" ninja -C 'build' install
-	install -Dm644 "desktop/${pkgname}.svg" \
-		"${pkgdir}/usr/share/pixmaps/${pkgname}.svg"
-	install -Dm644 "desktop/${pkgname}.desktop" \
-		"${pkgdir}/usr/share/applications/${pkgname}.desktop"
+	rm -rfv "${pkgdir}"/usr/{share,bin/drawpile-srv}
 }
+
+package_drawpile-server() {
+	pkgdesc+=' (server)'
+	depends=('drawpile-common' 'karchive')
+	optdepends=('libmicrohttpd: web-admin feature (server dependency)'
+		'libsystemd: systemd and logging support (server dependency)')
+	cd "${pkgbase}-${pkgver}"
+
+	DESTDIR="${pkgdir}" ninja -C 'build' install
+	rm -rfv "${pkgdir}"/usr/{share,bin/drawpile{,-1.*}}
+	#find "${pkgdir}/usr/bin" -not -type d -not -name 'drawpile-srv' -exec rm -f {} \;
+}
+
+package_drawpile-common() {
+	pkgdesc+=' (common files)'
+	arch=('any')
+	depends=('desktop-file-utils')
+	install="${pkgbase}.install"
+	cd "${pkgbase}-${pkgver}"
+
+	DESTDIR="${pkgdir}" ninja -C 'build' install
+	rm -rfv "${pkgdir}/usr/bin"
+	install -Dm644 "desktop/${pkgbase}.svg" \
+		"${pkgdir}/usr/share/pixmaps/${pkgbase}.svg"
+	install -Dm644 "desktop/${pkgbase}.desktop" \
+		"${pkgdir}/usr/share/applications/${pkgbase}.desktop"
+}
\ No newline at end of file