[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/ocaml-ocamlnet/devel ocamlnet-debug-configure.patch, NONE, 1.1 ocaml-ocamlnet.spec, 1.17, 1.18



Author: rjones

Update of /cvs/pkgs/rpms/ocaml-ocamlnet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19423

Modified Files:
	ocaml-ocamlnet.spec 
Added Files:
	ocamlnet-debug-configure.patch 
Log Message:
- Use new dependency generator in upstream RPM 4.8.
- Add a temporary patch to diagnose build problem on Koji.


ocamlnet-debug-configure.patch:
 configure |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE ocamlnet-debug-configure.patch ---
--- ocamlnet-2.2.9/configure.orig	2010-01-05 13:13:25.375323415 +0000
+++ ocamlnet-2.2.9/configure	2010-01-05 13:14:19.205448039 +0000
@@ -552,6 +552,10 @@
 EOF
     # Note: this newer API is never broken in the sense checked below, i.e.
     # such lablgtk2 versions do not exist.
+
+    ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml
+    tmp/gtk
+
     if ocamlfind ocamlc -package unix,lablgtk2 -linkpkg -o tmp/gtk tmp/gtk.ml >/dev/null 2>/dev/null && tmp/gtk; then
         echo "yes"
         gtk2_io_add_watch_supports_lists="-ppopt -DGTK2_IO_ADD_WATCH_SUPPORTS_LISTS"


Index: ocaml-ocamlnet.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ocaml-ocamlnet/devel/ocaml-ocamlnet.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ocaml-ocamlnet.spec	30 Dec 2009 13:51:23 -0000	1.17
+++ ocaml-ocamlnet.spec	5 Jan 2010 13:20:35 -0000	1.18
@@ -6,7 +6,7 @@
 
 Name:           ocaml-ocamlnet
 Version:        2.2.9
-Release:        16%{?dist}
+Release:        17%{?dist}
 Summary:        Network protocols for OCaml
 
 Group:          Development/Libraries
@@ -15,6 +15,7 @@ URL:            http://projects.camlcity
 Source0:        http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
 Patch0:         ocamlnet-ocaml310.patch
 Patch1:         ocamlnet-ucred.patch
+Patch2:         ocamlnet-debug-configure.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 ExcludeArch:    sparc64 s390 s390x
@@ -30,9 +31,7 @@ BuildRequires:  pcre-devel
 BuildRequires:  openssl-devel
 BuildRequires:  tcl-devel
 
-%define _use_internal_dependency_generator 0
-%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh -i Asttypes -i Outcometree -i Parsetree
-%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
+%global __ocaml_requires_opts -i Asttypes -i Outcometree -i Parsetree
 
 %description
 Ocamlnet is an ongoing effort to collect modules, classes and
@@ -119,6 +118,7 @@ pushd src/equeue-gtk1
 %patch0 -p2
 popd
 %patch1 -p1
+%patch2 -p1
 
 ./configure -enable-tcl -with-nethttpd \
   -bindir %{_bindir} \
@@ -243,6 +243,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jan  5 2010 Richard W.M. Jones <rjones redhat com> - 2.2.9-17
+- Use new dependency generator in upstream RPM 4.8.
+- Add a temporary patch to diagnose build problem on Koji.
+
 * Wed Dec 30 2009 Richard W.M. Jones <rjones redhat com> - 2.2.9-16
 - Rebuild for OCaml 3.11.2.
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]