updated

3 files changed, 13 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0702bd8eb83a..da5e698b2590 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Thu Nov 17 20:37:06 UTC 2016
+# Mon Nov 21 22:04:44 UTC 2016
 pkgbase = airtime-git
 	pkgdesc = Open broadcast software for scheduling and station management.
 	pkgver = 12396.4940c73
@@ -70,7 +70,6 @@ pkgbase = airtime-git
 	provides = airtime
 	replaces = airtime
 	backup = etc/airtime/airtime.conf
-	backup = etc/airtime/airtime.ini
 	backup = etc/logrotate.d/airtime-liquidsoap
 	backup = etc/logrotate.d/airtime-php
 	source = airtime::git+https://github.com/sourcefabric/airtime
@@ -84,7 +83,7 @@ pkgbase = airtime-git
 	md5sums = fc4a319d43a96f0003f348c7ddd8aca2
 	md5sums = 93f750480f7c49d72cdcdb10cd97c089
 	md5sums = d9c15aaa7b1da14acc99e047f58aac66
-	md5sums = 3eb519eef9508bcf78447941d6e0bbde
+	md5sums = ede75d7525316fe7b203b6b5c0f154cf
 
 pkgname = airtime-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 57ffc515be8c..23b9d6c5e8f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -35,7 +35,6 @@ makedepends=('git' 'python2' 'python2-setuptools')
 provides=('airtime')
 replaces=('airtime')
 backup=('etc/airtime/airtime.conf'
-        'etc/airtime/airtime.ini'
         'etc/logrotate.d/airtime-liquidsoap'
         'etc/logrotate.d/airtime-php')
 install=airtime.install
@@ -76,6 +75,10 @@ package() {
     install -D -m644 "LICENSE_3RD_PARTY" "${pkgdir}/usr/share/licenses/airtime/LICENSE_3RD_PARTY"
 
     install -D -m644 "airtime_mvc/build/airtime.example.conf" "${pkgdir}/etc/airtime/airtime.example.conf"
+
+msg2 "Replace deprecated # with ; for php comment"
+    find "${pkgdir}/etc/airtime/airtime.example.conf" -name "*.conf" -exec sed -i -re 's/^(\s*)#(.*)/\1;\2/g' {} \;
+
     install -D -m644 "airtime_mvc/build/airtime-php.logrotate" "${pkgdir}/etc/logrotate.d/airtime-php"
     install -D -m644 "python_apps/pypo/liquidsoap/airtime-liquidsoap.logrotate" "${pkgdir}/etc/logrotate.d/airtime-liquidsoap"
 
@@ -87,11 +90,13 @@ package() {
 
     install -d -m655 "${pkgdir}/etc/airtime"
     install -d -m655 "${pkgdir}/usr/share/php/"
-#Zend
+
+msg2 "Symlinking Zend Framework"
     ln -sr /usr/share/zendframework/library/ "${pkgdir}/usr/share/php/Zend"
     ln -sr /usr/share/zendframework/library "${pkgdir}/usr/share/php/libzend-framework-php"
  
     install -D -m644 "installer/php/airtime.ini" "${pkgdir}/etc/php$phpver/conf.d/airtime.ini"
+
     install -D -m644 ../httpd-airtime.conf "${pkgdir}/etc/httpd/conf/extra/httpd-airtime.conf"
 
     install -D -m644 ../airtime-media-monitor.service "${pkgdir}/usr/lib/systemd/system/airtime-media-monitor.service"
@@ -129,4 +134,4 @@ md5sums=('SKIP'
          'fc4a319d43a96f0003f348c7ddd8aca2'
          '93f750480f7c49d72cdcdb10cd97c089'
          'd9c15aaa7b1da14acc99e047f58aac66'
-         '3eb519eef9508bcf78447941d6e0bbde')
+         'ede75d7525316fe7b203b6b5c0f154cf')
diff --git a/httpd-airtime.conf b/httpd-airtime.conf
index ebf5b60f1172..0ff0954e4287 100644
--- a/httpd-airtime.conf
+++ b/httpd-airtime.conf
@@ -29,12 +29,8 @@
 
       DirectoryIndex index.php
       AllowOverride all
-      <IfVersion < 2.4>
-          Order allow,deny
-          Allow from all
-      </IfVersion>
-      <IfVersion >= 2.4>
-          Require all granted
-      </IfVersion>
+      Order allow,deny
+      Allow from all
+      Require all granted
   </Directory>
 </VirtualHost>