[packages/redmine] - migrated to apache 2.4

baggins baggins at pld-linux.org
Fri May 17 11:26:04 CEST 2013


commit 79dbe49d58221c58d6f17bde5e73cc94b2c76472
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri May 17 11:26:03 2013 +0200

    - migrated to apache 2.4

 redmine.conf | 2 +-
 redmine.spec | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/redmine.spec b/redmine.spec
index f5cccd3..d6cba9a 100644
--- a/redmine.spec
+++ b/redmine.spec
@@ -6,7 +6,7 @@
 Summary:	Flexible project management web application
 Name:		redmine
 Version:	1.3.2
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		Applications/WWW
 Source0:	http://rubyforge.org/frs/download.php/75910/%{name}-%{version}.tar.gz
@@ -51,6 +51,7 @@ Suggests:	ruby-mysql-library
 Suggests:	ruby-openid >= 2.1.4
 Suggests:	subversion >= 1.3
 Provides:	user(redmine)
+Conflicts:	apache-base < 2.4.0-1
 # Does not work AT ALL with rails 3 currently
 Conflicts:	ruby-rails >= 3.0
 BuildArch:	noarch
@@ -205,11 +206,11 @@ if [ "$1" = "0" ]; then
 	%userremove redmine
 fi
 
-%triggerin -- apache < 2.2.0, apache-base
+%triggerin -- apache-base
 %webapp_register httpd %{_webapp}
 %addusertogroup -q redmine http
 
-%triggerun -- apache < 2.2.0, apache-base
+%triggerun -- apache-base
 %webapp_unregister httpd %{_webapp}
 
 %files
diff --git a/redmine.conf b/redmine.conf
index e6811ee..ff19741 100644
--- a/redmine.conf
+++ b/redmine.conf
@@ -4,7 +4,7 @@ Alias /redmine /usr/share/redmine/public
 # Neither mod_ruby nor cgi/fcgi work reliably with ruby 1.9/rails 2.3
 
 <Directory /usr/share/redmine/public>
-	Allow from all
+	Require all granted
 	Options -MultiViews
 
 	RailsBaseURI /redmine
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/redmine.git/commitdiff/79dbe49d58221c58d6f17bde5e73cc94b2c76472



More information about the pld-cvs-commit mailing list