- reflect adodb changes

Changed files:
    flyspray-PLD.patch -> 1.3
    flyspray.conf -> 1.5
    flyspray.spec -> 1.15

diff --git a/flyspray-PLD.patch b/flyspray-PLD.patch
index d2a0d3494b7e8930da385d88fa4dd8af67672e1b..b1d1b1e6fea0a34baa0e63f653accce974f37f88 100644 (file)
--- a/flyspray-PLD.patch
+++ b/flyspray-PLD.patch
@@ -28,7 +28,7 @@
     {
        // Get the ADOdb library path. If not found it will be FALSE
 -      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', realpath('../adodb'));
-+      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', '/usr/share/pear/adodb');
++      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', '/usr/share/php/adodb');
  
        // Update the status of the library
        $this->mAdodbStatus = ($this->mAdodbPath) ? TRUE : FALSE;
@@ -132,7 +132,7 @@ diff -u templates/license.tpl.php /tmp/license.tpl.php
     {
        // Look for ADOdb
 -      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', realpath('../adodb'));
-+      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', '/usr/share/pear/adodb');
++      $this->mAdodbPath = $this->ScanIncludePath('adodb.inc.php', '/usr/share/php/adodb');
        require_once($this->mAdodbPath);
  
        // Perform a number of fatality checks, then die gracefully

diff --git a/flyspray.conf b/flyspray.conf
index 89660b5a0a1bab5c420e41fc0664de5dcdc92bb0..8e4599d0ac18969b5e099881c05ac215287784cc 100644 (file)
--- a/flyspray.conf
+++ b/flyspray.conf
@@ -10,7 +10,7 @@
 [general]
 basedir = "/usr/share/flyspray/"      ; Location of your Flyspray installation
 cookiesalt = "d5"            ; Randomisation value for cookie encoding
-adodbpath = "/usr/share/pear/adodb/adodb.inc.php"   ; Path to the main ADODB include file
+adodbpath = "/usr/share/php/adodb/adodb.inc.php"   ; Path to the main ADODB include file
 output_buffering = "on"                       ; Available options: "off", "on" and "gzip"
 
 [database]

diff --git a/flyspray.spec b/flyspray.spec
index 3ab195bb2857aa9bce0e167c41bb100787cca2a3..36e38fcb4b9455c883808e27dc42c3b47f7b4734 100644 (file)
--- a/flyspray.spec
+++ b/flyspray.spec
@@ -2,7 +2,7 @@ Summary:        Bug Tracking System
 Summary(pl):   System ¶ledzenia b³êdów
 Name:          flyspray
 Version:       0.9.8
-Release:       3
+Release:       3.4
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://flyspray.rocks.cc/files/%{name}-%{version}.tar.gz
@@ -13,7 +13,7 @@ Patch0:               %{name}-PLD.patch
 URL:           http://flyspray.rocks.cc/
 BuildRequires: rpmbuild(macros) >= 1.268
 Requires(triggerpostun):       sed >= 4.0
-Requires:      adodb
+Requires:      adodb >= 4.67-1.17
 Requires:      php >= 3:4.3.0
 Requires:      webapps
 BuildArch:     noarch
@@ -91,7 +91,7 @@ fi
 %triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- %{name} < 0.9.8-0.1
+%triggerpostun -- %{name} < 0.9.8-3.3
 if [ -f /etc/%{name}/flyspray.conf.php.rpmsave ]; then
        mv -f %{_sysconfdir}/flyspray.conf{,.rpmnew}
        mv -f /etc/%{name}/flyspray.conf.php.rpmsave %{_sysconfdir}/flyspray.conf
@@ -120,6 +120,8 @@ if [ "$httpd_reload" ]; then
        %service httpd reload
 fi
 
+%{__sed} -i -e 's,%{php_pear_dir}/adodb/adodb.inc.php,/usr/share/php/adodb/adodb.inc.php,' %{_sysconfdir}/flyspray.conf
+
 %files
 %defattr(644,root,root,755)
 %doc docs/{AUTHORS,BUGS,CHANGELOG,INSTALL,README,TODO,UPGRADING}.txt