Split package to include Icinga Studio

2 files changed, 81 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a233e3c3a93..362e00bdf837 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,10 @@
 # Generated by mksrcinfo v8
-# Wed Jun  8 09:58:28 UTC 2016
+# Mon Feb  6 20:15:35 UTC 2017
 pkgbase = icinga2-git
 	pkgdesc = An open source host, service and network monitoring program
-	pkgver = r7325.899592c
+	pkgver = r7877.aacc535ac
 	pkgrel = 1
 	url = http://www.icinga.org
-	install = icinga2-git.install
 	arch = i686
 	arch = x86_64
 	license = GPL
@@ -14,10 +13,22 @@ pkgbase = icinga2-git
 	makedepends = git
 	makedepends = libmariadbclient
 	makedepends = postgresql-libs
+	makedepends = wxgtk
 	depends = boost-libs
 	depends = libedit
 	depends = openssl
 	depends = yajl
+	source = git+https://github.com/Icinga/icinga2.git
+	sha256sums = SKIP
+
+pkgname = icinga2-common-git
+	pkgdesc = Common files for Icinga2
+	provides = icinga2-common
+	conflicts = icinga2-common
+
+pkgname = icinga2-git
+	install = icinga2-git.install
+	depends = icinga2-common
 	optdepends = monitoring-plugins: plugins needed for icinga checks
 	optdepends = libmariadbclient: for MySQL support
 	optdepends = postgresql-libs: for PostgreSQL support
@@ -44,8 +55,11 @@ pkgbase = icinga2-git
 	backup = etc/icinga2/init.conf
 	backup = etc/icinga2/zones.conf
 	backup = etc/logrotate.d/icinga2
-	source = git+https://github.com/Icinga/icinga2.git
-	sha256sums = SKIP
 
-pkgname = icinga2-git
+pkgname = icinga-studio-git
+	pkgdesc = Graphical tool for debugging and testing the Icinga2 API
+	depends = icinga2-common
+	depends = wxgtk
+	provides = icinga2-studio
+	conflicts = icinga2-studio
 
diff --git a/PKGBUILD b/PKGBUILD
index fd14e1a62937..2f33ab00a905 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,16 @@
 # Maintainer: Malte Rabenseifner <mail@malte-rabenseifner.de>
-pkgname=icinga2-git
+
+pkgname=('icinga2-common-git' 'icinga2-git' 'icinga-studio-git')
+pkgbase=icinga2-git
 _pkgname=icinga2
-pkgver=r7325.899592c
+pkgver=r7877.aacc535ac
 pkgrel=1
 pkgdesc="An open source host, service and network monitoring program"
+license=('GPL')
 arch=('i686' 'x86_64')
 url="http://www.icinga.org"
-license=('GPL')
 depends=('boost-libs' 'libedit' 'openssl' 'yajl')
-makedepends=('boost' 'cmake' 'git' 'libmariadbclient' 'postgresql-libs')
-optdepends=('monitoring-plugins: plugins needed for icinga checks'
-            'libmariadbclient: for MySQL support'
-            'postgresql-libs: for PostgreSQL support')
-provides=('icinga2')
-conflicts=('icinga2')
-backup=(etc/default/icinga2
-        etc/icinga2/features-available/{api,checker,command,compatlog}.conf
-        etc/icinga2/features-available/{debuglog,gelf,graphite}.conf
-        etc/icinga2/features-available/{ido-mysql,ido-pgsql,livestatus,mainlog}.conf
-        etc/icinga2/features-available/{notification,perfdata,statusdata,syslog}.conf
-        etc/icinga2/{constants,icinga2,init,zones}.conf
-        etc/logrotate.d/icinga2)
-install='icinga2-git.install'
+makedepends=('boost' 'cmake' 'git' 'libmariadbclient' 'postgresql-libs' 'wxgtk')
 source=('git+https://github.com/Icinga/icinga2.git')
 sha256sums=('SKIP')
 
@@ -31,9 +20,10 @@ pkgver() {
 }
 
 build() {
-  cd "$srcdir/$_pkgname"
+  mkdir -p "$srcdir/$_pkgname/build"
+  cd "$srcdir/$_pkgname/build"
 
-  cmake \
+  cmake "$srcdir/$_pkgname" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
     -DICINGA2_RUNDIR=/run \
@@ -42,13 +32,44 @@ build() {
     -DCMAKE_INSTALL_LOCALSTATEDIR=/var \
     -DICINGA2_SYSCONFIGFILE=/etc/default/icinga2 \
     -DICINGA2_PLUGINDIR=/usr/lib/monitoring-plugins \
-    -DUSE_SYSTEMD=ON
+    -DUSE_SYSTEMD=ON \
+    -DICINGA2_WITH_STUDIO=ON \
+    -DLOGROTATE_HAS_SU=OFF
 
   make
 }
 
-package() {
-  cd "$srcdir/$_pkgname"
+package_icinga2-common-git() {
+  pkgdesc="Common files for Icinga2"
+  provides=('icinga2-common')
+  conflicts=('icinga2-common')
+
+  cd "$srcdir/$_pkgname/build"
+  make DESTDIR="$pkgdir" install
+  rm -r $pkgdir/{etc,run,var}
+  rm -r $pkgdir/usr/{bin,share}
+  rm -r $pkgdir/usr/lib/systemd
+  rm -r $pkgdir/usr/lib/icinga2/{prepare-dirs,safe-reload,sbin}
+}
+
+package_icinga2-git() {
+  depends=('icinga2-common')
+  optdepends=('monitoring-plugins: plugins needed for icinga checks'
+              'libmariadbclient: for MySQL support'
+              'postgresql-libs: for PostgreSQL support')
+  provides=('icinga2')
+  conflicts=('icinga2')
+  backup=(etc/default/icinga2
+          etc/icinga2/features-available/{api,checker,command,compatlog}.conf
+          etc/icinga2/features-available/{debuglog,gelf,graphite}.conf
+          etc/icinga2/features-available/{ido-mysql,ido-pgsql,livestatus,mainlog}.conf
+          etc/icinga2/features-available/{notification,perfdata,statusdata,syslog}.conf
+          etc/icinga2/{constants,icinga2,init,zones}.conf
+          etc/logrotate.d/icinga2)
+  install='icinga2-git.install'
+
+  cd "$srcdir/$_pkgname/build"
+
   make DESTDIR="$pkgdir" install
 
   mv "$pkgdir/etc/icinga2/conf.d" "$pkgdir/etc/icinga2/conf.d.example"
@@ -64,6 +85,8 @@ package() {
 	d /run/icinga2/cmd 2750 icinga icingacmd -
 	EOF
 
+  cd "$srcdir/$_pkgname"
+
   install -Dm644 tools/syntax/vim/ftdetect/icinga2.vim "$pkgdir/usr/share/vim/vimfiles/ftdetect/icinga2.vim"
   install -Dm644 tools/syntax/vim/syntax/icinga2.vim "$pkgdir/usr/share/vim/vimfiles/syntax/icinga2.vim"
   install -Dm644 tools/syntax/nano/icinga2.nanorc "$pkgdir/usr/share/nano/icinga2.nanorc"
@@ -73,4 +96,20 @@ package() {
             "$pkgdir/var/spool/icinga2" \
             "$pkgdir/var/cache/icinga2" \
             "$pkgdir/var/log/icinga2"
+
+  rm -r $pkgdir/usr/lib/icinga2/lib*
+  rm $pkgdir/usr/bin/icinga-studio
+}
+
+package_icinga-studio-git() {
+  pkgdesc="Graphical tool for debugging and testing the Icinga2 API"
+  depends=('icinga2-common' 'wxgtk')
+  provides=('icinga2-studio')
+  conflicts=('icinga2-studio')
+
+  cd "$srcdir/$_pkgname/build"
+  make DESTDIR="$pkgdir" install
+  rm -r $pkgdir/{etc,run,var}
+  rm -r $pkgdir/usr/{lib,share}
+  rm $pkgdir/usr/bin/icinga2
 }