up to 3.0.4

Merge branch 'dev-3.0.4'

Conflicts:
	eventum.spec

diff --git a/autoload.patch b/autoload.patch
index 303641e03a62ddd84245ce698aa712e6de8a671a..f766959183efd98bba203ae812eb06eeec4d6e1c 100644 (file)
--- a/autoload.patch
+++ b/autoload.patch
@@ -278,6 +278,18 @@
 +    'Text' => array($pearDir),
 +    'XML' => array($pearDir),
  );
+--- eventum/vendor/composer/autoload_psr4.php~ 2015-10-30 11:28:39.000000000 +0200
++++ eventum/vendor/composer/autoload_psr4.php  2015-10-30 11:28:41.458450142 +0200
+@@ -4,7 +4,8 @@
+ 
+ $vendorDir = dirname(dirname(__FILE__));
+ $baseDir = dirname($vendorDir);
++$phpDir = PHP_DATADIR . '/php';
+ 
+ return array(
+-    'Zend\\Config\\' => array($vendorDir . '/zendframework/zend-config/src'),
++    'Zend\\Config\\' => array($phpDir . '/Zend/Config'),
+ );
 --- eventum-3.0.3-13-gfefa325/autoload.php~    2015-10-13 21:36:40.000000000 +0300
 +++ eventum-3.0.3-13-gfefa325/autoload.php     2015-10-13 23:39:26.450266254 +0300
 @@ -48,4 +48,4 @@

diff --git a/eventum-lighttpd.conf b/eventum-lighttpd.conf
index 7ca717c21c069a475069fe3749ac2f42f89939af..3746b23828b01ca140f26db9413fb038c226371f 100644 (file)
--- a/eventum-lighttpd.conf
+++ b/eventum-lighttpd.conf
@@ -12,6 +12,12 @@
 #      }
 #}
 
+# HTTP Strict Transport Security (HSTS) headers on https addresses
+#$SERVER["socket"] == ":443" {
+#      # HSTS (mod_setenv is required) (15768000 seconds = 6 months)
+#      setenv.add-response-header += ( "Strict-Transport-Security" => "max-age=15768000" )
+#}
+
 # running as alias, part 1
 alias.url += (
        "/eventum" => "/usr/share/eventum/htdocs",
@@ -19,7 +25,7 @@ alias.url += (
 
 # running as separate vhost, part 1
 #$HTTP["host"] == "eventum.example.org" {
-#    server.document-root = "/usr/share/eventum/htdocs",
+#      server.document-root = "/usr/share/eventum/htdocs",
 #}
 
 # running as alias, part 2

diff --git a/eventum-paths.patch b/eventum-paths.patch
index 97578f98250d7147d8e4f92d10f72272fee6dee4..2735287de92a6e5b06d1993f983f446e79b75e05 100644 (file)
--- a/eventum-paths.patch
+++ b/eventum-paths.patch
@@ -64,12 +64,12 @@
          'check_permission' => true,
          'permission'       => 660,
          'check_filesize'   => true,
---- eventum-3.0.3-13-gfefa325/config/sphinx.conf.php~  2015-10-13 20:00:48.000000000 +0300
-+++ eventum-3.0.3-13-gfefa325/config/sphinx.conf.php   2015-10-13 23:34:19.668134549 +0300
-@@ -26,7 +26,7 @@
- // | Authors: Bryan Alsdorf <bryan@mysql.com>                             |
- // | Authors: Elan Ruusamäe <glen@delfi.ee>                               |
- // +----------------------------------------------------------------------+
+--- eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php~ 2015-10-27 18:02:36.000000000 +0200
++++ eventum-3.0.3-314-gedea8e4/config/sphinx.conf.php  2015-10-29 11:53:26.068169385 +0200
+@@ -1,7 +1,7 @@
+ #!/usr/bin/php
+ <?php
+ 
 -require_once __DIR__ . "/../init.php";
 +require_once '/usr/share/eventum/init.php';
  

diff --git a/eventum.spec b/eventum.spec
index c8599649a1500d25eac916dac33b132e0c422cf3..850a1b7af00715a67c8683fc75620c0c50c15c4c 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -2,21 +2,21 @@
 # Conditional build:
 %bcond_with    order   # with experimental order patch
 
-%define                rel             1.15
-%define                subver  305
-%define                githash b67258d
-%define                php_min_version 5.3.3
+%define                rel             1
+#define                subver  105
+#define                githash 9c49ee5
+%define                php_min_version 5.3.7
 %include       /usr/lib/rpm/macros.php
 Summary:       Eventum Issue / Bug tracking system
 Summary(pl.UTF-8):     Eventum - system śledzenia spraw/błędów
 Name:          eventum
-Version:       3.0.3
+Version:       3.0.4
 Release:       %{?subver:1.%{subver}.%{?githash:g%{githash}.}}%{rel}
 License:       GPL v2
 Group:         Applications/WWW
-#Source0:      https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Source0:       %{name}-%{version}-%{subver}-g%{githash}.tar.gz
-# Source0-md5: 5937959683a82b3f083f092a8408d037
+Source0:       https://github.com/eventum/eventum/releases/download/v%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 7c036b6c815a8e63f0b0b900f440c901
+#Source0:      %{name}-%{version}-%{subver}-g%{githash}.tar.gz
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -67,6 +67,7 @@ Requires:     php(pcre)
 Requires:      php(session)
 Requires:      php-Smarty >= 3.1
 Requires:      php-Smarty-plugin-gettext
+Requires:      php-ZendFramework-Config >= 2.4
 Requires:      php-pear-DB
 Requires:      php-pear-Mail
 Requires:      php-pear-Mail_Mime
@@ -88,6 +89,7 @@ Requires:     webserver(indexfile)
 Requires:      webserver(php) >= 4.2.0
 Suggests:      localedb
 Suggests:      php-pear-Net_LDAP2
+Suggests:      webserver(setenv)
 Provides:      group(eventum)
 Provides:      user(eventum)
 Obsoletes:     eventum-base < 3.0.3-1.305
@@ -450,9 +452,6 @@ This package contains the cron job.
 
 mv docs/examples .
 
-# GPL v2
-rm docs/COPYING
-
 # bug fixes / features
 %{?with_order:%patch2 -p1}
 #%patch3 -p0
@@ -500,7 +499,6 @@ vendor autoload.php
 vendor composer/autoload_{classmap,files,namespaces,real,psr4}.php
 vendor composer/ClassLoader.php
 vendor ircmaxell/{password-compat,random-lib,security-lib}
-vendor zendframework/zend-config
 
 # remove backups from patching as we use globs to package files to buildroot
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v