up to r4569, make sphinx.conf executable

diff --git a/eventum-paths.patch b/eventum-paths.patch
index a0975771278000e78aa40b2d9ad20ddaae89cc1d..7d8b2333c4a7f0b279614cfa938d10af0b9f9361 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -12,8 +12,8 @@
  
  if (defined('APP_PEAR_PATH')) {
      set_include_path(APP_PEAR_PATH . PATH_SEPARATOR . get_include_path());
---- eventum-2.2/init.php~      2009-10-12 22:40:04.000000000 +0300
-+++ eventum-2.2/init.php       2009-10-12 22:40:41.619219457 +0300
+--- eventum-2.3.3/init.php~    2012-12-17 13:49:09.000000000 +0200
++++ eventum-2.3.3/init.php     2012-12-17 13:49:41.676803793 +0200
 @@ -27,7 +27,7 @@
  // | Authors: Elan Ruusamäe <glen@delfi.ee>                               |
  // +----------------------------------------------------------------------+
@@ -23,15 +23,15 @@
      Header('Location: setup/');
      exit(0);
  }
-@@ -46,7 +46,7 @@
- 
+@@ -47,7 +47,7 @@
  // define base path
  define('APP_PATH', realpath(dirname(__FILE__)));
--define('APP_CONFIG_PATH', APP_PATH . '/config');
-+define('APP_CONFIG_PATH', '/etc/webapps/eventum');
+ if (!defined('APP_CONFIG_PATH')) {
+-    define('APP_CONFIG_PATH', APP_PATH . '/config');
++    define('APP_CONFIG_PATH', '/etc/webapps/eventum');
+ }
  
  // include local site config. may override any default
- require_once APP_CONFIG_PATH . '/config.php';
 @@ -64,23 +64,15 @@
  }
  

diff --git a/eventum.spec b/eventum.spec
index 5ac2b315c0aed1a6b09fb7d0515103a5a35faaae..2a61fcf6ff92facd264117725d2941071dc59c81 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,8 +10,8 @@
 %bcond_without order   # with experimental order patch
 
 %define                php_min_version 5.1.2
-%define                subver  4549
-%define                rel             2.3
+%define                subver  4569
+%define                rel             2.5
 %include       /usr/lib/rpm/macros.php
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
@@ -23,7 +23,7 @@ License:      GPL
 Group:         Applications/WWW
 #Source0:      http://launchpad.net/eventum/trunk/%{version}/+download/%{name}-%{version}.tar.gz
 Source0:       %{name}-%{version}-dev-r%{subver}.tar.gz
-# Source0-md5: 342032b71ee268710520bfb1f8c0d6da
+# Source0-md5: 3a6854eb3bcf8202cea33962ef1aecde
 #Source0:      %{name}-%{version}%{subver}.tar.gz
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
@@ -788,5 +788,5 @@ done
 %files sphinx
 %defattr(644,root,root,755)
 %{_webappdir}/sphinx.conf.php
-%attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) /etc/sphinx/%{name}.conf
+%attr(750,root,http) %config(noreplace) %verify(not md5 mtime size) /etc/sphinx/%{name}.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/cron.d/%{name}-sphinx