[rpmdepsize] Include patch with fixes against latest ocaml-sexplib.
Richard W.M. Jones
rjones at fedoraproject.org
Thu Jul 26 08:12:43 UTC 2012
commit e911f87bed030b0006b8070ca0a6978787e7e636
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Thu Jul 26 09:11:46 2012 +0100
Include patch with fixes against latest ocaml-sexplib.
rpmdepsize-1.0-build-fixes.patch | 25 +++++++++++++++++++++++++
rpmdepsize.spec | 10 +++++++++-
2 files changed, 34 insertions(+), 1 deletions(-)
---
diff --git a/rpmdepsize-1.0-build-fixes.patch b/rpmdepsize-1.0-build-fixes.patch
new file mode 100644
index 0000000..51addde
--- /dev/null
+++ b/rpmdepsize-1.0-build-fixes.patch
@@ -0,0 +1,25 @@
+--- rpmdepsize-1.0.old/rpmdepsize.ml 2009-03-27 16:38:12.000000000 +0000
++++ rpmdepsize-1.0/rpmdepsize.ml 2012-07-26 09:08:41.154360327 +0100
+@@ -19,7 +19,13 @@
+ * Python script modified from a version by Seth Vidal.
+ *)
+
++(* Use input_all from Extlib. ocaml-sexplib contains a conflicting
++ * Std module.
++ *)
++let input_all = Std.input_all
++
+ open Sexplib
++open Conv
+ TYPE_CONV_PATH "."
+
+ open ExtList
+@@ -130,7 +136,7 @@
+ let chan = open_process_in cmd in
+ ignore (input_line chan); (* Drop "Loaded plugins" line. *)
+ let root, pkgs =
+- root_packages_of_sexp (Sexp.of_string (Std.input_all chan)) in
++ root_packages_of_sexp (Sexp.of_string (input_all chan)) in
+ (match close_process_in chan with
+ | WEXITED 0 -> ()
+ | WEXITED i -> failwithf "python command exited with status %d" i
diff --git a/rpmdepsize.spec b/rpmdepsize.spec
index 0141959..f71d95b 100644
--- a/rpmdepsize.spec
+++ b/rpmdepsize.spec
@@ -1,6 +1,6 @@
Name: rpmdepsize
Version: 1.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: A tool for visualizing RPM dependencies
Group: Development/Libraries
@@ -9,6 +9,8 @@ URL: http://et.redhat.com/~rjones/rpmdepsize/
Source0: http://et.redhat.com/~rjones/rpmdepsize/files/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0: rpmdepsize-1.0-build-fixes.patch
+
BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
BuildRequires: ocaml >= 3.10.0
@@ -42,6 +44,9 @@ in large amounts of data because of indirect dependencies.
%prep
%setup -q
+
+%patch0 -p1
+
# Generate Desktop file
cat > %{name}.desktop << EOT
[Desktop Entry]
@@ -81,6 +86,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jul 26 2012 Richard W.M. Jones <rjones at redhat.com> - 1.0-11
+- Include patch with fixes against latest ocaml-sexplib.
+
* Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
More information about the scm-commits
mailing list