packages: eventum/eventum-order.patch, eventum/eventum.spec - up to bzr 4155

[glen]

Author: glen                         Date: Wed Sep 29 16:50:50 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to bzr 4155

---- Files affected:
packages/eventum:
   eventum-order.patch (1.28 -> 1.29) , eventum.spec (1.319 -> 1.320) 

---- Diffs:

================================================================
Index: packages/eventum/eventum-order.patch
diff -u packages/eventum/eventum-order.patch:1.28 packages/eventum/eventum-order.patch:1.29
--- packages/eventum/eventum-order.patch:1.28	Wed Jul 28 20:24:43 2010
+++ packages/eventum/eventum-order.patch	Wed Sep 29 18:50:45 2010
@@ -868,14 +868,14 @@
 +    }
 +    
  }
---- eventum-2.2/templates/header.tpl.html~	2010-07-28 12:08:00.000000000 +0300
-+++ eventum-2.2/templates/header.tpl.html	2010-07-28 12:08:57.059079749 +0300
+--- eventum-2.3/templates/header.tpl.html~	2010-09-27 18:12:42.000000000 +0300
++++ eventum-2.3/templates/header.tpl.html	2010-09-27 18:13:08.884494665 +0300
 @@ -18,6 +18,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>
- <script type="text/javascript" src="{$rel_url}js/validation.js?c=7eb3"></script>
+ <script type="text/javascript" src="{$rel_url}js/validation.js?c=9775"></script>
  <script type="text/javascript" src="{$rel_url}js/browserSniffer.js?c=c046"></script>
  <script type="text/javascript" src="{$rel_url}js/global.js?c=5297"></script>
 --- eventum-2.2/templates/list.tpl.html	2009-09-14 18:07:55.000000000 +0300

================================================================
Index: packages/eventum/eventum.spec
diff -u packages/eventum/eventum.spec:1.319 packages/eventum/eventum.spec:1.320
--- packages/eventum/eventum.spec:1.319	Fri Aug 27 14:31:28 2010
+++ packages/eventum/eventum.spec	Wed Sep 29 18:50:45 2010
@@ -11,16 +11,19 @@
 %bcond_without	order	# with experimental order patch
 
 %define		php_min_version 5.1.2
+%define		subver	4155
+%define		rel		2
 %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:	2.3
-Release:	1
+Release:	%{rel}.bzr%{subver}
 License:	GPL
 Group:		Applications/WWW
-Source0:	http://launchpad.net/eventum/trunk/%{version}/+download/%{name}-%{version}.tar.gz
-# Source0-md5:	31c16e53f799dd41df2f08cfff75247b
+#Source0:	http://launchpad.net/eventum/trunk/%{version}/+download/%{name}-%{version}.tar.gz
+Source0:	%{name}-%{version}-dev-r%{subver}.tar.gz
+# Source0-md5:	3dc3793e8a5b9135b8ea05879f81159b
 Source1:	%{name}-apache.conf
 Source2:	%{name}-mail-queue.cron
 Source3:	%{name}-mail-download.cron
@@ -469,7 +472,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d \
 	$RPM_BUILD_ROOT{%{_webappdir},%{_sysconfdir},%{_bindir},%{_sbindir},%{_libdir}} \
-	$RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,sysconfig} \
+	$RPM_BUILD_ROOT/etc/{rc.d/init.d,cron.d,logrotate.d,sysconfig} \
 	$RPM_BUILD_ROOT/var/{run,cache,lib}/%{name} \
 	$RPM_BUILD_ROOT/var/log/{archive/,}%{name} \
 	$RPM_BUILD_ROOT/var/lib/%{name}/routed_{emails,drafts,notes} \
@@ -493,14 +496,14 @@
 
 cp -a %{SOURCE7} $RPM_BUILD_ROOT%{_webappdir}/irc_config.php
 
-cp -a %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/eventum-irc
+install -p %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/eventum-irc
 cp -a %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/eventum-irc
 
+cp -a %{SOURCE14} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+
 # postfix router
 install %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/router-postfix
 
-install -D %{SOURCE14} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
-
 %find_lang %{name}
 
 # scm
@@ -512,7 +515,7 @@
 
 # skip pear for cli
 rm -rf $RPM_BUILD_ROOT%{_datadir}/%{name}/cli
-cp -a cli/lib/eventum $RPM_BUILD_ROOT%{_datadir}/%{name}/cli
+install -p cli/lib/eventum $RPM_BUILD_ROOT%{_datadir}/%{name}/cli
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -524,7 +527,7 @@
 # greate empty ghost files
 for a in cli.log errors.log irc_bot.log login_attempts.log; do
 	if [ ! -f /var/log/%{name}/$a ]; then
-		install -m620 -oroot -geventum /dev/null /var/log/%{name}/$a
+		install -m 0620 -o root -g eventum /dev/null /var/log/%{name}/$a
 	fi
 done
 
@@ -742,6 +745,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.320  2010/09/29 16:50:45  glen
+- up to bzr 4155
+
 Revision 1.319  2010/08/27 12:31:28  glen
 - up to 2.3 release
 - spec cleanup
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum-order.patch?r1=1.28&r2=1.29&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/eventum/eventum.spec?r1=1.319&r2=1.320&f=u