- fix built with recent perl

This commit is contained in:
Dan Horák 2010-11-19 18:54:51 +01:00
parent f82d66f59d
commit e5ee831040
2 changed files with 30 additions and 1 deletions

24
hivex-1.2.3-dirs.patch Normal file
View File

@ -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@TESTS_ENVIRONMENT = \
@HAVE_PERL_TRUE@ LD_LIBRARY_PATH=$(top_builddir)/lib/.libs
-@HAVE_PERL_TRUE@INSTALLDIRS = site
+@HAVE_PERL_TRUE@INSTALLDIRS = vendor
all: all-am
.SUFFIXES:

View File

@ -7,13 +7,14 @@
Name: hivex Name: hivex
Version: 1.2.3 Version: 1.2.3
Release: 2%{?dist} Release: 3%{?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
License: LGPLv2 License: LGPLv2
URL: http://libguestfs.org/ URL: http://libguestfs.org/
Source0: http://libguestfs.org/download/%{name}-%{version}.tar.gz 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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: perl BuildRequires: perl
@ -124,6 +125,7 @@ perl-%{name} contains Perl bindings for %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .dirs
%build %build
@ -214,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %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 * Tue Sep 7 2010 Dan Horák <dan[at]danny.cz> - 1.2.3-2
- conditionalize ocaml support - conditionalize ocaml support