- up to bzr 4155

Changed files:
    eventum-order.patch -> 1.29
    eventum.spec -> 1.320

diff --git a/eventum-order.patch b/eventum-order.patch
index 68131783e74a1c84783aefdc82ed138520bfd65d..cfd70f370eeca2a7803bd6de1e46b88e7da8689b 100644 (file)
--- a/eventum-order.patch
+++ b/eventum-order.patch
@@ -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

diff --git a/eventum.spec b/eventum.spec
index e3bc2c45955cd106398ce8c54763cc4b8a38541e..dc9ddc4c377639827d041bd45f4943b2e655fb1a 100644 (file)
--- a/eventum.spec
+++ b/eventum.spec
@@ -10,16 +10,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
@@ -468,7 +471,7 @@ find '(' -name '*~' -o -name '*.orig' ')' | xargs -r rm -v
 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} \
@@ -492,14 +495,14 @@ cp -a %{SOURCE5} $RPM_BUILD_ROOT/etc/cron.d/%{name}-monitor
 
 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
@@ -511,7 +514,7 @@ ln -s %{_sbindir}/eventum-svn-hook $RPM_BUILD_ROOT%{_libdir}/process_svn_commits
 
 # 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
@@ -523,7 +526,7 @@ rm -rf $RPM_BUILD_ROOT
 # 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