SPECS: eventum.spec - merge last triggers together for smooth upgr...

[glen]

Author: glen                         Date: Wed Nov 30 17:45:32 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merge last triggers together for smooth upgrade since last release

---- Files affected:
SPECS:
   eventum.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.128 SPECS/eventum.spec:1.129
--- SPECS/eventum.spec:1.128	Wed Nov 30 17:35:52 2005
+++ SPECS/eventum.spec	Wed Nov 30 18:45:26 2005
@@ -19,7 +19,7 @@
 # release candidate
 #define _rc		RC1
 
-%define	_rel	4.24
+%define	_rel	4.26
 
 %if 0%{?_rc:1}
 %define	_source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz
@@ -744,7 +744,7 @@
 s,\$irc_password,$password,
 ' /etc/eventum/irc.php
 
-%triggerpostun -- %{name} < 1.6.1-4.18
+%triggerpostun -- eventum < 1.7.0-0.20051130.4.25
 # migrate from apache-config macros
 if [ -f /etc/%{name}/apache.conf.rpmsave ]; then
 	if [ -d /etc/apache/webapps.d ]; then
@@ -773,6 +773,11 @@
 	fi
 fi
 
+%{_appdir}/upgrade/upgrade.sh %{_appdir}/upgrade/v1.6.1_to_v1.7.0 <<EOF
+database_changes.php Perform database changes
+set_root_message_ids.php Set iss_root_message_id
+EOF
+
 # regular configs
 for i in apache.conf config.php private_key.php setup.php; do
 	if [ -f /etc/eventum/$i.rpmsave ]; then
@@ -793,12 +798,6 @@
 	mv -f /etc/eventum/irc.php.rpmsave %{_sysconfdir}/irc.php
 fi
 
-%triggerpostun -- eventum < 1.7.0-0.20051130.4.24
-%{_appdir}/upgrade/upgrade.sh %{_appdir}/upgrade/v1.6.1_to_v1.7.0 <<EOF
-database_changes.php Perform database changes
-set_root_message_ids.php Set iss_root_message_id
-EOF
-
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog FAQ INSTALL README UPGRADE
@@ -928,6 +927,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2005/11/30 17:45:26  glen
+- merge last triggers together for smooth upgrade since last release
+
 Revision 1.128  2005/11/30 16:35:52  glen
 - patch renumber
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.128&r2=1.129&f=u