Author: glen Date: Wed Nov 4 20:57:28 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- up to r3966
- suggest glibc localedb for translations
---- Files affected:
packages/eventum:
eventum-order.patch (1.25 -> 1.26) , eventum.spec (1.306 -> 1.307)
---- Diffs:
================================================================
Index: packages/eventum/eventum-order.patch
diff -u packages/eventum/eventum-order.patch:1.25
packages/eventum/eventum-order.patch:1.26
--- packages/eventum/eventum-order.patch:1.25 Tue Oct 13 10:45:33 2009
+++ packages/eventum/eventum-order.patch Wed Nov 4 21:57:22 2009
@@ -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 @@
================================================================
Index: packages/eventum/eventum.spec
diff -u packages/eventum/eventum.spec:1.306 packages/eventum/eventum.spec:1.307
--- packages/eventum/eventum.spec:1.306 Tue Oct 13 11:07:42 2009
+++ packages/eventum/eventum.spec Wed Nov 4 21:57:22 2009
@@ -11,8 +11,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
@@ -28,7 +28,7 @@
#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
@@ -90,6 +90,7 @@
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)
@@ -449,7 +450,6 @@
%{?with_order:%patch2 -p1}
cp -a %{SOURCE16} htdocs/images
-rm htdocs/images/eventum_high_quality.tiff
#%patch200 -p1
@@ -469,6 +469,15 @@
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
@@ -656,7 +665,7 @@
%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
@@ -782,6 +791,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.307 2009/11/04 20:57:22 glen
+- up to r3966
+- suggest glibc localedb for translations
+
Revision 1.306 2009/10/13 09:07:42 glen
- Services/JSON.php is optional, fix order image
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-order.patch?r1=1.25&r2=1.26&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.306&r2=1.307&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
