Compare commits
No commits in common. "rawhide" and "f23" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,4 +1,2 @@
|
||||
/ocamlgraph-1.8.5.tar.gz
|
||||
/ocamlgraph-1.8.6.tar.gz
|
||||
/ocamlgraph-1.8.7.tar.gz
|
||||
/ocamlgraph-1.8.8.tar.gz
|
||||
|
||||
@ -1,8 +1,12 @@
|
||||
%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
|
||||
%global ocaml_destdir %{_libdir}/ocaml
|
||||
%if !%{opt}
|
||||
%global debug_package %{nil}
|
||||
%endif
|
||||
|
||||
Name: ocaml-ocamlgraph
|
||||
Version: 1.8.8
|
||||
Release: 25%{?dist}
|
||||
Version: 1.8.6
|
||||
Release: 3%{?dist}
|
||||
Summary: OCaml library for arc and node graphs
|
||||
|
||||
License: LGPLv2 with exceptions
|
||||
@ -13,12 +17,8 @@ Source1: ocamlgraph-test.result
|
||||
# not built.
|
||||
Patch0: ocamlgraph-1.8.6-byte-install.patch
|
||||
|
||||
# Fix the tests - unclear why this is necessary.
|
||||
Patch1: ocamlgraph-1.8.7-fix-tests.patch
|
||||
|
||||
BuildRequires: libart_lgpl-devel
|
||||
BuildRequires: libgnomecanvas-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: ocaml
|
||||
BuildRequires: ocaml-findlib
|
||||
BuildRequires: ocaml-lablgtk-devel
|
||||
@ -61,13 +61,15 @@ The %{name}-tools package contains graph editing tools for use with
|
||||
|
||||
%prep
|
||||
%setup -q -n %{libname}-%{version}
|
||||
%ifnarch %{ocaml_native_compiler}
|
||||
%if ! %opt
|
||||
%patch0
|
||||
%endif
|
||||
%patch1 -p1
|
||||
|
||||
cp -p %{SOURCE1} .
|
||||
|
||||
# Remove spurious executable bits
|
||||
find . -name '*.ml*' -perm /0111 | xargs chmod a-x
|
||||
|
||||
# Fix encoding
|
||||
for fil in CHANGES COPYING CREDITS; do
|
||||
iconv -f latin1 -t utf-8 $fil > $fil.utf8
|
||||
@ -79,7 +81,7 @@ done
|
||||
%build
|
||||
%configure
|
||||
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%if %opt
|
||||
%global opt_option OCAMLBEST=opt OCAMLOPT='ocamlopt.opt -g'
|
||||
%else
|
||||
%global opt_option OCAMLBEST=byte OCAMLC=ocamlc
|
||||
@ -88,20 +90,15 @@ make depend
|
||||
make %{opt_option}
|
||||
make doc
|
||||
|
||||
# Skip the tests on i386; see https://github.com/ocaml/ocaml/issues/9800
|
||||
%ifnarch %{ix86}
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%check
|
||||
make --no-print-directory check >& test
|
||||
diff -u test ocamlgraph-test.result
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{ocaml_destdir}
|
||||
make OCAMLFIND_DESTDIR=%{buildroot}%{ocaml_destdir} install-findlib
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%if %opt
|
||||
install -m 0755 -p graph.cmxs %{buildroot}%{ocaml_destdir}/%{libname}
|
||||
%endif
|
||||
|
||||
@ -113,7 +110,7 @@ cp -p doc/* dox-devel/API
|
||||
|
||||
# Install the graph editing tools
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%if %opt
|
||||
install -m 0755 -p editor/editor.opt %{buildroot}/%{_bindir}/ocaml-graph-editor
|
||||
install -m 0755 -p dgraph/dgraph.opt %{buildroot}%{_bindir}/ocaml-graph-viewer
|
||||
install -m 0755 -p view_graph/viewgraph.opt \
|
||||
@ -130,7 +127,7 @@ install -m 0755 -p view_graph/viewgraph.byte \
|
||||
%doc CREDITS FAQ
|
||||
%license COPYING LICENSE
|
||||
%{ocaml_destdir}/%{libname}/
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%if %opt
|
||||
%exclude %{ocaml_destdir}/*/*.a
|
||||
%exclude %{ocaml_destdir}/*/*.cmxa
|
||||
%exclude %{ocaml_destdir}/*/*.cmx
|
||||
@ -140,8 +137,8 @@ install -m 0755 -p view_graph/viewgraph.byte \
|
||||
|
||||
|
||||
%files devel
|
||||
%doc CHANGES README.adoc dox-devel/*
|
||||
%ifarch %{ocaml_native_compiler}
|
||||
%doc CHANGES README dox-devel/*
|
||||
%if %opt
|
||||
%{ocaml_destdir}/*/*.a
|
||||
%{ocaml_destdir}/*/*.cmxa
|
||||
%{ocaml_destdir}/*/*.cmx
|
||||
@ -155,124 +152,6 @@ install -m 0755 -p view_graph/viewgraph.byte \
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Mar 1 16:57:43 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-25
|
||||
- OCaml 4.12.0 build
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-23
|
||||
- OCaml 4.11.1 rebuild
|
||||
|
||||
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-22
|
||||
- OCaml 4.11.0 rebuild
|
||||
|
||||
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-21
|
||||
- Second attempt - Rebuilt for
|
||||
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-19
|
||||
- OCaml 4.11.0+dev2-2020-04-22 rebuild
|
||||
|
||||
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-18
|
||||
- OCaml 4.11.0 pre-release attempt 2
|
||||
|
||||
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-17
|
||||
- OCaml 4.11.0 pre-release
|
||||
|
||||
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-16
|
||||
- Update all OCaml dependencies for RPM 4.16.
|
||||
|
||||
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-15
|
||||
- OCaml 4.10.0 final.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-13
|
||||
- OCaml 4.10.0+beta1 rebuild.
|
||||
|
||||
* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-12
|
||||
- OCaml 4.09.0 for riscv64
|
||||
|
||||
* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-11
|
||||
- OCaml 4.09.0 (final) rebuild.
|
||||
|
||||
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-10
|
||||
- OCaml 4.08.1 (final) rebuild.
|
||||
|
||||
* Sat Aug 10 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-9
|
||||
- Rebuild against new ocaml-lablgtk.
|
||||
|
||||
* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-8
|
||||
- OCaml 4.08.1 (rc2) rebuild.
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-4
|
||||
- OCaml 4.07.0 (final) rebuild.
|
||||
|
||||
* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-3
|
||||
- OCaml 4.07.0-rc1 rebuild.
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.8-1
|
||||
- New upstream version 1.8.8.
|
||||
|
||||
* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-11
|
||||
- OCaml 4.06.0 rebuild.
|
||||
|
||||
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-10
|
||||
- OCaml 4.05.0 rebuild.
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-7
|
||||
- OCaml 4.04.2 rebuild.
|
||||
|
||||
* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-6
|
||||
- Bump release and rebuild.
|
||||
|
||||
* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-5
|
||||
- OCaml 4.04.1 rebuild.
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.7-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 1.8.7-3
|
||||
- rebuild for s390x codegen bug
|
||||
|
||||
* Sun Nov 06 2016 Richard W.M. Jones <rjones@redhat.com> - 1.8.7-2
|
||||
- Rebuild for OCaml 4.04.0.
|
||||
|
||||
* Sat Apr 16 2016 Jerry James <loganjerry@gmail.com> - 1.8.7-1
|
||||
- New upstream release
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.6-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-5
|
||||
- OCaml 4.02.3 rebuild.
|
||||
|
||||
* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-4
|
||||
- Enable bytecode builds.
|
||||
|
||||
* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 1.8.6-3
|
||||
- ocaml-4.02.2 final rebuild.
|
||||
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- ocamlgraph-1.8.7/tests/test_clique.ml~ 2016-04-12 07:47:33.000000000 +0100
|
||||
+++ ocamlgraph-1.8.7/tests/test_clique.ml 2016-11-06 19:49:38.527278156 +0000
|
||||
@@ -1,5 +1,7 @@
|
||||
(* Test file for Brom-Kerbosch *)
|
||||
|
||||
+#directory ".";;
|
||||
+
|
||||
open Graph
|
||||
|
||||
module G = Persistent.Graph.Concrete (struct
|
||||
@ -1,6 +1,6 @@
|
||||
mkdir -p bin
|
||||
ocamlopt.opt -o bin/test-ts unix.cmxa graph.cmxa tests/test_topsort.ml
|
||||
ocaml -I . graph.cma tests/test_clique.ml tests/check.ml
|
||||
ocaml graph.cma tests/test_clique.ml tests/check.ml
|
||||
bin/test-ts 10
|
||||
0 1 2
|
||||
x=0 y=0 num(x)=1 num(y)=1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user