Drop Perl patch for setting INSTALLDIRS.
Depend on pod2html, pod2man binaries explicitly.
This commit is contained in:
parent
123dd8bebb
commit
a0bd039465
@ -1,12 +0,0 @@
|
|||||||
diff -ur hivex-1.3.8.old/perl/Makefile.am hivex-1.3.8/perl/Makefile.am
|
|
||||||
--- hivex-1.3.8.old/perl/Makefile.am 2013-07-25 15:09:00.000000000 +0100
|
|
||||||
+++ hivex-1.3.8/perl/Makefile.am 2013-07-25 23:14:10.952149773 +0100
|
|
||||||
@@ -43,7 +43,7 @@
|
|
||||||
|
|
||||||
TESTS_ENVIRONMENT = ../run
|
|
||||||
|
|
||||||
-INSTALLDIRS = site
|
|
||||||
+INSTALLDIRS = vendor
|
|
||||||
|
|
||||||
all: Makefile-pl src_deps
|
|
||||||
$(MAKE) -f Makefile-pl
|
|
19
hivex.spec
19
hivex.spec
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
Name: hivex
|
Name: hivex
|
||||||
Version: 1.3.13
|
Version: 1.3.13
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Read and write Windows Registry binary hive files
|
Summary: Read and write Windows Registry binary hive files
|
||||||
|
|
||||||
License: LGPLv2
|
License: LGPLv2
|
||||||
@ -15,15 +15,9 @@ URL: http://libguestfs.org/
|
|||||||
|
|
||||||
Source0: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz
|
Source0: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
# Fix Perl directory install path.
|
|
||||||
Patch0: %{name}-1.3.8-dirs.patch
|
|
||||||
BuildRequires: autoconf, automake, libtool, gettext-devel
|
|
||||||
|
|
||||||
BuildRequires: perl
|
BuildRequires: perl
|
||||||
# Provides %{_bindir}/pod2html
|
BuildRequires: %{_bindir}/pod2html
|
||||||
BuildRequires: perl-Pod-Html
|
BuildRequires: %{_bindir}/pod2man
|
||||||
# Provides %{_bindir}/pod2man
|
|
||||||
BuildRequires: perl-podlators
|
|
||||||
BuildRequires: perl(bytes)
|
BuildRequires: perl(bytes)
|
||||||
BuildRequires: perl(Carp)
|
BuildRequires: perl(Carp)
|
||||||
BuildRequires: perl(Encode)
|
BuildRequires: perl(Encode)
|
||||||
@ -165,9 +159,6 @@ ruby-%{name} contains Ruby bindings for %{name}.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch0 -p1 -b .dirs
|
|
||||||
autoreconf -i --force
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure
|
%configure
|
||||||
@ -274,9 +265,11 @@ rm $RPM_BUILD_ROOT%{python_sitearch}/libhivexmod.la
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Oct 29 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.13-1
|
* Thu Oct 29 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.13-2
|
||||||
- New upstream version 1.3.13.
|
- New upstream version 1.3.13.
|
||||||
- Drop ancient 'Conflicts' rule.
|
- Drop ancient 'Conflicts' rule.
|
||||||
|
- Drop Perl patch for setting INSTALLDIRS.
|
||||||
|
- Depend on pod2html, pod2man binaries explicitly.
|
||||||
|
|
||||||
* Mon Oct 5 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-1
|
* Mon Oct 5 2015 Richard W.M. Jones <rjones@redhat.com> - 1.3.12-1
|
||||||
- New upstream version 1.3.12.
|
- New upstream version 1.3.12.
|
||||||
|
Loading…
Reference in New Issue
Block a user