]> git.pld-linux.org Git - packages/horde-gollem.git/commitdiff
- migrate to apache 2.4 auto/th/horde-gollem-1.1.2-2
authorJan Rękorajski <baggins@pld-linux.org>
Wed, 15 May 2013 17:30:56 +0000 (19:30 +0200)
committerJan Rękorajski <baggins@pld-linux.org>
Wed, 15 May 2013 17:30:56 +0000 (19:30 +0200)
- rel 2

gollem-apache.conf [moved from gollem.conf with 98% similarity]
gollem-httpd.conf [new file with mode: 0644]
horde-gollem.spec

similarity index 98%
rename from gollem.conf
rename to gollem-apache.conf
index 0ddf6fcc81e4cebd7a61b70f9940903f61f612e9..c5104050267b53af684c73ca981dc8090f92387e 100644 (file)
@@ -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 (file)
index 0000000..80ec17a
--- /dev/null
@@ -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
index a24155376171a53afbc35835035f598b82ea4a83..44e8c8ced6249c1001d79257a1cfad41e9cdac45 100644 (file)
@@ -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}
This page took 0.144705 seconds and 4 git commands to generate.