[rubygem-icalendar] Update to latest version (1.1.5)

Mark Chappell tremble at fedoraproject.org
Tue Sep 7 18:34:32 UTC 2010


commit 029461dee21835f5f74df56c8b4edefad30a4880
Author: Mark Chappell <tremble at tremble.org.uk>
Date:   Tue Sep 7 20:35:03 2010 +0200

    Update to latest version (1.1.5)

 .gitignore                         |    1 +
 rubygem-icalendar-manage_gem.patch |   33 ++++++----------------
 rubygem-icalendar.spec             |   53 +++++++++++++++++++++++++++---------
 sources                            |    2 +-
 4 files changed, 51 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 82b3333..59ca5b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 icalendar-1.1.0.gem
+/icalendar-1.1.5.gem
diff --git a/rubygem-icalendar-manage_gem.patch b/rubygem-icalendar-manage_gem.patch
index d801fec..1178147 100644
--- a/rubygem-icalendar-manage_gem.patch
+++ b/rubygem-icalendar-manage_gem.patch
@@ -1,26 +1,11 @@
-From 7da9a471e59678585aa849571888afc7c90f3cd7 Mon Sep 17 00:00:00 2001
-From: Mark Chappell <m.d.chappell at bath.ac.uk>
-Date: Wed, 27 Jan 2010 13:39:03 +0000
-Subject: [PATCH] Replace deprecated method Gem::manage_gems
-
----
- Rakefile |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/Rakefile b/Rakefile
-index 0ce7643..2e6af95 100644
---- a/Rakefile
-+++ b/Rakefile
-@@ -55,7 +55,8 @@ Rake::RDocTask.new(:doc) { |rdoc|
-   rdoc.options << "--accessor=ical_component,ical_property,ical_multi_property"
- }
+--- a/Rakefile	2010-09-07 18:49:33.000000000 +0200
++++ b/Rakefile	2010-09-07 18:46:53.000000000 +0200
+@@ -20,7 +20,7 @@
+   self.readme_file = "README.rdoc"
+ end
  
--Gem::manage_gems 
-+require 'rubygems'
-+require 'rubygems/gem_runner'
- require 'rake/gempackagetask'
+-require 'newgem/tasks'
++#require 'newgem/tasks'
+ Dir['tasks/**/*.rake'].each { |t| load t }
  
- spec = Gem::Specification.new do |s| 
--- 
-1.5.5.6
-
+ # TODO - want other tests/tasks run by default? Add them to the list
diff --git a/rubygem-icalendar.spec b/rubygem-icalendar.spec
index bbffb3c..0540f55 100644
--- a/rubygem-icalendar.spec
+++ b/rubygem-icalendar.spec
@@ -6,8 +6,8 @@
 
 Summary: A ruby implementation of the iCalendar specification (RFC-2445)
 Name: rubygem-%{gemname}
-Version: 1.1.0
-Release: 4%{?dist}
+Version: 1.1.5
+Release: 1%{?dist}
 Group: Development/Languages
 License: GPL+ or Ruby
 URL: http://icalendar.rubyforge.org/
@@ -19,6 +19,7 @@ Requires: ruby(abi) = %{rubyabi}
 Requires: rubygems
 BuildRequires: rubygems
 BuildRequires: rubygem(rake)
+BuildRequires: rubygem(hoe)
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -38,13 +39,23 @@ mkdir -p %{buildroot}%{gemdir}
 gem install --local --install-dir %{buildroot}%{gemdir} \
             --force --rdoc %{SOURCE0}
 
-# API documentation hasn't been written, 
-# However the rdocs are there
-rm -rf %{buildroot}%{geminstdir}/docs/api
-# Test case that hasn't been written yet
-rm -rf %{buildroot}%{geminstdir}/test/coverage
+# Website - hasn't actually been written
+rm -rf %{buildroot}%{geminstdir}/website
+rm -rf %{buildroot}%{geminstdir}/config
+# Backup file
+rm -rf %{buildroot}%{geminstdir}/lib/icalendar/conversions.rb.orig
+
+# EOL encodings
+pushd %{buildroot}%{geminstdir}
+for file in Rakefile test.ical test.ics
+do
+	dos2unix -k $file
+done
+popd
 
 # Tidy up the file permissions
+chmod 0755 %{buildroot}%{geminstdir}/test.rb
+chmod 0755 %{buildroot}%{geminstdir}/test2.rb
 # The tests are run from the Rakefile
 find %{buildroot}%{geminstdir}/test \
     -type f -name '*.rb' | xargs chmod 0644
@@ -60,6 +71,7 @@ chmod 644 %{buildroot}%{gemdir}/cache/%{gemname}-%{version}.gem
 
 pushd %{buildroot}%{geminstdir}
 patch -p1 < %{PATCH0}
+rm -rf %{buildroot}%{geminstdir}/Rakefile.orig
 popd
 
 %clean
@@ -76,28 +88,43 @@ popd
 %{geminstdir}/lib
 %{geminstdir}/examples
 %{geminstdir}/test
+%{geminstdir}/script
 %doc %{gemdir}/doc/%{gemname}-%{version}
-%doc %{geminstdir}/README
+%doc %{geminstdir}/README.rdoc
+%doc %{geminstdir}/History.txt
+%doc %{geminstdir}/Manifest.txt
+%doc %{geminstdir}/PostInstall.txt
 %doc %{geminstdir}/COPYING
 %doc %{geminstdir}/GPL
-%doc %{geminstdir}/docs
+%doc %{geminstdir}/icalendar.gemspec
 %doc %{geminstdir}/Rakefile
+%{geminstdir}/test.ical
+%{geminstdir}/test.ics
+%{geminstdir}/test.rb
+%{geminstdir}/test2.rb
+
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 
 %changelog
-* Wed Feb 03 2010 M D Chappell <tremble at tremble.org.uk> - 1.1.0-4
+* Tue Sep 07 2010 Mark Chappell <tremble at fedoraproject.org> - 1.1.5-1
+- Update to latest version
+- Add BuildRequires rubygem(hoe)
+- Update Rakefile patch
+- Fix EOL encoding issues
+
+* Wed Feb 03 2010 M D Chappell <tremble at fedoraproject.org> - 1.1.0-4
 - Version bump to force rebuild
 
-* Mon Feb 01 2010 M D Chappell <tremble at tremble.org.uk> - 1.1.0-3
+* Mon Feb 01 2010 M D Chappell <tremble at fedoraproject.org> - 1.1.0-3
 - Requires rubygem(rake) rather that rubygem-rake
 
-* Wed Jan 27 2010 M D Chappell <m.d.chappell at bath.ac.uk> - 1.1.0-2
+* Wed Jan 27 2010 M D Chappell <tremble at fedoraproject.org> - 1.1.0-2
 - Various Formatting changes
 - Run tests
 - Fix Rakefile for recent verions of gem
 - Correction of SRPM permissions
 
-* Tue Jan 26 2010 M Chappell <m.d.chappell at bath.ac.uk> - 1.1.0-1
+* Tue Jan 26 2010 M Chappell <tremble at fedoraproject.org> - 1.1.0-1
 - Initial package
diff --git a/sources b/sources
index 6957a78..cca0ede 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52eadc886af8f3354394504e956d6b7b  icalendar-1.1.0.gem
+5bb8ba938c23b7a82d18d929c090e5cb  icalendar-1.1.5.gem


More information about the scm-commits mailing list