commit bdd0e4451fdadca1a585a17e702941e60d5334f8
Author: Jan Rękorajski <[email protected]>
Date: Wed May 15 18:21:34 2013 +0200
- migrate to apache 2.4
- rel 3
ckeditor.spec | 10 ++++++----
httpd.conf | 5 +++++
2 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/ckeditor.spec b/ckeditor.spec
index 5fd4b63..513d754 100644
--- a/ckeditor.spec
+++ b/ckeditor.spec
@@ -5,7 +5,7 @@ Summary: The text editor for Internet
Summary(pl.UTF-8): Edytor tekstowy dla Internetu
Name: ckeditor
Version: 3.2.1
-Release: 2
+Release: 3
License: LGPL v2.1+ / GPL v2+ / MPL
Group: Applications/WWW
Source0:
http://download.cksource.com/CKEditor/CKEditor/CKEditor%20%{version}/%{name}_%{version}.tar.gz
@@ -14,6 +14,7 @@ URL: http://www.ckeditor.com/
Source1: find-lang.sh
Source2: apache.conf
Source3: lighttpd.conf
+Source4: httpd.conf
BuildRequires: lynx
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0
@@ -21,6 +22,7 @@ Requires: webapps
Requires: webserver
Requires: webserver(access)
Requires: webserver(alias)
+Conflicts: apache-base < 2.4.0-1
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -91,7 +93,7 @@ cp -a _samples/*
$RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
install -d $RPM_BUILD_ROOT%{_sysconfdir}
cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-cp -a %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
%find_lang %{name}.lang
@@ -108,10 +110,10 @@ cp -a %{SOURCE3}
$RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
%triggerun -- apache1 < 1.3.37-3, apache1-base
%webapp_unregister apache %{_webapp}
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
%webapp_register httpd %{_webapp}
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
%webapp_unregister httpd %{_webapp}
%triggerin -- lighttpd
diff --git a/httpd.conf b/httpd.conf
new file mode 100644
index 0000000..dd20829
--- /dev/null
+++ b/httpd.conf
@@ -0,0 +1,5 @@
+Alias /ckeditor/ /usr/share/ckeditor/
+
+<Directory /usr/share/ckeditor>
+ Require all granted
+</Directory>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ckeditor.git/commitdiff/bdd0e4451fdadca1a585a17e702941e60d5334f8
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
