packages: apache-mod_rails/apache-mod_rails-build.patch, apache-mod_rails/a...

baggins baggins at pld-linux.org
Mon Oct 10 22:10:32 CEST 2011 

Author: baggins                      Date: Mon Oct 10 20:10:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 3.0.9
- rdoc documentation is totally gone this time

---- Files affected:
packages/apache-mod_rails:
   apache-mod_rails-build.patch (1.1 -> 1.2) , apache-mod_rails-nogems.patch (1.3 -> 1.4) , apache-mod_rails.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: packages/apache-mod_rails/apache-mod_rails-build.patch
diff -u packages/apache-mod_rails/apache-mod_rails-build.patch:1.1 packages/apache-mod_rails/apache-mod_rails-build.patch:1.2
--- packages/apache-mod_rails/apache-mod_rails-build.patch:1.1	Thu Mar 31 13:19:36 2011
+++ packages/apache-mod_rails/apache-mod_rails-build.patch	Mon Oct 10 22:10:26 2011
@@ -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 @@

================================================================
Index: packages/apache-mod_rails/apache-mod_rails-nogems.patch
diff -u packages/apache-mod_rails/apache-mod_rails-nogems.patch:1.3 packages/apache-mod_rails/apache-mod_rails-nogems.patch:1.4
--- packages/apache-mod_rails/apache-mod_rails-nogems.patch:1.3	Thu Nov 25 02:05:11 2010
+++ packages/apache-mod_rails/apache-mod_rails-nogems.patch	Mon Oct 10 22:10:26 2011
@@ -21,9 +21,9 @@
  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'

================================================================
Index: packages/apache-mod_rails/apache-mod_rails.spec
diff -u packages/apache-mod_rails/apache-mod_rails.spec:1.24 packages/apache-mod_rails/apache-mod_rails.spec:1.25
--- packages/apache-mod_rails/apache-mod_rails.spec:1.24	Wed Aug 31 08:59:24 2011
+++ packages/apache-mod_rails/apache-mod_rails.spec	Mon Oct 10 22:10:26 2011
@@ -12,12 +12,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
@@ -28,6 +28,7 @@
 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
@@ -39,6 +40,7 @@
 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
@@ -47,18 +49,6 @@
 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
@@ -93,8 +83,6 @@
 	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}
@@ -102,9 +90,8 @@
 %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
 
@@ -124,7 +111,6 @@
 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
@@ -162,10 +148,6 @@
 %{_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
@@ -176,6 +158,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2011/10/10 20:10:26  baggins
+- 3.0.9
+- rdoc documentation is totally gone this time
+
 Revision 1.24  2011/08/31 06:59:24  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_rails/apache-mod_rails-build.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_rails/apache-mod_rails-nogems.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_rails/apache-mod_rails.spec?r1=1.24&r2=1.25&f=u

More information about the pld-cvs-commit mailing list