[packages/horde-gollem] - migrate to apache 2.4 - rel 2

baggins baggins at pld-linux.org
Wed May 15 19:31:07 CEST 2013


commit ea08383d70d67da3fa3b848fe4b6e875a8acc413
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed May 15 19:30:56 2013 +0200

    - migrate to apache 2.4
    - rel 2

 gollem.conf => gollem-apache.conf |  2 --
 gollem-httpd.conf                 | 14 ++++++++++++++
 horde-gollem.spec                 | 12 +++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)
---
diff --git a/horde-gollem.spec b/horde-gollem.spec
index a241553..44e8c8c 100644
--- a/horde-gollem.spec
+++ b/horde-gollem.spec
@@ -5,12 +5,13 @@ Summary:	Gollem - the Horde File Manager
 Summary(pl.UTF-8):	Gollem - zarządca plików Horde
 Name:		horde-%{_hordeapp}
 Version:	1.1.2
-Release:	1
+Release:	2
 License:	GPL
 Group:		Applications/WWW
 Source0:	ftp://ftp.horde.org/pub/gollem/%{_hordeapp}-h3-%{version}.tar.gz
 # Source0-md5:	3740dfcca07e02eb70f1af2235d270ae
-Source1:	%{_hordeapp}.conf
+Source1:	%{_hordeapp}-apache.conf
+Source2:	%{_hordeapp}-httpd.conf
 Patch0:		%{_hordeapp}-prefs.patch
 URL:		http://www.horde.org/gollem/
 BuildRequires:	rpm-php-pearprov >= 4.0.2-98
@@ -19,6 +20,7 @@ Requires:	horde >= 3.0
 Requires:	webapps
 Suggests:	php(ftp)
 Obsoletes:	gollem
+Conflicts:	apache-base < 2.4.0-1
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -74,7 +76,7 @@ cp -a docs/CREDITS $RPM_BUILD_ROOT%{_appdir}/docs
 
 ln -s %{_sysconfdir} $RPM_BUILD_ROOT%{_appdir}/config
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -90,10 +92,10 @@ fi
 %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}
 
 %triggerpostun -- horde-%{_hordeapp} < 1.0-2.3, %{_hordeapp}
diff --git a/gollem.conf b/gollem-apache.conf
similarity index 98%
rename from gollem.conf
rename to gollem-apache.conf
index 0ddf6fc..c510405 100644
--- a/gollem.conf
+++ b/gollem-apache.conf
@@ -1,5 +1,3 @@
-# $Id$
-
 <Directory "/usr/share/horde/gollem/config">
     order deny,allow
     deny from all
diff --git a/gollem-httpd.conf b/gollem-httpd.conf
new file mode 100644
index 0000000..80ec17a
--- /dev/null
+++ b/gollem-httpd.conf
@@ -0,0 +1,14 @@
+<Directory "/usr/share/horde/gollem/config">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/gollem/lib">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/gollem/locale">
+    Require all denied
+</Directory>
+<Directory "/usr/share/horde/gollem/templates">
+    Require all denied
+</Directory>
+
+# vim: filetype=apache ts=4 sw=4 et
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/horde-gollem.git/commitdiff/ea08383d70d67da3fa3b848fe4b6e875a8acc413



More information about the pld-cvs-commit mailing list