Add upstream patch to fix ocaml install rule.
This commit is contained in:
parent
b76e59bbaa
commit
7036c38310
@ -0,0 +1,25 @@
|
|||||||
|
From f408b757b1d75429fae5fa7630a4fc5451844de7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Richard W.M. Jones <rjones@redhat.com>
|
||||||
|
Date: Tue, 17 May 2011 17:19:27 +0100
|
||||||
|
Subject: [PATCH] ocaml: Set package name when installing native bindings.
|
||||||
|
|
||||||
|
This fixes commit b8ad15031cacf910634b4f4f4632232949c4acd2.
|
||||||
|
---
|
||||||
|
ocaml/Makefile.am | 1 +
|
||||||
|
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
|
||||||
|
index b97fe37..58fa8e3 100644
|
||||||
|
--- a/ocaml/Makefile.am
|
||||||
|
+++ b/ocaml/Makefile.am
|
||||||
|
@@ -98,6 +98,7 @@ install-data-hook:
|
||||||
|
if HAVE_OCAMLOPT
|
||||||
|
$(OCAMLFIND) install \
|
||||||
|
-ldconf ignore -destdir $(DESTDIR)$(OCAMLLIB) \
|
||||||
|
+ hivex \
|
||||||
|
*.cmx *.cmxa
|
||||||
|
endif
|
||||||
|
|
||||||
|
--
|
||||||
|
1.7.5.1
|
||||||
|
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
Name: hivex
|
Name: hivex
|
||||||
Version: 1.2.7
|
Version: 1.2.7
|
||||||
Release: 1%{?dist}
|
Release: 2%{?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
|
||||||
@ -38,6 +38,9 @@ Conflicts: libguestfs <= 1:1.0.84
|
|||||||
# Fix Perl directory install path.
|
# Fix Perl directory install path.
|
||||||
Patch0: %{name}-1.2.3-dirs.patch
|
Patch0: %{name}-1.2.3-dirs.patch
|
||||||
|
|
||||||
|
# Add upstream patch to fix ocaml install rule.
|
||||||
|
Patch1: 0001-ocaml-Set-package-name-when-installing-native-bindin.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
|
||||||
@ -144,6 +147,7 @@ python-%{name} contains Python bindings for %{name}.
|
|||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch0 -p1 -b .dirs
|
%patch0 -p1 -b .dirs
|
||||||
|
%patch1 -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -252,9 +256,10 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Tue May 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.7-1
|
* Tue May 17 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.7-2
|
||||||
- New upstream version 1.2.7.
|
- New upstream version 1.2.7.
|
||||||
- Removed patch which is now upstream.
|
- Removed patch which is now upstream.
|
||||||
|
- Add upstream patch to fix ocaml install rule.
|
||||||
|
|
||||||
* Thu May 12 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.6-2
|
* Thu May 12 2011 Richard W.M. Jones <rjones@redhat.com> - 1.2.6-2
|
||||||
- New upstream version 1.2.6.
|
- New upstream version 1.2.6.
|
||||||
|
Loading…
Reference in New Issue
Block a user