- 3.0.9

- rdoc documentation is totally gone this time

Changed files:
    apache-mod_rails-build.patch -> 1.2
    apache-mod_rails-nogems.patch -> 1.4
    apache-mod_rails.spec -> 1.25

diff --git a/apache-mod_rails-build.patch b/apache-mod_rails-build.patch
index 671bbfd401a6e16786039770b7ad21a66f967e3c..7ff7f48267fa5fbd6db656cb4f186cbfa357d850 100644 (file)
--- a/apache-mod_rails-build.patch
+++ b/apache-mod_rails-build.patch
@@ -1,10 +1,11 @@
 --- apache-mod_rails-3.0.5/build/config.rb~    2011-03-11 12:11:27.000000000 +0100
 +++ apache-mod_rails-3.0.5/build/config.rb     2011-03-30 22:02:43.754874026 +0200
-@@ -24,8 +24,9 @@
+@@ -24,9 +24,10 @@
  OPTIMIZE = boolean_option("OPTIMIZE")
  CC       = string_option("CC", "gcc")
  CXX      = string_option("CXX", "g++")
 +CXXFLAGS = string_option("CXXFLAGS", "")
+ # TODO: consider -fcommon
  if OPTIMIZE
 -      OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
 +      OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -DBOOST_DISABLE_ASSERTS".strip
@@ -15,21 +16,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 = "-Wall #{OPTIMIZATION_FLAGS}".strip
-+EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS} #{CXXFLAGS}".strip
+-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 linker flags that should always be passed to the linker.
  # Should be included last in the command string, even after PlatformInfo.portability_ldflags.
---- apache-mod_rails-3.0.5/build/documentation.rb~     2011-03-11 12:11:27.000000000 +0100
-+++ apache-mod_rails-3.0.5/build/documentation.rb      2011-03-31 11:16:37.399444136 +0200
-@@ -78,7 +78,6 @@
-               "lib/phusion_passenger/*.rb",
-               "lib/phusion_passenger/*/*.rb",
-               "ext/phusion_passenger/*.c")
--      rd.template = "./doc/template/horo"
-       rd.title = "Passenger Ruby API"
-       rd.options << "-S" << "-N" << "-p" << "-H"
- end
 --- apache-mod_rails-3.0.5/ext/libev/configure.ac~     2011-03-11 12:11:27.000000000 +0100
 +++ apache-mod_rails-3.0.5/ext/libev/configure.ac      2011-03-31 11:39:27.773936137 +0200
 @@ -8,10 +8,6 @@

diff --git a/apache-mod_rails-nogems.patch b/apache-mod_rails-nogems.patch
index 863dd1b348e01b331121f23da423f6e3809ecabe..19c5d2b5ef397a5ac84e8242fab565602088e13a 100644 (file)
--- a/apache-mod_rails-nogems.patch
+++ b/apache-mod_rails-nogems.patch
@@ -21,9 +21,9 @@ diff -ur apache-mod_rails-3.0.0-o//build/basics.rb apache-mod_rails-3.0.0/build/
  require 'phusion_passenger'
  require 'phusion_passenger/packaging'
 @@ -32,8 +31,6 @@
+ include PhusionPassenger
  include PhusionPassenger::PlatformInfo
  
- require 'build/rdoctask'
 -require 'build/packagetask'
 -require 'build/gempackagetask'
  require 'build/rake_extensions'

diff --git a/apache-mod_rails.spec b/apache-mod_rails.spec
index d6bff0c941d13336985e887fc479b314446311af..09acf59bc936d141e915c1f33975a3371bfe5961 100644 (file)
--- 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.6
-Release:       3
+Version:       3.0.9
+Release:       1
 License:       Apache
 Group:         Networking/Daemons/HTTP
 Source0:       http://rubygems.org/downloads/passenger-%{version}.gem
-# Source0-md5: 2110a38db4b91603eca0616b9ce7bb5f
+# Source0-md5: d616c8425071303b983b6c09fea8004a
 Source1:       %{name}.conf
 Patch0:                %{name}-nogems.patch
 Patch1:                %{name}-alias+public.patch
@@ -27,6 +27,7 @@ BuildRequires:        apache-devel >= 2.0.55-1
 BuildRequires: apache-tools >= 2.0.55-1
 BuildRequires: apr-devel >= 1:1.0.0
 BuildRequires: apr-util-devel >= 1:1.0.0
+#BuildRequires:        asciidoc
 BuildRequires: curl-devel
 BuildRequires: libstdc++-devel
 BuildRequires: openssl-devel
@@ -38,6 +39,7 @@ BuildRequires:        ruby-rake >= 0.8.0
 BuildRequires: sed >= 4.0
 BuildRequires: zlib-devel
 Provides:      apache(mod_rails)
+Obsoletes:     apache-mod_rails-rdoc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,18 +48,6 @@ applications built on the revolutionary Ruby on Rails web framework a
 breeze. It follows the usual Ruby on Rails conventions, such as
 "Don’t-Repeat-Yourself".
 
-%package rdoc
-Summary:       HTML documentation for Apache mod_rails
-Summary(pl.UTF-8):     Dokumentacja w formacie HTML dla Apache mod_rails
-Group:         Documentation
-Requires:      ruby >= 1:1.8.7-4
-
-%description rdoc
-HTML documentation for Apache mod_rails.
-
-%description rdoc -l pl.UTF-8
-Dokumentacja w formacie HTML dla Apache mod_rails.
-
 %package ri
 Summary:       ri documentation for Apache mod_rails
 Summary(pl.UTF-8):     Dokumentacja w formacie ri dla Apache mod_rails
@@ -92,8 +82,6 @@ rake apache2 \
        CXX=%{__cxx} \
        CC=%{__cc}
 
-rake doc
-
 rdoc --ri --op ri lib ext/ruby
 %{__rm} -r ri/{ConditionVariable,Exception,GC,IO,Object,Process,Signal}
 %{__rm} ri/{cache.ri,created.rid}
@@ -101,9 +89,8 @@ rdoc --ri --op ri lib ext/ruby
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_mandir}/man{1,8}} \
-       $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}} \
+       $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_archdir},%{ruby_ridir}} \
        $RPM_BUILD_ROOT%{_bindir} \
-       $RPM_BUILD_ROOT%{ruby_archdir} \
        $RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents/apache2 \
        $RPM_BUILD_ROOT%{_datadir}/phusion-passenger/helper-scripts
 
@@ -123,7 +110,6 @@ cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 install man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-cp -a doc/rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_rails.conf
@@ -161,10 +147,6 @@ fi
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 
-%files rdoc
-%defattr(644,root,root,755)
-%{ruby_rdocdir}/%{name}-%{version}
-
 %files ri
 %defattr(644,root,root,755)
 %{ruby_ridir}/PhusionPassenger