rpms/rubygem-gettext/devel rubygem-gettext-2.1.0-ruby186-compat.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 rubygem-gettext.spec, 1.11, 1.12 sources, 1.6, 1.7

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/rubygem-gettext/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23488/rubygem-gettext/devel

Modified Files:
	.cvsignore rubygem-gettext.spec sources 
Added Files:
	rubygem-gettext-2.1.0-ruby186-compat.patch 
Log Message:
gettext 2.1.0

rubygem-gettext-2.1.0-ruby186-compat.patch:
 pomessage.rb |    2 +-
 rgettext.rb  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE rubygem-gettext-2.1.0-ruby186-compat.patch ---
--- lib/gettext/tools/pomessage.rb.debug	2009-11-14 11:45:04.000000000 +0900
+++ lib/gettext/tools/pomessage.rb	2009-11-18 04:59:36.000000000 +0900
@@ -60,7 +60,7 @@
     # Checks if the other translation target is mergeable with
     # the current one. Relevant are msgid and translation context (msgctxt).
     def ==(other)
-      other.msgid == self.msgid && other.msgctxt == self.msgctxt
+      other && other.msgid == self.msgid && other.msgctxt == self.msgctxt
     end
 
     # Merges two translation targets with the same msgid and returns the merged
--- lib/gettext/tools/rgettext.rb.debug	2009-11-14 11:45:04.000000000 +0900
+++ lib/gettext/tools/rgettext.rb	2009-11-18 04:57:14.000000000 +0900
@@ -118,7 +118,7 @@
                 end
 
                 # Save the previous target.
-                existing = pomessages.find_index {|t| t == pomessage}
+                existing = pomessages.empty? ? nil : pomessages.index(pomessages.find {|t| t == pomessage})
                 if existing
                   pomessage = pomessages[existing].merge(pomessage)
                   pomessages[existing] = pomessage


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	27 May 2009 15:20:27 -0000	1.6
+++ .cvsignore	18 Nov 2009 18:49:42 -0000	1.7
@@ -1 +1 @@
-gettext-2.0.4.gem
+gettext-2.1.0.gem


Index: rubygem-gettext.spec
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/devel/rubygem-gettext.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- rubygem-gettext.spec	25 Jul 2009 06:54:23 -0000	1.11
+++ rubygem-gettext.spec	18 Nov 2009 18:49:42 -0000	1.12
@@ -5,22 +5,23 @@
 %global		geminstdir	%{gemdir}/gems/%{gemname}-%{version}
 
 %global		rubyabi		1.8
-%if 0%{?fedora} >= 12
+%if 0%{?fedora} >= 11
 %global		do_test		1
 %else
 %global		do_test		0
 %endif
-%global		locale_ver		2.0.4
+%global		locale_ver		2.0.5
 
 Name:		rubygem-%{gemname}
-Version:	2.0.4
-Release:	2%{?dist}
+Version:	2.1.0
+Release:	1%{?dist}
 Summary:	RubyGem of Localization Library and Tools for Ruby
 Group:		Development/Languages
 
 License:	Ruby
 URL:		http://www.yotabanana.com/hiki/ruby-gettext.html?ruby-gettext
 Source0:	http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0:		rubygem-gettext-2.1.0-ruby186-compat.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	ruby(abi) = %{rubyabi}
@@ -81,8 +82,13 @@ gem install \
 	-V \
 	%{SOURCE0}
 
+pushd .%{geminstdir}
+%patch0 -p0
+popd
+
 #%%{__rm} -f .%{geminstdir}/Rakefile
 %{__rm} -f .%{geminstdir}/%{gemname}.gemspec
+%{__rm} -f .%{geminstdir}/replace.rb
 %{__rm} -rf .%{geminstdir}/po/
 %{__rm} -rf .%{gemdir}/bin/
 %{__chmod} 0755 .%{geminstdir}/bin/*
@@ -216,7 +222,9 @@ rake test
 %files		doc
 %defattr(-,root,root,-)
 %{gemdir}/doc/%{gemname}-%{version}/
+%{geminstdir}/benchmark/
 %{geminstdir}/samples/
+%{geminstdir}/test.rb
 %{geminstdir}/test/
 
 %files -n	ruby-gettext-package	-f %{name}.lang
@@ -226,6 +234,9 @@ rake test
 
 
 %changelog
+* Wed Nov 18 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.1.0-1
+- 2.1.0
+
 * Sat Jul 25 2009 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 2.0.4-2
 - F-12: Mass rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rubygem-gettext/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	27 May 2009 15:20:27 -0000	1.6
+++ sources	18 Nov 2009 18:49:42 -0000	1.7
@@ -1 +1 @@
-7e4dd44845609437af97090375952e0b  gettext-2.0.4.gem
+0576587a818e311e6eab1d453390eef4  gettext-2.1.0.gem