Split `mod_tile` & `renderd` into two packages

3 files changed, 66 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2be7be77cbee..1fd316109289 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,4 @@
 pkgbase = mod_tile-git
-	pkgdesc = Mod tile is an apache module to serve raster Mapnik tiles
 	pkgver = 0.6.1.r45.g24a5752
 	pkgrel = 1
 	url = https://github.com/openstreetmap/mod_tile
@@ -15,7 +14,6 @@ pkgbase = mod_tile-git
 	depends = mapnik
 	optdepends = ceph-libs
 	optdepends = libmemcached
-	backup = etc/renderd.conf
 	source = git+https://github.com/openstreetmap/mod_tile.git
 	source = renderd.service
 	source = renderd-postgresql.service
@@ -28,3 +26,11 @@ pkgbase = mod_tile-git
 	sha256sums = cc450b47539d8a3e0d3d78634c78b0019a15097d2fb4e86fa3332957abd82d89
 
 pkgname = mod_tile-git
+	pkgdesc = An Apache 2 module to deliver map tiles
+	install = mod_tile-git.install
+	provides = mod_tile
+
+pkgname = renderd-git
+	pkgdesc = A daemon that renders map tiles using mapnik
+	provides = renderd
+	backup = etc/renderd.conf
diff --git a/PKGBUILD b/PKGBUILD
index 9745ceb81004..aa4127ac6e60 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,15 @@
 # Contributor: Calimero <calimeroteknik@free.fr>
 # Contributor: jerry73204 <jerry73204@gmail.com>
 
-pkgname=mod_tile-git
+pkgname=('mod_tile-git' 'renderd-git')
 pkgver=0.6.1.r45.g24a5752
 pkgrel=1
-pkgdesc='Mod tile is an apache module to serve raster Mapnik tiles'
 arch=('i686' 'x86_64')
 url='https://github.com/openstreetmap/mod_tile'
 license=('GPL2')
 depends=('apache' 'cairo' 'curl' 'glib2' 'iniparser' 'mapnik')
 optdepends=('ceph-libs' 'libmemcached')
 makedepends=('cmake')
-backup=('etc/renderd.conf')
 source=('git+https://github.com/openstreetmap/mod_tile.git' 'renderd.service' 'renderd-postgresql.service' 'renderd.sysusers' 'renderd.tmpfiles')
 sha256sums=('SKIP'
             'e346bae01738e276eae63a6b672c971b8f21047ea62b025ac9a283f20d5d9d61'
@@ -33,14 +31,43 @@ check() {
   ctest --test-dir mod_tile_build
 }
 
-package() {
-  DESTDIR="$pkgdir" cmake --install mod_tile_build --prefix /usr --strip
+package_mod_tile-git() {
+  install="${pkgname}.install"
+  pkgdesc='An Apache 2 module to deliver map tiles'
+  provides=('mod_tile')
 
-  # The creation of "/var/cache/renderd/tiles" & "/var/run/renderd" will be handled by "renderd.tmpfiles"
-  rm -rf "$pkgdir"/var
+  DESTDIR="$pkgdir" cmake --install mod_tile_build --prefix /usr --strip
 
+  # License
   install -Dm644 "$srcdir"/mod_tile/COPYING "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
+
+  # Example Map
+  install -Dm644 "$srcdir"/mod_tile/etc/apache2/renderd-example-map.conf "$pkgdir"/etc/httpd/conf/extra/httpd-tile-renderd-example-map.conf
+  install -dm755 "$pkgdir"/usr/share/renderd
+  cp -av "$srcdir"/mod_tile/utils/example-map "$pkgdir"/usr/share/renderd/example-map
+
+  # "/etc/renderd.conf", "/usr/bin", "/usr/share/man" & "/var" are contained in/handled by "renderd" package
+  rm -rf "$pkgdir"/etc/renderd.conf "$pkgdir"/usr/bin "$pkgdir"/usr/share/man "$pkgdir"/var
+}
+
+package_renderd-git() {
+  backup=('etc/renderd.conf')
+  pkgdesc='A daemon that renders map tiles using mapnik'
+  provides=('renderd')
+
+  DESTDIR="$pkgdir" cmake --install mod_tile_build --prefix /usr --strip
+
+  # Systemd service units, sysusers.d & tmpfiles.d configuration files
   install -Dm644 -t "$pkgdir"/usr/lib/systemd/system/ "$srcdir"/renderd-postgresql.service "$srcdir"/renderd.service
   install -Dm644 "$srcdir"/renderd.sysusers "$pkgdir"/usr/lib/sysusers.d/renderd.conf
   install -Dm644 "$srcdir"/renderd.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/renderd.conf
+
+  # License
+  install -Dm644 "$srcdir"/mod_tile/COPYING "$pkgdir"/usr/share/licenses/"$pkgname"/LICENSE
+
+  # The creation of "/var/cache/renderd/tiles" & "/var/run/renderd" will be handled by "renderd.tmpfiles"
+  rm -rf "$pkgdir"/var
+
+  # "/etc/httpd" & "/usr/lib/httpd" are contained in "mod_tile" package
+  rm -rf "$pkgdir"/etc/httpd "$pkgdir"/usr/lib/httpd
 }
diff --git a/mod_tile-git.install b/mod_tile-git.install
new file mode 100644
index 000000000000..de0f93430b59
--- /dev/null
+++ b/mod_tile-git.install
@@ -0,0 +1,24 @@
+post_install() {
+  echo "---------------------------------------------------------"
+  echo "To enable 'mod_tile':"
+  echo "- Add the following line to '/etc/httpd/conf/httpd.conf':"
+  echo "Include conf/extra/httpd-tile.conf"
+  echo
+  echo "- Restart Apache HTTP Server:"
+  echo "systemctl restart httpd"
+  echo
+  echo "---------------------------------------------------------"
+  echo "To enable 'render-example-map' from 'mod_tile':"
+  echo "- Add the following line to '/etc/httpd/conf/httpd.conf':"
+  echo "Include conf/extra/httpd-tile-renderd-example-map.conf"
+  echo
+  echo "- Add the following lines to '/etc/renderd.conf':"
+  echo "[example-map]"
+  echo "URI=/tiles/renderd-example"
+  echo "XML=/usr/share/renderd/example-map/mapnik.xml"
+  echo
+  echo "- Restart Apache HTTP Server & renderd:"
+  echo "systemctl restart httpd renderd"
+  echo
+  echo "---------------------------------------------------------"
+}