- update apache2 trigger to match apache-base in case somebody decides not to

[packages/drupal-mod-tinymce.git] / drupal-mod-tinymce.spec

diff --git a/drupal-mod-tinymce.spec b/drupal-mod-tinymce.spec
index e4fec4f58a9e29d440de11b942b2019e9d034bae..be3504a272b0462cd6e094bd172b38e52f14337d 100644 (file)
--- a/drupal-mod-tinymce.spec
+++ b/drupal-mod-tinymce.spec
@@ -3,11 +3,11 @@ Summary:      Drupal TinyMCE WYSIWYG Editor Module
 Summary(pl):   Modu³ edytora WYSIWYG TinyMCE dla Drupala
 Name:          drupal-mod-%{modname}
 Version:       4.6.0
-Release:       0.25
+Release:       0.26
 License:       GPL
 Group:         Applications/WWW
 Source0:       http://drupal.org/files/projects/%{modname}-%{version}.tar.gz
-# Source0-md5: dd7630860baf1f7f470d71c272d275eb
+# Source0-md5: 050b885a5437c492f2e9d49181db9326
 Source1:       %{name}.conf
 URL:           http://drupal.org/project/tinymce
 BuildRequires: rpmbuild(macros) >= 1.264
@@ -51,8 +51,7 @@ Mo
 rm -f LICENSE.txt # pure GPL
 
 # undos the source
-find '(' -name '*.txt' ')' -print0 | xargs -0 sed -i -e 's,
-$,,'
+find '(' -name '*.txt' ')' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -91,11 +90,11 @@ fi
 %triggerun -- apache1
 %webapp_unregister apache %{_webapp}
 
-%triggerin -- apache >= 2.0.0
+%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.0.0
+%triggerun -- apache < 2.2.0, apache-base
 %webapp_unregister httpd %{_webapp}
 
 %triggerpostun -- %{name} < 4.6.0-0.25