rpms/ocaml-dbus/devel ocaml-dbus-no-fail-unknown-type.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 ocaml-dbus.spec, 1.3, 1.4 sources, 1.3, 1.4 ocaml-dbus-example_avahi.ml, 1.1, NONE ocaml-dbus-object-path.patch, 1.1, NONE ocaml-dbus-string-of-ty.patch, 1.1, NONE

Richard W.M. Jones (rjones) fedora-extras-commits at redhat.com
Mon Mar 3 13:36:09 UTC 2008


Author: rjones

Update of /cvs/pkgs/rpms/ocaml-dbus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29531/devel

Modified Files:
	.cvsignore ocaml-dbus.spec sources 
Added Files:
	ocaml-dbus-no-fail-unknown-type.patch 
Removed Files:
	ocaml-dbus-example_avahi.ml ocaml-dbus-object-path.patch 
	ocaml-dbus-string-of-ty.patch 
Log Message:
* Mon Mar  3 2008 Richard W.M. Jones <rjones at redhat.com> - 0.05-1
- New upstream release 0.05.
- Include 'THANKS' file in doc.


ocaml-dbus-no-fail-unknown-type.patch:

--- NEW FILE ocaml-dbus-no-fail-unknown-type.patch ---
Index: dbus_stubs.c
===================================================================
RCS file: /home/remote/rjones/cvsroot/redhat/ocaml_dbus/dbus_stubs.c,v
retrieving revision 1.6
diff -u -r1.6 dbus_stubs.c
--- dbus_stubs.c	3 Mar 2008 13:16:12 -0000	1.6
+++ dbus_stubs.c	3 Mar 2008 13:19:43 -0000
@@ -13,6 +13,7 @@
  * Dbus binding
  */
 
+#include <stdio.h>
 #include <string.h>
 #include <dbus/dbus.h>
 #include <caml/mlvalues.h>
@@ -726,8 +727,9 @@
 			break;
 			}
 		default:
-			caml_failwith("unexpected type in message");
-			r = Val_int(0);
+		        fprintf (stderr, "unknown message type: %d (%c)\n",
+				 c_type, c_type);
+			r = Val_int (0); /* Unknown */
 			break;
 		}
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	23 Feb 2008 14:25:19 -0000	1.3
+++ .cvsignore	3 Mar 2008 13:35:33 -0000	1.4
@@ -1 +1 @@
-ocaml_dbus-0.04.tar.bz2
+ocaml_dbus-0.05.tar.bz2


Index: ocaml-dbus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/ocaml-dbus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ocaml-dbus.spec	1 Mar 2008 08:46:01 -0000	1.3
+++ ocaml-dbus.spec	3 Mar 2008 13:35:33 -0000	1.4
@@ -2,8 +2,8 @@
 %define debug_package %{nil}
 
 Name:           ocaml-dbus
-Version:        0.04
-Release:        2%{?dist}
+Version:        0.05
+Release:        1%{?dist}
 Summary:        OCaml library for using D-Bus
 
 Group:          Development/Libraries
@@ -12,9 +12,7 @@
 Source0:        http://tab.snarc.org/download/ocaml/ocaml_dbus-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         ocaml-dbus-string-of-ty.patch
-Patch1:         ocaml-dbus-object-path.patch
-Source1:        ocaml-dbus-example_avahi.ml
+Patch0:         ocaml-dbus-no-fail-unknown-type.patch
 
 BuildRequires:  ocaml >= 3.10.0-7, ocaml-findlib
 BuildRequires:  dbus-devel
@@ -43,8 +41,6 @@
 %prep
 %setup -q -n ocaml_dbus-%{version}
 %patch0 -p0
-%patch1 -p0
-cp %{SOURCE1} example_avahi.ml
 
 
 %build
@@ -91,7 +87,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc README example_avahi.ml
+%doc README THANKS example_avahi.ml
 %if %opt
 %{_libdir}/ocaml/dbus/*.a
 %{_libdir}/ocaml/dbus/*.cmxa
@@ -101,6 +97,10 @@
 
 
 %changelog
+* Mon Mar  3 2008 Richard W.M. Jones <rjones at redhat.com> - 0.05-1
+- New upstream release 0.05.
+- Include 'THANKS' file in doc.
+
 * Sat Mar  1 2008 Richard W.M. Jones <rones at redhat.com> - 0.04-2
 - Rebuild for ppc64.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-dbus/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	23 Feb 2008 14:25:19 -0000	1.3
+++ sources	3 Mar 2008 13:35:33 -0000	1.4
@@ -1 +1 @@
-736b11fa87655f23ea63d94f89573a74  ocaml_dbus-0.04.tar.bz2
+88fa86074ba4d14c5be75f1cfd991fd3  ocaml_dbus-0.05.tar.bz2


--- ocaml-dbus-example_avahi.ml DELETED ---


--- ocaml-dbus-object-path.patch DELETED ---


--- ocaml-dbus-string-of-ty.patch DELETED ---




More information about the fedora-extras-commits mailing list