[rubygem-railties] Update to Railties 3.2.6.

Bohuslav Kabrda bkabrda at fedoraproject.org
Mon Jul 23 13:10:06 UTC 2012


commit 49d177f92cec5f539cc598b6a0dbbfc6cdce9564
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Jul 23 15:09:45 2012 +0200

    Update to Railties 3.2.6.
    
    - Move some files into -doc subpackage.
    - Remove the unneeded %defattr.
    - Introduce %check section (not running tests yet, as they are part of dependency loop).

 .gitignore            |    2 +
 MIT-LICENSE           |    2 +-
 rubygem-railties.spec |   81 +++++++++++++++++++++++++++++++++++++++----------
 sources               |    3 +-
 4 files changed, 70 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8699f8a..31c63dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@
 /railties-3.0.11.gem
 /railties-3.0.13.gem
 /railties-3.0.15.gem
+/railties-3.2.6-tests.tgz
+/railties-3.2.6.gem
diff --git a/MIT-LICENSE b/MIT-LICENSE
index 86bcb23..03bde18 100644
--- a/MIT-LICENSE
+++ b/MIT-LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2004-2010 David Heinemeier Hansson
+Copyright (c) 2004-2012 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/rubygem-railties.spec b/rubygem-railties.spec
index ce62ba4..720f40d 100644
--- a/rubygem-railties.spec
+++ b/rubygem-railties.spec
@@ -5,10 +5,12 @@
 
 %global rubyabi 1.9.1
 
+%global runtests 0
+
 Summary: Tools for creating, working with, and running Rails applications
 Name: rubygem-%{gem_name}
-Version: 3.0.15
-Release: 2%{?dist}
+Version: 3.2.6
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
@@ -16,17 +18,38 @@ Source0: %{download_path}%{gem_name}-%{version}.gem
 # ** Take LICENSE file from upstream. **
 # wget --no-check-certificate https://github.com/rails/rails/raw/master/railties/MIT-LICENSE
 Source1: http://github.com/rails/rails/raw/master/railties/MIT-LICENSE
+# to get tests:
+# git clone http://github.com/rails/rails.git && cd rails/railties/
+# git checkout v3.2.6 && tar czvf railties-3.2.6-tests.tgz test/
+Source2: railties-%{version}-tests.tgz
+# Let's keep Requires and BuildRequires sorted alphabeticaly
 Requires: ruby(abi) = %{rubyabi}
 Requires: ruby(rubygems)
-Requires: rubygem(rake) >= 0.8.7
-Requires: rubygem(thor) >= 0.14.4
-Requires: rubygem(thor) < 0.15
-Requires: rubygem(activesupport) = %{version}
 Requires: rubygem(actionpack) = %{version}
-Requires: rubygem(rdoc) => 3.4
+Requires: rubygem(activesupport) = %{version}
+Requires: rubygem(rake) >= 0.8.7
+Requires: rubygem(rack-ssl) >= 1.3.2
+Requires: rubygem(rack-ssl) < 1.4
+Requires: rubygem(rdoc) >= 3.4
 Requires: rubygem(rdoc) < 4
+Requires: rubygem(thor) >= 0.14.6
+Requires: rubygem(thor) < 2.0
 BuildRequires: rubygems-devel
 BuildRequires: ruby(abi) = %{rubyabi}
+%if 0%{?runtests}
+BuildRequires: rubygem(actionpack) = %{version}
+BuildRequires: rubygem(activerecord) = %{version}
+BuildRequires: rubygem(activesupport) = %{version}
+BuildRequires: rubygem(bundler)
+BuildRequires: rubygem(minitest)
+BuildRequires: rubygem(mocha)
+BuildRequires: rubygem(rake) >= 0.8.7
+BuildRequires: rubygem(rack-ssl) >= 1.3.2
+BuildRequires: rubygem(rack-ssl) < 1.4
+BuildRequires: rubygem(sqlite3)
+BuildRequires: rubygem(thor) >= 0.14.6
+BuildRequires: rubygem(thor) < 2.0
+%endif
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
 
@@ -48,13 +71,12 @@ This package contains documentation for %{name}.
 %prep
 %setup -q -c -T
 %{__mkdir_p} .%{gem_dir}
+%{__mkdir_p} .%{_bindir}
 gem install --local --install-dir .%{gem_dir} \
-            --force -V --rdoc %{SOURCE0}
+            --force -V --rdoc %{SOURCE0} \
+            --bindir .%{_bindir}
 %{__rm} -Rf .%{gem_instdir}/.yardoc
 
-# move LICENSE file into place
-%{__install} -m 644 %{SOURCE1} .%{gem_instdir}/.
-
 # May by only for v.3.0.3-6
 #  
 # Some stylesheet seems to be mistakingly marked as executable in the upstream
@@ -65,23 +87,50 @@ find .%{gem_instdir} -name *.css -type f -perm /a+x -exec %{__chmod} -v 644 {} \
 
 %install
 %{__mkdir_p} %{buildroot}%{gem_dir}
+%{__mkdir_p} %{buildroot}%{_bindir}
 %{__cp} -a .%{gem_dir}/* %{buildroot}%{gem_dir}
+%{__cp} -a .%{_bindir}/* %{buildroot}%{_bindir}
+%{__cp} %{SOURCE1} %{buildroot}%{gem_instdir}
+
+%check
+%if 0%{?runtests}
+# fake RAILS_FRAMEWORK_ROOT
+ln -s %{gem_dir}/gems/activesupport-%{version}/ .%{gem_dir}/gems/activesupport
+ln -s $(pwd)%{gem_instdir} .%{gem_dir}/gems/railties
+touch .%{gem_dir}/gems/load_paths.rb
+PWD=$(pwd)
+export RUBYOPT="-I${PWD}%{gem_dir}/gems/railties:${PWD}%{gem_dir}/gems/railties/lib:${PWD}%{gem_dir}/gems/railties/test -rrails/all"
+export PATH="${PWD}%{gem_dir}/gems/railties/bin:$PATH"
+
+pushd .%{gem_dir}/gems/railties
+# extract tests
+tar xzf %{SOURCE2}
+ruby -e 'Dir.glob("test/**/*_test.rb").each {|t| require t}'
+popd
+%endif
 
 %files
+%{_bindir}/rails
 %dir %{gem_instdir}
+%{gem_instdir}/bin
 %{gem_libdir}
-%{gem_instdir}/guides
 %exclude %{gem_cache}
 %{gem_spec}
-%doc %{gem_instdir}/CHANGELOG
-%doc %{gem_instdir}/README.rdoc
 %doc %{gem_instdir}/MIT-LICENSE
 
 %files doc
-%defattr(-, root, root, -)
-%{gem_docdir}
+%doc %{gem_docdir}
+%doc %{gem_instdir}/CHANGELOG.md
+%doc %{gem_instdir}/guides
+%doc %{gem_instdir}/README.rdoc
 
 %changelog
+* Mon Jul 23 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 3.2.6-1
+- Update to Railties 3.2.6.
+- Move some files into -doc subpackage.
+- Remove the unneeded %%defattr.
+- Introduce %%check section (not running tests yet, as they are part of dependency loop).
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.15-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 0ae355d..3896268 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-d0ec59f51932e36644fb869e1e573423  railties-3.0.15.gem
+3f1e1290605b312f71d3dcc585e0399e  railties-3.2.6-tests.tgz
+c4aa3c96ab4cadcf25895f24aa71329d  railties-3.2.6.gem


More information about the scm-commits mailing list