New upstream version 1.7.0.

- Fix upstream URL and Source0.
This commit is contained in:
Richard W.M. Jones 2016-11-05 12:12:07 +00:00
parent 8f9292167f
commit 40db377220
4 changed files with 23 additions and 60 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/extlib-*.tar.gz
/1.7.0.tar.gz

View File

@ -3,24 +3,19 @@
%global debug_package %{nil}
Name: ocaml-extlib
Version: 1.6.1
Release: 13%{?dist}
Version: 1.7.0
Release: 1%{?dist}
Summary: OCaml ExtLib additions to the standard library
License: LGPLv2+ with exceptions
URL: http://code.google.com/p/ocaml-extlib/
Source0: http://ocaml-extlib.googlecode.com/files/extlib-%{version}.tar.gz
Patch0: extlib-install.patch
# Omitted from source tarball, I think. This is copied from 1.5.2.
Source1: odoc_style.css
URL: https://github.com/ygrek/ocaml-extlib
Source0: https://github.com/ygrek/ocaml-extlib/archive/1.7.0.tar.gz
BuildRequires: ocaml >= 4.00.1
BuildRequires: ocaml-findlib-devel >= 1.3.3-3
BuildRequires: ocaml-camlp4-devel
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-cppo
BuildRequires: gawk
@ -44,38 +39,27 @@ developing applications that use %{name}.
%prep
%setup -q -n extlib-%{version}
cp %{SOURCE1} .
%patch0 -p1
%setup -q
%build
# You can't just build extlib!
# Parallel builds do not work.
unset MAKEFLAGS
make build -j1
%install
extlibdir=$RPM_BUILD_ROOT%{_libdir}/ocaml/extlib
mkdir -p $extlibdir
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
# This does the build and install.
ocaml install.ml -d $extlibdir -b -min -doc \
%ifarch %{ocaml_native_compiler}
-n
%endif
# Copy the interface files, and extLib.ml which is really an interface.
cp extLib.ml *.mli $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib
install -m 0644 META $RPM_BUILD_ROOT%{_libdir}/ocaml/extlib/
# Move the HTML documentation - we'll install it using a %doc rule.
mv $extlibdir/extlib-doc .
make install -j1
%files
%doc README.txt LICENSE
%doc README
%license LICENSE
%{_libdir}/ocaml/extlib
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/extlib/*.a
@ -83,21 +67,23 @@ mv $extlibdir/extlib-doc .
%exclude %{_libdir}/ocaml/extlib/*.cmx
%endif
%exclude %{_libdir}/ocaml/extlib/*.mli
%exclude %{_libdir}/ocaml/extlib/*.ml
%files devel
%doc extlib-doc/*
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/extlib/*.a
%{_libdir}/ocaml/extlib/*.cmxa
%{_libdir}/ocaml/extlib/*.cmx
%endif
%{_libdir}/ocaml/extlib/*.mli
%{_libdir}/ocaml/extlib/*.ml
%changelog
* Sat Nov 05 2016 Richard W.M. Jones <rjones@redhat.com> - 1.7.0-1
- New upstream version 1.7.0.
- Fix upstream URL and Source0.
- Rationalize the build.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

View File

@ -1,24 +0,0 @@
body { padding: 0px 20px 0px 26px; background: #ffffff; color: #000000; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 90%; }
h1 { padding : 5px 0px 5px 0px; font-size : 16pt; font-weight : normal; background-color : #E0E0FF }
h6 { padding : 5px 0px 5px 20px; font-size : 16pt; font-weight : normal; background-color : #E0E0FF }
a:link, a:visited, a:active { text-decoration: none; }
a:link { color: #000077; }
a:visited { color: #000077; }
a:hover { color: #cc9900; }
.keyword { font-weight : bold ; color : Blue }
.keywordsign { color : #606060 }
.superscript { font-size : 4 }
.subscript { font-size : 4 }
.comment { color : #606060 }
.constructor { color : #808080; }
.type { color : #606060 }
.string { color : Red }
.warning { color : Red ; font-weight : bold }
.info { margin-left : 3em; margin-right : 3em }
.code { color : #606060 ; }
.title1 { font-size : 16pt ; background-color : #E0E0E0 }
.title2 { font-size : 16pt ; background-color : #E0E0E0 }
.title3 { font-size : 16pt ; background-color : #E0E0E0 }
.title4 { font-size : 16pt ; background-color : #E0E0E0 }
.title5 { font-size : 16pt ; background-color : #E0E0E0 }
.title6 { font-size : 16pt ; background-color : #E0E0E0; }

View File

@ -1 +1 @@
5643237a6410dc915347956cff97df86 extlib-1.6.1.tar.gz
b50b02d9e40d35cc20c82d9c881a1bf6 1.7.0.tar.gz