SPECS: eventum.spec - fix irc bot package, add restart in %post - ...

glen glen at pld-linux.org
Sat Sep 17 16:55:36 CEST 2005


Author: glen                         Date: Sat Sep 17 14:55:36 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix irc bot package, add restart in %post
- cosmetics
- rel 4

---- Files affected:
SPECS:
   eventum.spec (1.115 -> 1.116) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.115 SPECS/eventum.spec:1.116
--- SPECS/eventum.spec:1.115	Wed Aug 24 11:31:29 2005
+++ SPECS/eventum.spec	Sat Sep 17 16:55:31 2005
@@ -19,7 +19,7 @@
 # release candidate
 #define _rc		RC1
 
-%define	_rel	3.2
+%define	_rel	4
 
 %if 0%{?_rc:1}
 %define	_source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz
@@ -88,7 +88,6 @@
 Requires:	php-pear-Net_DIME
 Requires:	php-pear-Net_POP3
 Requires:	php-pear-Net_SMTP
-Requires:	php-pear-Net_SmartIRC
 Requires:	php-pear-Net_Socket
 Requires:	php-pear-Net_URL
 Requires:	php-pear-Net_UserAgent_Detect
@@ -355,11 +354,12 @@
 Summary:	Eventum IRC Notification Bot
 Summary(pl):	IRC-owy bot powiadamiający dla Eventum
 Group:		Applications/WWW
+Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	php >= 4.1.0
 Requires:	php-sockets
-Requires(triggerpostun):	sed >= 4.0
-PreReq:		rc-scripts >= 0.4.0.18
+#Requires:	php-pear-Net_SmartIRC
+Requires:	rc-scripts >= 0.4.0.18
 
 %description irc
 The IRC notification bot is a nice feature for remote teams that want
@@ -440,11 +440,15 @@
 
 rm -f setup.conf.php
 rm -rf misc/upgrade/*v1.[123]* # too old to support in PLD
+rm -rf misc/upgrade/flush_compiled_templates.php
+
+# using system package
+#rm -rf include/pear/Net/SmartIRC*
 
 # packaging
 %patch0 -p1 -b .paths
 %patch1 -p1
-%patch2 -p1
+%patch2 -p1 -b .irc-config
 %{?with_pear:%patch3 -p1 -b .PEAR}
 
 # bug fixes.
@@ -460,9 +464,6 @@
 grep -rl 'include_once(".*config.inc.php")' . | xargs sed -i -e '
 	s,include_once(".*config.inc.php"),include_once("%{_sysconfdir}/core.php"),
 '
-sed -i -e '
-	s,include(".*config.inc.php"),include_once("%{_sysconfdir}/core.php"),
-' misc/download_emails.php
 
 grep -rl 'APP_INC_PATH..*"private_key.php"' . | xargs sed -i -e '
 	s,include_once(APP_INC_PATH.*"private_key.php"),include_once("%{_sysconfdir}/private_key.php"),
@@ -673,6 +674,14 @@
 	chown root:eventum %{_sysconfdir}/{config,private_key}.php
 fi
 
+%post irc
+/sbin/chkconfig --add eventum-irc
+if [ -f /var/lock/subsys/eventum-irc ]; then
+	/etc/rc.d/init.d/eventum-irc restart >&2
+else
+	echo "Run \"/etc/rc.d/init.d/eventum-irc start\" to start Eventum IRC Bot." >&2
+fi
+
 %triggerin -- apache1 >= 1.3.33-2
 %apache_config_install -v 1 -c %{_sysconfdir}/apache.conf
 
@@ -721,13 +730,14 @@
 database_changes.php Perform database changes
 EOF
 
-%triggerpostun irc -- eventum-irc < 1.6.1
+%triggerpostun irc -- eventum-irc < 1.6.1-3.14
 sed -i -e '
 s,\$irc_host,$irc_server_hostname,
 s,\$irc_port,$irc_server_port,
 s,\$irc_nick,$nickname,
 s,\$irc_realname,$realname,
 s,\$irc_username,$username,
+s,\$irc_password,$password,
 ' /etc/eventum/irc.php
 
 %files
@@ -858,6 +868,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.116  2005/09/17 14:55:31  glen
+- fix irc bot package, add restart in %post
+- cosmetics
+- rel 4
+
 Revision 1.115  2005/08/24 09:31:29  glen
 - htmloptions truncate patch
 
================================================================

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




More information about the pld-cvs-commit mailing list