rpms/monotone-viz/devel import.log, NONE, 1.1 monotone-viz-1.0.1-gio.patch, NONE, 1.1 monotone-viz.spec, 1.3, 1.4

[Thomas Moschny]

Author: thm

Update of /cvs/pkgs/rpms/monotone-viz/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2055/devel

Modified Files:
	monotone-viz.spec 
Added Files:
	import.log monotone-viz-1.0.1-gio.patch 
Log Message:
Add patch to avoid a name clash with ocaml-lablgtk-2.12.


--- NEW FILE import.log ---
monotone-viz-1_0_1-4_fc10:HEAD:monotone-viz-1.0.1-4.fc10.src.rpm:1235692446

monotone-viz-1.0.1-gio.patch:

--- NEW FILE monotone-viz-1.0.1-gio.patch ---
diff -up monotone-viz-1.0.1/glib/giochannel.mli.orig monotone-viz-1.0.1/glib/giochannel.mli
--- monotone-viz-1.0.1/glib/giochannel.mli.orig	2007-03-07 22:53:54.000000000 +0100
+++ monotone-viz-1.0.1/glib/giochannel.mli	2009-02-26 14:15:28.000000000 +0100
@@ -20,7 +20,7 @@ external new_file : string -> string -> 
 
 external read_chars : t -> ?off:int -> ?len:int -> string -> 
   [ `NORMAL of int | `AGAIN | `EOF]
-  = "ml_g_io_channel_read_chars"
+  = "ml_mtnviz_g_io_channel_read_chars"
 (** @raise Error .
     @raise Glib.Convert.Error .*)
 external write_chars : t -> ?bytes_written:int ref -> ?off:int -> ?len:int -> string -> 
diff -up monotone-viz-1.0.1/glib/giochannel.ml.orig monotone-viz-1.0.1/glib/giochannel.ml
--- monotone-viz-1.0.1/glib/giochannel.ml.orig	2007-03-07 22:53:54.000000000 +0100
+++ monotone-viz-1.0.1/glib/giochannel.ml	2009-02-26 14:15:28.000000000 +0100
@@ -24,7 +24,7 @@ external new_file : string -> string -> 
 
 external read_chars : t -> ?off:int -> ?len:int -> string -> 
   [ `NORMAL of int | `AGAIN | `EOF]
-  = "ml_g_io_channel_read_chars"
+  = "ml_mtnviz_g_io_channel_read_chars"
 external write_chars : t -> ?bytes_written:int ref -> ?off:int -> ?len:int -> string -> 
   [ `NORMAL of int | `AGAIN]
   = "ml_g_io_channel_write_chars"
diff -up monotone-viz-1.0.1/glib/ocaml-giochannel.c.orig monotone-viz-1.0.1/glib/ocaml-giochannel.c
--- monotone-viz-1.0.1/glib/ocaml-giochannel.c.orig	2007-03-07 22:53:54.000000000 +0100
+++ monotone-viz-1.0.1/glib/ocaml-giochannel.c	2009-02-26 14:15:28.000000000 +0100
@@ -134,7 +134,7 @@ check_substring (value s, gsize off, gsi
 #endif
 
 CAMLprim value
-ml_g_io_channel_read_chars (value c, value o_off, value o_len, value s)
+ml_mtnviz_g_io_channel_read_chars (value c, value o_off, value o_len, value s)
 {
   CAMLparam1(s);
   GError *err = NULL;


Index: monotone-viz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/monotone-viz/devel/monotone-viz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone-viz.spec	26 Feb 2009 02:41:00 -0000	1.3
+++ monotone-viz.spec	26 Feb 2009 23:54:49 -0000	1.4
@@ -1,37 +1,38 @@
-Name:		monotone-viz
-Version:	1.0.1
-Release:	3%{?dist}
-
-Summary:	GNOME application that visualizes Monotone ancestry graphs
-Group:		Development/Tools
-License:	GPLv2+
-
-URL:		http://oandrieu.nerim.net/monotone-viz/
-Source0:	%{url}/%{name}-%{version}-nolablgtk.tar.gz
-Source1:	monotone-viz.desktop
-
-BuildRequires:	ocaml
-BuildRequires:	ocaml-camlp4-devel
-BuildRequires:	ocaml-lablgtk-devel
-BuildRequires:	gtk2-devel
-BuildRequires:	libgnomecanvas-devel
-BuildRequires:	desktop-file-utils
-BuildRequires:	ImageMagick
-Requires:	monotone
-Requires:	graphviz
+Name:           monotone-viz
+Version:        1.0.1
+Release:        4%{?dist}
+
+Summary:        GNOME application that visualizes Monotone ancestry graphs
+Group:          Development/Tools
+License:        GPLv2+
+
+URL:            http://oandrieu.nerim.net/monotone-viz/
+Source0:        %{url}/%{name}-%{version}-nolablgtk.tar.gz
+Source1:        monotone-viz.desktop
+Patch0:         monotone-viz-1.0.1-gio.patch
+
+BuildRequires:  ocaml
+BuildRequires:  ocaml-camlp4-devel
+BuildRequires:  ocaml-lablgtk-devel
+BuildRequires:  gtk2-devel
+BuildRequires:  libgnomecanvas-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  ImageMagick
+Requires:       monotone
+Requires:       graphviz
 
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # Apparently necessary exclusion for ocaml packages.
-ExcludeArch:	ppc64
+ExcludeArch:    ppc64
 
 %description
 This is a small GNOME application to visualize Monotone ancestry graphs.
 
 
 %prep
-%setup -q
-
+%setup0 -q
+%patch0 -p1 -b .gio
 
 %build
 %configure --without-local-lablgtk
@@ -46,10 +47,10 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 %{__install} -m 644 -D -p %{name}.png \
-	     $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png
+             $RPM_BUILD_ROOT/%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
-  		     --vendor="" \
-  		     %{name}.desktop
+                     --vendor="" \
+                     %{name}.desktop
 
 
 %clean
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Thu Feb 26 2009 Thomas Moschny <thomas.moschny at gmx.de> - 1.0.1-4
+- Add patch to avoid name clash with ocaml-lablgtk-2.12.
+- Untabify spec file.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild