- up to r3966

- suggest glibc localedb for translations

Changed files:
    eventum-order.patch -> 1.26
    eventum.spec -> 1.307

diff --git a/eventum-order.patch b/eventum-order.patch
index 70ef5bd6a7e27c0d1cd402f0f3ae31dfb2488b7f..17a1a299e951cb541af02ce8db28fdb35eb40757 100644 (file)
--- a/eventum-order.patch
+++ b/eventum-order.patch
@@ -865,16 +865,16 @@
 +    }
 +    
  }
---- eventum-2.2/templates/header.tpl.html      2009-09-14 18:07:55.000000000 +0300
-+++ eventum-2.2-order/templates/header.tpl.html        2009-10-12 22:10:36.435851675 +0300
-@@ -8,6 +8,7 @@
+--- eventum-2.2/templates/header.tpl.html~     2009-11-04 21:14:31.000000000 +0200
++++ eventum-2.2/templates/header.tpl.html      2009-11-04 21:14:55.177881015 +0200
+@@ -21,6 +21,7 @@
  <script type="text/javascript" src="{$rel_url}js/jquery/form.js?c=9984"></script>
  <script type="text/javascript" src="{$rel_url}js/jquery/blockui.js?c=eb13"></script>
  <script type="text/javascript" src="{$rel_url}js/jquery/ui.datepicker.js?c=a911"></script>
 +<script type="text/javascript" src="{$rel_url}js/jquery/jquery.tablednd.js"></script>
- <link rel="stylesheet" href="{$rel_url}js/jquery/ui.datepicker.css?c=5096">
- <script type="text/javascript">
- <!--
+ {if $refresh_rate}
+ <meta http-equiv="Refresh" content="{$refresh_rate};URL={$rel_url}{$refresh_page}">
+ {/if}
 --- eventum-2.2/templates/list.tpl.html        2009-09-14 18:07:55.000000000 +0300
 +++ eventum-2.2-order/templates/list.tpl.html  2009-10-12 22:10:36.439185157 +0300
 @@ -92,6 +92,28 @@

diff --git a/eventum.spec b/eventum.spec
index 07e3bb9f769ac4ef7675b63e4db8bd60626c6c21..a5727cad9d4bbf3224c5885bde8f15d960d50523 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,8 +10,8 @@
 %bcond_without order   # with experimental order patch
 
 #define        snap    20060921
-%define        rev             r3934
-%define        rel             2.35
+%define        rev             r3966
+%define        rel             2.39
 #define        _rc             RC3
 
 %include       /usr/lib/rpm/macros.php
@@ -27,7 +27,7 @@ Group:                Applications/WWW
 #Source0:      http://mysql.easynet.be/Downloads/eventum/%{name}-%{version}.tar.gz
 # bzr branch lp:eventum eventum && tar -cjf eventum.tar.bz2 --exclude=.bzr --exclude=.bzrignore eventum
 Source0:       %{name}-%{version}-dev-%{rev}.tar.gz
-# Source0-md5: 2913cf48467a40785c26dbe4aacc7e68
+# Source0-md5: 4ce83d59543ee2e3bfe530e5b4e7d29b
 Source1:       %{name}-apache.conf
 Source2:       %{name}-mail-queue.cron
 Source3:       %{name}-mail-download.cron
@@ -89,6 +89,7 @@ Requires:     webserver(access)
 Requires:      webserver(alias)
 Requires:      webserver(indexfile)
 Requires:      webserver(php) >= 4.2.0
+Suggests:      localedb
 Conflicts:     logrotate < 3.7-4
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -448,7 +449,6 @@ rm -r upgrade/{*/,}index.html # not needed in PLD Linux
 %{?with_order:%patch2 -p1}
 
 cp -a %{SOURCE16} htdocs/images
-rm htdocs/images/eventum_high_quality.tiff
 
 #%patch200 -p1
 
@@ -468,6 +468,15 @@ EOF
 s;define('CONFIG_PATH'.*');define('CONFIG_PATH', '%{_webappdir}');
 " upgrade/{*/,}*.php
 
+
+install -d examples
+for a in lib/eventum/*/*example*.php; do
+       d=${a%/*} d=${d##lib/eventum/}
+       f=${a##*/}
+       install -d examples/$d
+       mv $a examples/$d/$f
+done
+
 # remove backups from patching as we use globs to package files to buildroot
 find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
 
@@ -655,7 +664,7 @@ fi
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc ChangeLog FAQ INSTALL README UPGRADE CONTRIB
-%doc docs/* htdocs/setup/schema.sql mysql-permissions.sql
+%doc docs/* examples htdocs/setup/schema.sql mysql-permissions.sql
 %attr(751,root,root) %dir %{_webappdir}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/apache.conf
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_webappdir}/httpd.conf