[hivex] - fix built with recent perl

Dan Horák sharkcz at fedoraproject.org
Fri Nov 19 17:53:52 UTC 2010


commit e5ee831040e729b10f818dc16891960575eb96ed
Author: Dan Horák <dan at danny.cz>
Date:   Fri Nov 19 18:54:51 2010 +0100

    - fix built with recent perl

 hivex-1.2.3-dirs.patch |   24 ++++++++++++++++++++++++
 hivex.spec             |    7 ++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/hivex-1.2.3-dirs.patch b/hivex-1.2.3-dirs.patch
new file mode 100644
index 0000000..340d72e
--- /dev/null
+++ b/hivex-1.2.3-dirs.patch
@@ -0,0 +1,24 @@
+diff -up hivex-1.2.3/perl/Makefile.am.dirs hivex-1.2.3/perl/Makefile.am
+--- hivex-1.2.3/perl/Makefile.am.dirs	2010-11-19 12:44:02.177644892 -0500
++++ hivex-1.2.3/perl/Makefile.am	2010-11-19 12:44:17.137516124 -0500
+@@ -40,7 +40,7 @@ $(TESTS): src_deps all
+ TESTS_ENVIRONMENT = \
+ 	LD_LIBRARY_PATH=$(top_builddir)/lib/.libs
+ 
+-INSTALLDIRS = site
++INSTALLDIRS = vendor
+ 
+ all: Makefile-pl src_deps
+ 	$(MAKE) -f Makefile-pl
+diff -up hivex-1.2.3/perl/Makefile.in.dirs hivex-1.2.3/perl/Makefile.in
+--- hivex-1.2.3/perl/Makefile.in.dirs	2010-11-19 12:44:08.577393593 -0500
++++ hivex-1.2.3/perl/Makefile.in	2010-11-19 12:44:32.717483099 -0500
+@@ -740,7 +740,7 @@ EXTRA_DIST = \
+ @HAVE_PERL_TRUE at TESTS_ENVIRONMENT = \
+ @HAVE_PERL_TRUE@	LD_LIBRARY_PATH=$(top_builddir)/lib/.libs
+ 
+- at HAVE_PERL_TRUE@INSTALLDIRS = site
++ at HAVE_PERL_TRUE@INSTALLDIRS = vendor
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/hivex.spec b/hivex.spec
index fb864cf..78602f6 100644
--- a/hivex.spec
+++ b/hivex.spec
@@ -7,13 +7,14 @@
 
 Name:           hivex
 Version:        1.2.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Read and write Windows Registry binary hive files
 
 Group:          Development/Libraries
 License:        LGPLv2
 URL:            http://libguestfs.org/
 Source0:        http://libguestfs.org/download/%{name}-%{version}.tar.gz
+Patch0:         %{name}-1.2.3-dirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl
@@ -124,6 +125,7 @@ perl-%{name} contains Perl bindings for %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dirs
 
 
 %build
@@ -214,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Nov 19 2010 Dan Horák <dan[at]danny.cz> - 1.2.3-3
+- fix built with recent perl
+
 * Tue Sep  7 2010 Dan Horák <dan[at]danny.cz> - 1.2.3-2
 - conditionalize ocaml support
 


More information about the scm-commits mailing list