SPECS (AC-branch): drupal.spec - drop old triggers

[glen]

Author: glen                         Date: Fri Sep 14 15:00:20 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- drop old triggers

---- Files affected:
SPECS:
   drupal.spec (1.73.2.1 -> 1.73.2.2) 

---- Diffs:

================================================================
Index: SPECS/drupal.spec
diff -u SPECS/drupal.spec:1.73.2.1 SPECS/drupal.spec:1.73.2.2
--- SPECS/drupal.spec:1.73.2.1	Mon Mar 19 17:30:06 2007
+++ SPECS/drupal.spec	Fri Sep 14 17:00:15 2007
@@ -5,7 +5,7 @@
 Summary(pl):	Platforma do zarz±dzania tre¶ci± o otwartych ¼ród³ach
 Name:		drupal
 Version:	%{_ver}.%{_patchlevel}
-Release:	3
+Release:	4
 License:	GPL
 Group:		Applications/WWW
 Source0:	http://drupal.org/files/projects/%{name}-%{version}.tar.gz
@@ -274,82 +274,6 @@
 %triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- %{name} < 4.6.4-0.4
-# rescue app configs.
-if [ -f /etc/drupal/sites/default/settings.php.rpmsave ]; then
-	mv -f %{_sysconfdir}/sites/default/settings.php{,.rpmnew}
-	mv -f /etc/drupal/sites/default/settings.php.rpmsave %{_sysconfdir}/sites/default/settings.php
-fi
-# other configured sites, if any
-for i in /etc/drupal/sites/*; do
-	d=$(basename $i)
-	[ "$d" = "default" ] && continue
-	mv -f %{_sysconfdir}/sites/$d{,.rpmnew}
-	mv -f $i %{_sysconfdir}/sites/$d
-done
-
-# migrate from apache-config macros
-if [ -f /etc/drupal/apache.conf.rpmsave ]; then
-	if [ -d /etc/apache/webapps.d ]; then
-		cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
-		cp -f /etc/drupal/apache.conf.rpmsave %{_sysconfdir}/apache.conf
-	fi
-
-	if [ -d /etc/httpd/webapps.d ]; then
-		cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-		cp -f /etc/drupal/apache.conf.rpmsave %{_sysconfdir}/httpd.conf
-	fi
-	rm -f /etc/drupal/apache.conf.rpmsave
-fi
-
-# place new config location, as trigger puts config only on first install, do it here.
-if [ -L /etc/apache/conf.d/99_%{name}.conf ]; then
-	rm -f /etc/apache/conf.d/99_%{name}.conf
-	/usr/sbin/webapp register apache %{_webapp}
-	apache_reload=1
-fi
-if [ -L /etc/httpd/httpd.conf/99_%{name}.conf ]; then
-	rm -f /etc/httpd/httpd.conf/99_%{name}.conf
-	/usr/sbin/webapp register httpd %{_webapp}
-	httpd_reload=1
-fi
-
-if [ "$httpd_reload" ]; then
-	%service -q httpd reload
-fi
-if [ "$apache_reload" ]; then
-	%service -q apache reload
-fi
-
-%triggerpostun -- %{name} < 4.6.8-0.5
-grep -l 'This_is_a_Drupal_security_line_do_not_remove' \
-%{_sysconfdir}/apache.conf %{_sysconfdir}/httpd.conf \
-| xargs -r \
-sed -i -e '
-/This_is_a_Drupal_security_line_do_not_remove/{
-	d
-	n
-	a\	SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
-	a\	Options None
-	a\	<IfModule mod_rewrite.c>
-	a\	\	RewriteEngine off
-	a\	</IfModule>
-}'
-egrep -c 'Drupal_Security_Do_Not_Remove_See_SA_2006_006' \
-%{_sysconfdir}/apache.conf %{_sysconfdir}/httpd.conf \
-| awk -F: '/:0/{print $1}' | xargs -r \
-sed -i -e '
-/<Directory \/var\/lib\/drupal>/{
-	n
-	a\	SetHandler Drupal_Security_Do_Not_Remove_See_SA_2006_006
-	a\	Options None
-	a\	<IfModule mod_rewrite.c>
-	a\	\	RewriteEngine off
-	a\	</IfModule>
-}'
-[ ! -L /etc/httpd/webapps.d/drupal.conf ] || %service -q httpd reload
-[ ! -L /etc/apache/webapps.d/drupal.conf ] || %service -q apache reload
-
 %files
 %defattr(644,root,root,755)
 %doc *.txt README.PLD
@@ -419,6 +343,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.73.2.2  2007/09/14 15:00:15  glen
+- drop old triggers
+
 Revision 1.73.2.1  2007/03/19 16:30:06  glen
 - provide virtual major version for inner package deps; rel 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/drupal.spec?r1=1.73.2.1&r2=1.73.2.2&f=u