rpms/hivex
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Further updates to ruby bindings (thanks Bohuslav Kabrda).

Browse Source
This commit is contained in:
Richard W.M. Jones 2012-02-08 10:37:47 +00:00
parent 0cad15afae
commit 28facf9c85
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hivex.spec
View File

@ -7,7 +7,7 @@
Name: hivex Name: hivex
Version: 1.3.3 Version: 1.3.3
Release: 6%{?dist} Release: 7%{?dist}
Summary: Read and write Windows Registry binary hive files Summary: Read and write Windows Registry binary hive files
Group: Development/Libraries Group: Development/Libraries
@ -30,6 +30,7 @@ BuildRequires: ocaml-findlib-devel
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: ruby-devel BuildRequires: ruby-devel
BuildRequires: rubygem-rake BuildRequires: rubygem-rake
BuildRequires: rubygem(minitest)
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
@ -44,6 +45,9 @@ Patch0: %{name}-1.2.3-dirs.patch
Patch1: 0001-hivex-Fix-Ruby-bindings-for-1.9-let-the-user-explici.patch Patch1: 0001-hivex-Fix-Ruby-bindings-for-1.9-let-the-user-explici.patch
BuildRequires: autoconf, automake, libtool, gettext-devel, ocaml 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
%description %description
Hive files are the undocumented binary blobs that Windows uses to Hive files are the undocumented binary blobs that Windows uses to
@ -156,9 +160,6 @@ Requires: ruby(abi) = 1.8
Requires: ruby Requires: ruby
Provides: ruby(hivex) = %{version} 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} %description -n ruby-%{name}
ruby-%{name} contains Ruby bindings for %{name}. ruby-%{name} contains Ruby bindings for %{name}.
@ -168,6 +169,7 @@ ruby-%{name} contains Ruby bindings for %{name}.
%patch0 -p1 -b .dirs %patch0 -p1 -b .dirs
%patch1 -p1 -b .ruby19 %patch1 -p1 -b .ruby19
%patch2 -p1 -b .rubyvendor
autoreconf ||: autoreconf ||:
./generator/generator.ml ./generator/generator.ml
@ -285,14 +287,15 @@ rm -rf $RPM_BUILD_ROOT
%files -n ruby-%{name} %files -n ruby-%{name}
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc ruby/doc/site/* %doc ruby/doc/site/*
%{ruby_sitelib}/hivex.rb %{ruby_vendorlibdir}/hivex.rb
%{ruby_sitearch}/_hivex.so %{ruby_vendorarchdir}/_hivex.so
%changelog %changelog
* Tue Feb 07 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-6 * Wed Feb 8 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-7
- Bump and rebuild for Ruby update. - Bump and rebuild for Ruby update.
- Add upstream patch to fix bindings for Ruby 1.9. - 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 * Fri Jan 06 2012 Richard W.M. Jones <rjones@redhat.com> - 1.3.3-3
- Rebuild for OCaml 3.12.1. - Rebuild for OCaml 3.12.1.

22
ruby-1.9-vendor-not-site.patch Normal file
View File

@ -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