"blobs" -> "files" in the description.

(cherry picked from commit c9bd1ac22c)

.gitignore

@@ -9,3 +9,4 @@ hivex-1.2.2.tar.gz
 /hivex-1.3.1.tar.gz
 /hivex-1.3.2.tar.gz
 /hivex-1.3.3.tar.gz
+/hivex-1.3.5.tar.gz

0001-hivex-Fix-Ruby-bindings-for-1.9-let-the-user-explici.patch

@@ -1,102 +0,0 @@
-diff -ur hivex-1.3.3.old/configure.ac hivex-1.3.3/configure.ac
---- hivex-1.3.3.old/configure.ac	2011-11-29 11:05:56.000000000 +0000
-+++ hivex-1.3.3/configure.ac	2012-02-07 13:48:53.513912218 +0000
-@@ -312,8 +312,19 @@
-     [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
- 
- dnl Check for Ruby and rake (optional, for Ruby bindings).
--AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
--AC_CHECK_PROG([RAKE],[rake],[rake],[no])
-+AC_ARG_ENABLE([ruby],
-+        AS_HELP_STRING([--disable-ruby], [Disable Ruby language bindings]),
-+        [],
-+        [enable_ruby=yes])
-+AS_IF([test "x$enable_ruby" != "xno"],
-+        [
-+        AC_CHECK_PROG([RUBY],[ruby],[ruby],[no])
-+        AC_CHECK_PROG([RAKE],[rake],[rake],[no])
-+        AC_CHECK_LIB([ruby],[ruby_init],[HAVE_LIBRUBY=1],[HAVE_LIBRUBY=0])
-+        AC_SUBST(RAKE)
-+        ])
-+AM_CONDITIONAL([HAVE_RUBY],
-+    [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
- 
- AM_CONDITIONAL([HAVE_RUBY],
-     [test "x$RAKE" != "xno" && test -n "$HAVE_LIBRUBY"])
-diff -ur hivex-1.3.3.old/generator/generator.ml hivex-1.3.3/generator/generator.ml
---- hivex-1.3.3.old/generator/generator.ml	2011-11-19 16:44:04.000000000 +0000
-+++ hivex-1.3.3/generator/generator.ml	2012-02-07 13:48:53.518912298 +0000
-@@ -3265,6 +3265,14 @@
- #define RARRAY_LEN(r) (RARRAY((r))->len)
- #endif
- 
-+#ifndef RSTRING_LEN
-+#define RSTRING_LEN(r) (RSTRING((r))->len)
-+#endif
-+
-+#ifndef RSTRING_PTR
-+#define RSTRING_PTR(r) (RSTRING((r))->ptr)
-+#endif
-+
- static VALUE m_hivex;			/* hivex module */
- static VALUE c_hivex;			/* hive_h handle */
- static VALUE e_Error;			/* used for all errors */
-@@ -3287,8 +3295,8 @@
- 
-   val->key = StringValueCStr (key);
-   val->t = NUM2ULL (type);
--  val->len = RSTRING (value)->len;
--  val->value = RSTRING (value)->ptr;
-+  val->len = RSTRING_LEN (value);
-+  val->value = RSTRING_PTR (value);
- }
- 
- static hive_set_value *
-diff -ur hivex-1.3.3.old/ruby/Makefile.am hivex-1.3.3/ruby/Makefile.am
---- hivex-1.3.3.old/ruby/Makefile.am	2011-08-15 10:34:07.000000000 +0100
-+++ hivex-1.3.3/ruby/Makefile.am	2012-02-07 13:48:53.529912474 +0000
-@@ -40,14 +40,15 @@
- TESTS = run-ruby-tests
- 
- TESTS_ENVIRONMENT = \
--	LD_LIBRARY_PATH=$(top_builddir)/src/.libs
-+	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
-+	RUBY=$(RUBY) RAKE=$(RAKE)
- 
- all:
--	rake build
--	rake rdoc
-+	$(RAKE) build
-+	$(RAKE) rdoc
- 
--RUBY_SITELIB := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
--RUBY_SITEARCH := $(shell ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
-+RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-+RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
- 
- install:
- 	$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
-diff -ur hivex-1.3.3.old/ruby/Rakefile.in hivex-1.3.3/ruby/Rakefile.in
---- hivex-1.3.3.old/ruby/Rakefile.in	2011-11-29 10:56:28.000000000 +0000
-+++ hivex-1.3.3/ruby/Rakefile.in	2012-02-07 13:49:40.887674923 +0000
-@@ -38,7 +38,7 @@
- # Build locally
- 
- file MAKEFILE => EXT_CONF do |t|
--     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; ruby #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
-+     unless sh "top_srcdir=$(pwd)/@top_srcdir@; top_builddir=$(pwd)/@top_builddir@; export ARCHFLAGS=\"-arch $(uname -m)\"; cd #{File::dirname(EXT_CONF)}; @RUBY@ #{File::basename(EXT_CONF)} --with-_hivex-include=$top_srcdir/lib --with-_hivex-lib=$top_builddir/lib/.libs"
-          $stderr.puts "Failed to run extconf"
-          break
-      end
-diff -ur hivex-1.3.3.old/ruby/run-ruby-tests hivex-1.3.3/ruby/run-ruby-tests
---- hivex-1.3.3.old/ruby/run-ruby-tests	2011-08-15 11:07:46.000000000 +0100
-+++ hivex-1.3.3/ruby/run-ruby-tests	2012-02-07 13:48:53.532912524 +0000
-@@ -24,6 +24,6 @@
- # is bound to fail because they all use a single test image file).
- 
- for f in tests/tc_*.rb; do
--    echo rake test "$@" TEST="$f"
--    rake test "$@" TEST="$f"
-+    echo $RAKE test "$@" TEST="$f"
-+    $RAKE test "$@" TEST="$f"
- done

hivex.spec

@@ -6,8 +6,8 @@
 %endif
 
 Name:           hivex
-Version:        1.3.3
-Release:        6%{?dist}
+Version:        1.3.5
+Release:        7%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
 Group:          Development/Libraries
@@ -30,6 +30,7 @@ BuildRequires:  ocaml-findlib-devel
 BuildRequires:  python-devel
 BuildRequires:  ruby-devel
 BuildRequires:  rubygem-rake
+BuildRequires:  rubygem(minitest)
 BuildRequires:  readline-devel
 BuildRequires:  libxml2-devel
 
@@ -40,13 +41,16 @@ Conflicts:      libguestfs <= 1:1.0.84
 # Fix Perl directory install path.
 Patch0:         %{name}-1.2.3-dirs.patch
 
-# Fix bindings for Ruby 1.9 (upstream).
-Patch1:         0001-hivex-Fix-Ruby-bindings-for-1.9-let-the-user-explici.patch
-BuildRequires:  autoconf, automake, libtool, gettext-devel, ocaml
+# Use VENDOR*DIR instead of SITE*DIR (not yet upstream).
+Patch2:         ruby-1.9-vendor-not-site.patch
+BuildRequires:  autoconf, automake, libtool
+
+# https://fedoraproject.org/wiki/Packaging:No_Bundled_Libraries#Packages_granted_exceptions
+Provides:      bundled(gnulib)
 
 
 %description
-Hive files are the undocumented binary blobs that Windows uses to
+Hive files are the undocumented binary files that Windows uses to
 store the Windows Registry on disk.  Hivex is a library that can read
 and write to these files.
 
@@ -152,13 +156,10 @@ python-%{name} contains Python bindings for %{name}.
 Summary:       Ruby bindings for %{name}
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      ruby(abi) = 1.8
+Requires:      ruby(abi) = 1.9.1
 Requires:      ruby
 Provides:      ruby(hivex) = %{version}
 
-%{!?ruby_sitelib: %global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")}
-%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e "puts Config::CONFIG['sitearchdir']")}
-
 %description -n ruby-%{name}
 ruby-%{name} contains Ruby bindings for %{name}.
 
@@ -167,9 +168,8 @@ ruby-%{name} contains Ruby bindings for %{name}.
 %setup -q
 
 %patch0 -p1 -b .dirs
-%patch1 -p1 -b .ruby19
+%patch2 -p1 -b .rubyvendor
 autoreconf ||:
-./generator/generator.ml
 
 
 %build
@@ -285,14 +285,32 @@ rm -rf $RPM_BUILD_ROOT
 %files -n ruby-%{name}
 %defattr(-,root,root,-)
 %doc ruby/doc/site/*
-%{ruby_sitelib}/hivex.rb
-%{ruby_sitearch}/_hivex.so
+%{ruby_vendorlibdir}/hivex.rb
+%{ruby_vendorarchdir}/_hivex.so
 
 
 %changelog
-* Tue Feb 07 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-6
+* Fri May 18 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.5-7
+- "blobs" -> "files" in the description.
+
+* Tue May 15 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.5-6
+- Bundled gnulib (RHBZ#821763).
+
+* Fri Mar 23 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.5-5
+- Don't need to rerun the generator (thanks Dan Horák).
+
+* Tue Mar 13 2012 Richard W.M. Jones <rjones@redhat.com> - 1:1.3.5-4
+- New upstream version 1.3.5.
+- Remove upstream patch.
+- Depend on automake etc. for the patch.
+
+* Thu Feb  9 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-8
+- ruby(abi) 1.9.1.
+
+* Wed Feb  8 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-7
 - Bump and rebuild for Ruby update.
 - Add upstream patch to fix bindings for Ruby 1.9.
+- Add non-upstream patch to pass --vendor flag to extconf.rb
 
 * Fri Jan 06 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-3
 - Rebuild for OCaml 3.12.1.

ruby-1.9-vendor-not-site.patch

@@ -0,0 +1,22 @@
+--- hivex-1.3.3/ruby/Makefile.am.old	2012-02-08 10:57:43.447667670 +0000
++++ hivex-1.3.3/ruby/Makefile.am	2012-02-08 10:58:29.024440505 +0000
+@@ -47,13 +47,13 @@
+ 	$(RAKE) build
+ 	$(RAKE) rdoc
+ 
+-RUBY_SITELIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
+-RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['sitearchdir']")
++RUBY_VENDORLIB := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
++RUBY_VENDORARCH := $(shell $(RUBY) -rrbconfig -e "puts Config::CONFIG['vendorarchdir']")
+ 
+ install:
+-	$(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB)
+-	$(MKDIR_P) $(DESTDIR)$(RUBY_SITEARCH)
+-	$(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_SITELIB)
+-	$(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_SITEARCH)
++	$(MKDIR_P) $(DESTDIR)$(RUBY_VENDORLIB)
++	$(MKDIR_P) $(DESTDIR)$(RUBY_VENDORARCH)
++	$(INSTALL) -p -m 0644 lib/hivex.rb $(DESTDIR)$(RUBY_VENDORLIB)
++	$(INSTALL) -p -m 0755 ext/hivex/_hivex.so $(DESTDIR)$(RUBY_VENDORARCH)
+ 
+ endif

sources

@@ -1 +1 @@
-4ce781121f92e0f317db5ced5f55fda8  hivex-1.3.3.tar.gz
+89e185f2c698863defbc8a22a4470a6c  hivex-1.3.5.tar.gz