SPECS: eventum.spec - fix dead symlink

[glen]

Author: glen                         Date: Mon Nov 28 09:57:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix dead symlink

---- Files affected:
SPECS:
   eventum.spec (1.123 -> 1.124) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.123 SPECS/eventum.spec:1.124
--- SPECS/eventum.spec:1.123	Mon Nov 28 10:16:13 2005
+++ SPECS/eventum.spec	Mon Nov 28 10:57:04 2005
@@ -19,7 +19,7 @@
 # release candidate
 #define _rc		RC1
 
-%define	_rel	4.17
+%define	_rel	4.19
 
 %if 0%{?_rc:1}
 %define	_source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz
@@ -438,7 +438,7 @@
 %prep
 %setup -q %{?_snap:-n %{name}-%{_snap}}
 # undos the source
-find . -type f -print0 | xargs -0 sed -i -e 's,
$,,'
+find . -type f -print0 | xargs -0 sed -i -e 's,\r$,,'
 
 rm -f setup.conf.php
 rm -rf misc/upgrade/*v1.[123]* # too old to support in PLD
@@ -745,7 +745,7 @@
 s,\$irc_password,$password,
 ' /etc/eventum/irc.php
 
-%triggerpostun -- %{name} < 1.6.1-4.16
+%triggerpostun -- %{name} < 1.6.1-4.18
 # migrate from apache-config macros
 if [ -f /etc/%{name}/apache.conf.rpmsave ]; then
 	if [ -d /etc/apache/webapps.d ]; then
@@ -759,6 +759,21 @@
 	fi
 fi
 
+if [ -L /etc/apache/conf.d/99_%{_webapp}.conf ]; then
+	/usr/sbin/webapp register apache %{_webapp}
+	rm -f /etc/apache/conf.d/99_%{_webapp}.conf
+	if [ -f /var/lock/subsys/apache ]; then
+		/etc/rc.d/init.d/apache reload 1>&2
+	fi
+fi
+if [ -L /etc/httpd/httpd.conf/99_%{_webapp}.conf ]; then
+	/usr/sbin/webapp register httpd %{_webapp}
+	rm -f /etc/httpd/httpd.conf/99_%{_webapp}.conf
+	if [ -f /var/lock/subsys/httpd ]; then
+		/etc/rc.d/init.d/httpd reload 1>&2
+	fi
+fi
+
 # regular configs
 for i in apache.conf config.php core.php private_key.php setup.php; do
 	if [ -f /etc/eventum/$i.rpmsave ]; then
@@ -908,6 +923,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124  2005/11/28 09:57:04  glen
+- fix dead symlink
+
 Revision 1.123  2005/11/28 09:16:13  glen
 - use webapps framework
 - fix php epoch and remove it from subpackages requring main package
================================================================

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