SPECS: drupal-mod-tinymce.spec - drop trigger

[glen]

Author: glen                         Date: Fri May 19 21:30:57 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop trigger

---- Files affected:
SPECS:
   drupal-mod-tinymce.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/drupal-mod-tinymce.spec
diff -u SPECS/drupal-mod-tinymce.spec:1.10 SPECS/drupal-mod-tinymce.spec:1.11
--- SPECS/drupal-mod-tinymce.spec:1.10	Thu Feb  2 16:14:49 2006
+++ SPECS/drupal-mod-tinymce.spec	Fri May 19 23:30:52 2006
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - webapps: register this pkg only if this webserver instance has drupal webapp configured
 %define		modname tinymce
 Summary:	Drupal TinyMCE WYSIWYG Editor Module
 Summary(pl):	Moduł edytora WYSIWYG TinyMCE dla Drupala
@@ -13,9 +15,9 @@
 URL:		http://drupal.org/project/tinymce
 BuildRequires:	rpmbuild(macros) >= 1.264
 BuildRequires:	sed >= 4.0
-Requires:	webapps >= 0.2
 Requires:	drupal >= 4.6.0
 Requires:	tinymce >= 1.44
+Requires:	webapps >= 0.2
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -92,50 +94,11 @@
 %webapp_unregister apache %{_webapp}
 
 %triggerin -- apache < 2.2.0, apache-base
-# TODO install it only if this apache instance has drupal configured
 %webapp_register httpd %{_webapp}
 
 %triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
-%triggerpostun -- %{name} < 4.6.0-0.25
-# migrate from apache-config macros
-if [ -f /etc/drupal/apache-tinymce.conf.rpmsave ]; then
-	if [ -d /etc/apache/webapps.d ]; then
-		cp -f %{_sysconfdir}/apache.conf{,.rpmnew}
-		cp -f /etc/drupal/apache-tinymce.conf.rpmsave %{_sysconfdir}/apache.conf
-	fi
-
-	if [ -d /etc/httpd/webapps.d ]; then
-		cp -f %{_sysconfdir}/httpd.conf{,.rpmnew}
-		cp -f /etc/drupal/apache-tinymce.conf.rpmsave %{_sysconfdir}/httpd.conf
-	fi
-	rm -f /etc/drupal/apache-tinymce.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
-	if [ -f /var/lock/subsys/httpd ]; then
-		/etc/rc.d/init.d/httpd reload 1>&2
-	fi
-fi
-if [ "$apache_reload" ]; then
-	if [ -f /var/lock/subsys/apache ]; then
-		/etc/rc.d/init.d/apache reload 1>&2
-	fi
-fi
-
 %files
 %defattr(644,root,root,755)
 %doc *.txt tinymce.{mysql,pgsql}
@@ -153,6 +116,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/05/19 21:30:52  glen
+- drop trigger
+
 Revision 1.10  2006/02/02 15:14:49  glen
 - update apache2 trigger to match apache-base in case somebody decides not to
   use apache2.2 virtual pkg (freedom of choice one of the pld mottos)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/drupal-mod-tinymce.spec?r1=1.10&r2=1.11&f=u