From: Jan Rękorajski <baggins@pld-linux.org>
Date: Fri, 9 Dec 2011 11:35:29 +0000 (+0000)
Subject: - 3.0.11
X-Git-Tag: auto/th/apache-mod_rails-3_0_11-1
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=40e58ae264d1217fe4a4c9fb34dbe10e552f0398;p=packages%2Fpassenger.git

- 3.0.11

Changed files:
    apache-mod_rails-build.patch -> 1.3
    apache-mod_rails.spec -> 1.27
---

diff --git a/apache-mod_rails-build.patch b/apache-mod_rails-build.patch
index 7ff7f48..7b59c14 100644
--- a/apache-mod_rails-build.patch
+++ b/apache-mod_rails-build.patch
@@ -12,12 +12,16 @@
  else
  	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DPASSENGER_DEBUG -DBOOST_DISABLE_ASSERTS".strip
  end
-@@ -32,7 +33,7 @@
+@@ -32,10 +33,11 @@
  
  # Extra compiler flags that should always be passed to the C/C++ compiler.
  # Should be included last in the command string, even after PlatformInfo.portability_cflags.
--EXTRA_CXXFLAGS = "-Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long #{OPTIMIZATION_FLAGS}".strip
-+EXTRA_CXXFLAGS = "-Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long #{OPTIMIZATION_FLAGS} #{CXXFLAGS}".strip
+-EXTRA_CXXFLAGS = "-Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
++EXTRA_CXXFLAGS = "-Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-long-long"
+ EXTRA_CXXFLAGS << " -Wno-missing-field-initializers" if PlatformInfo.compiler_supports_wno_missing_field_initializers_flag?
+ EXTRA_CXXFLAGS << " -mno-tls-direct-seg-refs" if PlatformInfo.requires_no_tls_direct_seg_refs? && PlatformInfo.compiler_supports_no_tls_direct_seg_refs_option?
+ EXTRA_CXXFLAGS << " #{OPTIMIZATION_FLAGS}" if !OPTIMIZATION_FLAGS.empty?
++EXTRA_CXXFLAGS << " #{CXXFLAGS}" if !CXXFLAGS.empty?
  
  # Extra linker flags that should always be passed to the linker.
  # Should be included last in the command string, even after PlatformInfo.portability_ldflags.
diff --git a/apache-mod_rails.spec b/apache-mod_rails.spec
index dd351b9..6100a03 100644
--- a/apache-mod_rails.spec
+++ b/apache-mod_rails.spec
@@ -11,12 +11,12 @@
 
 Summary:	A module to bridge Ruby on Rails to Apache
 Name:		apache-mod_rails
-Version:	3.0.9
+Version:	3.0.11
 Release:	1
 License:	Apache
 Group:		Networking/Daemons/HTTP
 Source0:	http://rubygems.org/downloads/passenger-%{version}.gem
-# Source0-md5:	d616c8425071303b983b6c09fea8004a
+# Source0-md5:	c0cafef2c5ba522310602f451ea4c941
 Source1:	%{name}.conf
 Patch0:		%{name}-nogems.patch
 Patch1:		%{name}-alias+public.patch