rpms/ocaml-ocamlnet
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- Use new dependency generator in upstream RPM 4.8.

Browse Source 
- Add a temporary patch to diagnose build problem on Koji.
This commit is contained in:
Richard W.M. Jones 2010-01-05 13:20:35 +00:00
parent 19f283e7af
commit 02b7d13b95
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ocaml-ocamlnet.spec
View File

@ -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.org/projects/ocamlnet.html
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.

13
ocamlnet-debug-configure.patch Normal file
View File

@ -0,0 +1,13 @@
--- 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"