[rubygem-authlogic] Authlogic update to 3.0.3.

Thu Jul 7 14:23:34 UTC 2011

commit 122df2bdc991fa706e87724b0ebf904612acaa95
Author: Chris Lalancette <clalance at redhat.com>
Date:   Wed Jul 6 12:10:59 2011 -0400

    Authlogic update to 3.0.3.
    
    Signed-off-by: Chris Lalancette <clalance at redhat.com>

 .gitignore                         |    1 +
 authlogic-activerecord-3.0.5.patch |   16 ++++
 authlogic_fixes.patch              |  137 ------------------------------------
 remove-unneeded-jeweler-dep.patch  |   21 ++----
 rubygem-authlogic.spec             |   36 +++++----
 sources                            |    2 +-
 6 files changed, 45 insertions(+), 168 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index ef43194..7188fc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /authlogic-2.1.6.gem
+/authlogic-3.0.3.gem
diff --git a/authlogic-activerecord-3.0.5.patch b/authlogic-activerecord-3.0.5.patch
new file mode 100644
index 0000000..f55b2ab
--- /dev/null
+++ b/authlogic-activerecord-3.0.5.patch
@@ -0,0 +1,16 @@
+--- Gemfile.orig	2011-07-06 14:21:42.848000009 -0400
++++ Gemfile	2011-07-06 14:22:11.217000012 -0400
+@@ -1,10 +1,10 @@
+ source :rubygems
+ 
+-gem 'activerecord', '>= 3.0.7'
++gem 'activerecord', '>= 3.0.5'
+ 
+ group :test do
+   gem 'bcrypt-ruby'
+-  gem 'jeweler'
+-  gem 'ruby-debug19'
++  gem 'ruby-debug'
+   gem 'sqlite3'
++  gem 'rake'
+ end
diff --git a/remove-unneeded-jeweler-dep.patch b/remove-unneeded-jeweler-dep.patch
index 523d89e..cd3adb9 100644
--- a/remove-unneeded-jeweler-dep.patch
+++ b/remove-unneeded-jeweler-dep.patch
@@ -1,8 +1,9 @@
---- Rakefile.orig	2010-10-12 13:24:27.000000000 -0400
-+++ Rakefile	2010-10-12 13:28:40.000000000 -0400
-@@ -1,21 +1,6 @@
- require 'rubygems'
- require 'rake'
+diff -urp Rakefile.orig Rakefile
+--- Rakefile.orig	2011-07-06 11:51:35.118235722 -0400
++++ Rakefile	2011-07-06 11:53:03.967798338 -0400
+@@ -4,21 +4,6 @@ require 'bundler'
+ 
+ Bundler.setup
  
 -begin
 -  require 'jeweler'
@@ -12,7 +13,7 @@
 -    gem.email = "bjohnson at binarylogic.com"
 -    gem.homepage = "http://github.com/binarylogic/authlogic"
 -    gem.authors = ["Ben Johnson of Binary Logic"]
--    gem.add_dependency "activesupport"
+-    gem.add_bundler_dependencies
 -  end
 -  Jeweler::GemcutterTasks.new
 -rescue LoadError
@@ -22,11 +23,3 @@
  require 'rake/testtask'
  Rake::TestTask.new(:test) do |test|
    test.libs << 'test'
-@@ -36,6 +21,6 @@ rescue LoadError
-   end
- end
- 
--task :test => :check_dependencies
-+task :test
- 
- task :default => :test
diff --git a/rubygem-authlogic.spec b/rubygem-authlogic.spec
index 356f234..75e1ddd 100644
--- a/rubygem-authlogic.spec
+++ b/rubygem-authlogic.spec
@@ -7,16 +7,15 @@
 
 Summary: A clean, simple, and unobtrusive ruby authentication solution
 Name: rubygem-%{gemname}
-Version: 2.1.6
-Release: 5%{?dist}
+Version: 3.0.3
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/binarylogic/authlogic
 Source0: http://rubygems.org/downloads/%{gemname}-%{version}.gem
-Patch0:  remove-unneeded-jeweler-dep.patch
+Patch0: remove-unneeded-jeweler-dep.patch
+Patch1: authlogic-activerecord-3.0.5.patch
 
-# fixes needed to get authlogic working against rails 3
-Patch1:  authlogic_fixes.patch
 Requires: rubygems
 Requires: rubygem(activesupport)
 Requires: rubygem(activerecord)
@@ -25,8 +24,9 @@ BuildRequires: rubygems
 BuildRequires: rubygem(bcrypt-ruby)
 BuildRequires: rubygem(rake)
 BuildRequires: rubygem(activerecord)
-BuildRequires: rubygem(sqlite3-ruby)
+BuildRequires: rubygem(sqlite3)
 BuildRequires: rubygem(ruby-debug)
+BuildRequires: rubygem(bundler)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -44,34 +44,35 @@ Documentation for rubygem-authlogic
 %prep
 %setup -q -c -T
 mkdir -p .%{gemdir}
-gem install --local --install-dir .%{gemdir} \
-            --force --rdoc %{SOURCE0}
+gem install --local --install-dir .%{gemdir} --force --rdoc %{SOURCE0}
 
-# this file shouldn't be here
-rm -f .%{geminstdir}/%{gemname}.gemspec .%{geminstdir}/.gitignore
-
-# zero length file / not used (test suite requires jeweler gem anyways)
-rm -f .%{geminstdir}/test/session_test/credentials_test.rb
 
 pushd .%{geminstdir}
 %patch0
 %patch1
+
+# these files shouldn't be here
+rm -f %{gemname}.gemspec .gitignore Gemfile.lock
+
+# zero length file / not used (test suite requires jeweler gem anyways)
+rm -f test/session_test/credentials_test.rb
 popd
 
+
 %build
 
+
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 cp -a .%{gemdir}/* %{buildroot}%{gemdir}
 
-%clean
-rm -rf %{buildroot}
 
 %check
 pushd .%{geminstdir}
 rake test
 
+
 %files
 %defattr(-, root, root, -)
 %dir %{geminstdir}/
@@ -80,9 +81,9 @@ rake test
 %{geminstdir}/lib
 %{geminstdir}/rails
 %{geminstdir}/VERSION.yml
+%{geminstdir}/Gemfile
 %doc %{geminstdir}/LICENSE
 %doc %{geminstdir}/README.rdoc
-%doc %{geminstdir}/CHANGELOG.rdoc
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
@@ -94,6 +95,9 @@ rake test
 %{geminstdir}/shoulda_macros
 
 %changelog
+* Wed Jul 06 2011 Chris Lalancette <clalance at redhat.com> - 3.0.3-1
+- Update to upstream 3.0.3
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.6-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index d1585a4..6c93b56 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fa78c152c731a883cb886aa06358bb2d  authlogic-2.1.6.gem
+1bd051cc2465c5868f62aa75b9f8f31c  authlogic-3.0.3.gem
