commit 92c68f54764de0ecef0a06bf7cac5dafeb04a794
Author: Elan Ruusamäe <[email protected]>
Date: Tue Aug 27 17:17:55 2013 +0300
Revert "- migrated to apache 2.4"
This reverts commit 87d065d5c4b7775b48e1179df2d07bbd3aa6c238.
tinymce.spec | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/tinymce.spec b/tinymce.spec
index 0c984d7..9a5db49 100644
--- a/tinymce.spec
+++ b/tinymce.spec
@@ -5,7 +5,7 @@ Summary: Web based Javascript HTML WYSIWYG editor control
Summary(pl.UTF-8): Kontrolka edytora WYSIWYG HTML-a oparta na WWW z
Javascriptem
Name: tinymce
Version: 3.2.7
-Release: 2
+Release: 1
License: LGPL v2
Group: Applications/WWW
Source0: http://downloads.sourceforge.net/tinymce/%{name}_%{ver}.zip
@@ -16,7 +16,6 @@ BuildRequires: sed >= 4.0
BuildRequires: unzip
Requires: webapps
Requires: webserver(alias)
-Conflicts: apache-base < 2.4.0-1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -86,13 +85,6 @@ Alias /tiny_mce/ %{_appdir}/
</Directory>
EOF
-cat <<'EOF' > httpd.conf
-Alias /tiny_mce/ %{_appdir}/
-<Directory %{_appdir}>
- Require all granted
-</Directory>
-EOF
-
cat > lighttpd.conf <<'EOF'
alias.url += (
"/tiny_mce/" => "%{_appdir}/",
@@ -107,7 +99,7 @@ cp -a example examples
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
cp -a jscripts/tiny_mce/* $RPM_BUILD_ROOT%{_appdir}
cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a apache.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -a lighttpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
%clean
@@ -119,10 +111,10 @@ rm -rf $RPM_BUILD_ROOT
%triggerun -- apache1 < 1.3.37-3, apache1-base
%webapp_unregister apache %{_webapp}
-%triggerin -- apache-base
+%triggerin -- apache < 2.2.0, apache-base
%webapp_register httpd %{_webapp}
-%triggerun -- apache-base
+%triggerun -- apache < 2.2.0, apache-base
%webapp_unregister httpd %{_webapp}
%triggerin -- lighttpd
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/tinymce.git/commitdiff/c6220444adfae66ea06700d5ffe17221efc63621
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
