Merge remote-tracking branch 'origin/master' into f18

.gitignore

@@ -12,3 +12,4 @@
 /pango-1.1.3.gem
 /pango-1.1.4.gem
 /pango-1.1.5.gem
+/pango-1.1.6.gem

rubygem-pango.spec

@@ -1,4 +1,5 @@
-%if %{?fedora:0%{fedora} >= 17}%{?rhel:0%{rhel} >= 7}
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
+
 %global	rubyabi	1.9.1
 %global	header_dir	%{ruby_vendorarchdir}
 %global	ruby19	1
@@ -19,7 +20,7 @@
 
 Summary:	Ruby binding of pango-1.x
 Name:		rubygem-%{gem_name}
-Version:	1.1.5
+Version:	1.1.6
 Release:	1%{?dist}
 Group:		Development/Languages
 # from README
@@ -283,6 +284,9 @@ ruby -Ilib:test ./test/run-test.rb
 %{gem_instdir}/test/
 
 %changelog
+* Thu Dec  6 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.1.6-1
+- 1.1.6
+
 * Wed Sep  5 2012 Mamoru Tasaka <mtasaka@fedoraproject.org> - 1.1.5-1
 - 1.1.5
 

sources

@@ -1 +1 @@
-2e9eb4ce7760a8e185d3f9d8750ada23  pango-1.1.5.gem
+36f5f56fe7331232b42dae6a9bb36d60  pango-1.1.6.gem