[rubygem-glib2] 1.1.1

[Mamoru Tasaka]

commit f4adbe7e51905a23af8875efb09b693c4ee5fbe2
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Sun Jan 15 03:33:47 2012 +0900

    1.1.1

 .gitignore         |    1 +
 rubygem-glib2.spec |   38 ++++++++++++++++++++++----------------
 sources            |    2 +-
 3 files changed, 24 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7171f0b..fee3970 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /glib2-0.90.9.gem
 /glib2-1.0.0.gem
 /glib2-1.0.3.gem
+/glib2-1.1.1.gem
diff --git a/rubygem-glib2.spec b/rubygem-glib2.spec
index 32c6a8e..7a033ce 100644
--- a/rubygem-glib2.spec
+++ b/rubygem-glib2.spec
@@ -11,14 +11,13 @@
 
 Summary:	Ruby binding of GLib-2.x
 Name:		rubygem-%{gemname}
-Version:	1.0.3
-Release:	3%{?dist}
+Version:	1.1.1
+Release:	1%{?dist}
 Group:		Development/Languages
 # from README
 License:	LGPLv2
 URL:		http://ruby-gnome2.sourceforge.jp/
 Source0:	http://rubygems.org/gems/%{gemname}-%{version}.gem
-Patch0:		rubygem-glib-1.0.3-test-with-new-glib.patch
 
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygems
@@ -84,9 +83,7 @@ rubygem-%{gemname}
 %setup -q -c -T
 mkdir -p .%{gemdir}
 
-# Workaround for GLib header inclusion change:
-# https://github.com/ruby-gnome2/ruby-gnome2/issues/65
-export CONFIGURE_ARGS="--with-cflags='%{optflags} -DGLIB_COMPILATION'"
+export CONFIGURE_ARGS="--with-cflags='%{optflags}'"
 export CONFIGURE_ARGS="$CONFIGURE_ARGS --with-pkg-config-dir=$(pwd)%{_libdir}/pkgconfig"
 gem install \
 	-V \
@@ -96,15 +93,6 @@ gem install \
 	--rdoc \
 	%{SOURCE0}
 
-# GLib 2.31.2 no longer throws G_KEY_FILE_ERROR when the key file
-# is empty
-# https://bugzilla.gnome.org/show_bug.cgi?id=663432
-# https://github.com/ruby-gnome2/ruby-gnome2/issues/66
-( 
-pushd .%{geminstdir}
-%patch0 -p1
-)
-
 find . -name \*.gem | xargs chmod 0644
 
 # Make pkg-config devel dependency (not runtime)
@@ -151,6 +139,14 @@ end
 require 'test/unit'
 EOF
 
+# Missing
+cp -p \
+	./ext/glib2/rbglibdeprecated.h \
+	./ext/glib2/rbglib2conversions.h \
+	./ext/glib2/rbgutil_list.h \
+	./ext/glib2/rbgutildeprecated.h \
+	./lib/
+
 %install
 # Once copy all
 mkdir -p %{buildroot}%{gemdir}
@@ -262,6 +258,8 @@ popd
 %{geminstdir}/lib/glib2.rb
 %{geminstdir}/lib/glib-mkenums.rb
 %{geminstdir}/lib/gnome2-win32-binary-downloader.rb
+%dir %{geminstdir}/lib/glib2
+%{geminstdir}/lib/glib2/deprecatable.rb
 %{ruby_sitearch}/ruby-gnome2/%{gemname}.so
 
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -270,6 +268,7 @@ popd
 %files	-n ruby-%{gemname}
 %defattr(-,root,root,-)
 %{ruby_sitelib}/*.rb
+%{ruby_sitelib}/glib2/
 %exclude	%{ruby_sitelib}/glib-test-init.rb
 %exclude	%{ruby_sitelib}/gnome2-raketask.rb
 %exclude	%{ruby_sitelib}/mkmf-gnome2.rb
@@ -288,8 +287,12 @@ popd
 
 %{ruby_sitearch}/rbgcompat.h
 %{ruby_sitearch}/rbglib.h
+%{ruby_sitearch}/rbglibdeprecated.h
+%{ruby_sitearch}/rbglib2conversions.h
 %{ruby_sitearch}/rbgobject.h
 %{ruby_sitearch}/rbgutil.h
+%{ruby_sitearch}/rbgutil_list.h
+%{ruby_sitearch}/rbgutildeprecated.h
 %{ruby_sitearch}/glib-enum-types.h
 %{_libdir}/pkgconfig/ruby-%{gemname}.pc
 
@@ -302,8 +305,11 @@ popd
 
 
 %changelog
+* Sun Jan 15 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.1-1
+- 1.1.1
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+- F-17: Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
 * Thu Dec  1 2011 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.0.3-2
 - Workaround on build issue and test suite with GLib 2.31.2
diff --git a/sources b/sources
index ad5add0..537dbfd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7b22942bd581f596d0dbe69da22d74d7  glib2-1.0.3.gem
+18f60430c39d4bd85549c6743fb34095  glib2-1.1.1.gem