- typelib macros don't exist, don't try to load them

[packages/rpm.git] / rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch

diff --git a/rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch b/rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch
index b75fd388b1ebf50e38fde9f51ef025d6a3191638..59b840976fb563e63df7c5206b400ec9496333d1 100644 (file)
--- a/rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch
+++ b/rpm-5.4.7-fix-generation-of-ruby-abi-provides.patch
@@ -17,32 +17,3 @@
                }
                /* XXX: lacking better, more generic classifier... */
                else if (!strncmp(fn, "/gstreamer", sizeof("/gstreamer")-1) &&
---- rpm-5.4.7/scripts/rubygems.rb.rubyabi_prov~        2012-03-10 21:50:15.637085059 +0100
-+++ rpm-5.4.7/scripts/rubygems.rb      2012-03-10 21:50:23.928092180 +0100
-@@ -36,7 +36,12 @@ ruby_versioned = false
- abi_provide = false
- 
- for path in $stdin.readlines
--  if path.match(specpatt)
-+  # way fugly, but we make the assumption that if the package has
-+  # this file, the package is the current ruby version, and should
-+  # therefore provide ruby(abi) = version
-+  if provides and path.match(RbConfig::CONFIG["archdir"] + "/rbconfig.rb")
-+     abi_provide = true
-+  elsif path.match(specpatt)
-     ruby_versioned = true
-     gems.push(path.chomp)
-   # this is quite ugly and lame, but the assumption made is that if any files
-@@ -46,12 +51,6 @@ for path in $stdin.readlines
-   elsif not ruby_versioned
-     if path.match(RbConfig::CONFIG["rubylibdir"])
-       ruby_versioned = true
--      # even more fugly, but we make the assumption that if the package has
--      # this file, the package is the current ruby version, and should
--      # therefore provide ruby(abi) = version
--      if provides and path.match(RbConfig::CONFIG["rubylibdir"] + "/Env.rb")
--      abi_provide = true
--      end
-     elsif path.match(RbConfig::CONFIG["sitelibdir"])
-       ruby_versioned = true
-     elsif path.match(RbConfig::CONFIG["vendorlibdir"])