Setup Apache subpackage and install sample config file

2 files changed, 25 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d40e3a786ea9..cbed377d71bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pagure
 	pkgdesc = A git-centered forge based on python using pygit2
 	pkgver = 5.8.1
-	pkgrel = 0.11
+	pkgrel = 0.12
 	url = https://pagure.io/pagure
 	install = pagure.install
 	arch = any
@@ -48,12 +48,19 @@ pkgbase = pagure
 	optdepends = python-psycopg2: Python driver for PostgreSQL
 	optdepends = python-mysqlclient: Python driver for MariaDB
 	optdepends = python-pymysql: Python driver for MariaDB
-	backup = etc/pagure/alembic.ini
-	backup = etc/pagure/pagure.cfg
 	source = https://releases.pagure.org/pagure/pagure-5.8.1.tar.gz
 	source = https://src.fedoraproject.org/rpms/pagure/raw/master/f/0501-Revert-Add-a-upper-limit-to-sqlalchemy.patch
 	sha256sums = 5e150bad0a3f932d265cb59d46c8b6a532be0f757aab695a8c37df3f5f4db687
 	sha256sums = c1da9e6ae2255f7896920ecb261f18c59f8ad6ba5726a8484f6287ae3962c854
 
 pkgname = pagure
+	optdepends = pagure-apache: Apache host configuration files
+	backup = etc/pagure/alembic.ini
+	backup = etc/pagure/pagure.cfg
+
+pkgname = pagure-apache
+	pkgdesc = A git-centered forge based on python using pygit2 (Apache host configuration)
+	depends = pagure=5.8.1
+	depends = apache
+	backup = etc/httpd/conf/extra/pagure.conf
 
diff --git a/PKGBUILD b/PKGBUILD
index 677b76bea587..c45100f9e57a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,9 +5,9 @@
 # Mageia spec: http://svnweb.mageia.org/packages/cauldron/pagure/current/SPECS/pagure.spec?view=markup
 
 pkgbase=pagure
-pkgname=("$pkgbase")
+pkgname=("$pkgbase" "$pkgbase-apache")
 pkgver=5.8.1
-pkgrel=0.11
+pkgrel=0.12
 pkgdesc="A git-centered forge based on python using pygit2"
 arch=("any")
 url="https://pagure.io/$pkgbase"
@@ -55,8 +55,6 @@ optdepends=('mariadb: MariaDB backend'
             'python-psycopg2: Python driver for PostgreSQL'
             'python-mysqlclient: Python driver for MariaDB'
             'python-pymysql: Python driver for MariaDB')
-backup=("etc/$pkgbase/alembic.ini"
-        "etc/$pkgbase/pagure.cfg")
 source=("https://releases.pagure.org/$pkgbase/$pkgbase-$pkgver.tar.gz"
         "https://src.fedoraproject.org/rpms/pagure/raw/master/f/0501-Revert-Add-a-upper-limit-to-sqlalchemy.patch")
 install="$pkgbase.install"
@@ -81,9 +79,20 @@ check() {
 }
 
 package_pagure() {
+    optdepends=("$pkgbase-apache: Apache host configuration files")
+    backup=("etc/$pkgbase/alembic.ini"
+             "etc/$pkgbase/pagure.cfg")
     cd "$pkgbase-$pkgver"
     python setup.py install --root="$pkgdir" --optimize=1 --skip-build
     install -Dm644 -t "$pkgdir/usr/share/doc/$pkgbase/" {README,UPGRADING}.rst
-    install -Dm644 -T files/pagure.cfg.sample "$pkgdir"/etc/$pkgbase/pagure.cfg
-    install -Dm644 -t "$pkgdir/etc/$pkgbase/" files/alembic.ini
+    install -Dm644 -T "files/pagure.cfg.sample" "$pkgdir/etc/$pkgbase/pagure.cfg"
+    install -Dm644 -t "$pkgdir/etc/$pkgbase/" "files/alembic.ini"
+}
+
+package_pagure-apache() {
+    pkgdesc+=" (Apache host configuration)"
+    depends=("$pkgbase=$pkgver" 'apache')
+    backup=("etc/httpd/conf/extra/$pkgbase.conf")
+    cd "$pkgbase-$pkgver"
+    install -Dm644 -t "$pkgdir/etc/httpd/conf/extra/" files/pagure.conf
 }