[rubygem-pkg-config/f17] 1.1.4

[Mamoru Tasaka]

commit c669b7dd12959c335674621ddee5a91b47cf03cb
Author: Mamoru Tasaka <tasaka1 at localhost.localdomain>
Date:   Tue Aug 14 00:40:08 2012 +0900

    1.1.4

 .gitignore                                        |    1 +
 rubygem-pkg-config-1.1.3-cflags-result-sort.patch |   16 +++++++++++
 rubygem-pkg-config.spec                           |   30 +++++++++++++++++++-
 sources                                           |    2 +-
 4 files changed, 46 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 17c91d3..ca37823 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /pkg-config-1.0.7.gem
 /pkg-config-1.1.2.gem
 /pkg-config-1.1.3.gem
+/pkg-config-1.1.4.gem
diff --git a/rubygem-pkg-config-1.1.3-cflags-result-sort.patch b/rubygem-pkg-config-1.1.3-cflags-result-sort.patch
new file mode 100644
index 0000000..4a94e7e
--- /dev/null
+++ b/rubygem-pkg-config-1.1.3-cflags-result-sort.patch
@@ -0,0 +1,16 @@
+--- pkg-config-1.1.3/test/test_pkg_config.rb.newpkgconfig	2012-08-02 14:18:08.216508255 +0900
++++ pkg-config-1.1.3/test/test_pkg_config.rb	2012-08-02 15:14:58.597886753 +0900
+@@ -109,7 +109,12 @@
+   def assert_pkg_config(package, pkg_config_args, actual)
+     result = pkg_config(package, *pkg_config_args)
+     result = nil if result.empty?
+-    assert_equal(result, actual)
++    begin
++      assert_equal(result, actual)
++    rescue
++      puts "Did not match, retry with sorting"
++      assert_equal(result.split(" ").sort.join(" "), actual.split(" ").sort.join(" "))
++    end
+   end
+ 
+   def assert_override_variables(expected, override_variables)
diff --git a/rubygem-pkg-config.spec b/rubygem-pkg-config.spec
index 756e712..2bd8061 100644
--- a/rubygem-pkg-config.spec
+++ b/rubygem-pkg-config.spec
@@ -5,13 +5,16 @@
 
 Summary:	A pkg-config implementation by Ruby
 Name:		rubygem-%{gem_name}
-Version:	1.1.3
+Version:	1.1.4
 Release:	1%{?dist}
 Group:		Development/Languages
 License:	LGPLv2+
 URL:		http://github.com/rcairo/pkg-config
 
 Source0:	http://rubygems.org/gems/%{gem_name}-%{version}.gem
+# Observe test failure on test_cflags test_cflags_only_I
+# with pkgconfig 0.27
+Patch0:	rubygem-pkg-config-1.1.3-cflags-result-sort.patch
 BuildRequires:	ruby(abi) = %{rubyabi}
 BuildRequires:	rubygems-devel
 # For %%check
@@ -52,6 +55,9 @@ gem install \
 
 find . -name \*.gem | xargs chmod 0644
 
+pushd .%{gem_instdir}
+%patch0 -p1
+popd
 
 %build
 
@@ -71,7 +77,17 @@ rm -rf %{buildroot}
 %check
 pushd .%{gem_instdir}
 #rake test --verbose --trace
-ruby -Ilib -rubygems test/run-test.rb
+#ruby -Ilib -rubygems test/run-test.rb
+cat > test.rb <<EOF
+require "rubygems"
+gem "test-unit"
+require "test/unit"
+
+Dir.glob("test/**/test_*.rb") do |file|
+  require file
+end
+EOF
+ruby -Ilib:test:. ./test.rb
 
 %files
 %defattr(-, root, root, -)
@@ -90,6 +106,16 @@ ruby -Ilib -rubygems test/run-test.rb
 %{gem_docdir}
 
 %changelog
+* Tue Aug 14 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.4-1
+- 1.1.4
+
+* Thu Aug  2 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.3-3
+- Fix test failure on test_cflags, test_cflags_only_I with
+  recent pkgconfig
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Tue Apr 10 2012 Mamoru Tasaka <mtasaka at fedoraproject.org> - 1.1.3-1
 - 1.1.3
 
diff --git a/sources b/sources
index b8b7fdb..5efcc33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5c44d7ab5b8c23168f1965518957128e  pkg-config-1.1.3.gem
+cae3d681a928482108b670ceda8c3eec  pkg-config-1.1.4.gem