Update to newer git checkout; patch makefile to install cmx files.

This commit is contained in:
Ben Rosser 2018-08-21 16:23:32 -04:00
parent 7b5c615b0f
commit f06dee8e83
3 changed files with 16 additions and 4 deletions

1
.gitignore vendored
View File

@ -1,2 +1,3 @@
/dose3-5.0.1.tar.gz
/dose-09392e2.tar.gz
/dose-2c1b8df.tar.gz

View File

@ -3,12 +3,12 @@
# that is distributed separately.
# Currently packaging a snapshot to build with newer ocaml.
%global commit0 09392e2944cf2213b4a18093e25c3ed204761907
%global commit0 2c1b8df9064d645fac273e3ca96b5c0d92bf6e9f
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
Name: ocaml-dose3
Version: 5.0.1
Release: 9.20171203git%{shortcommit0}%{?dist}
Release: 10.20180821git%{shortcommit0}%{?dist}
Summary: Framework for managing distribution packages and dependencies
%global libname %(echo %{name} | sed -e 's/^ocaml-//')
@ -91,8 +91,14 @@ for manipulating packages of various formats.
%prep
%autosetup -p1 -n dose-%{shortcommit0} #dose3-%{version}
# I think we want to package the .cmx files if possible.
sed "s/*.cmx /*.cmxignore /g" -i Makefile
sed "s,*.cmxs,*.cmxs _build/doselibs/*.cmx,g" -i Makefile
sed "s,cmxa cmxs,cmx cmxa cmxs,g" -i Makefile.config.in
%build
%configure --with-zip --with-oUnit --with-rpm4 --with-xml
# Build fails when built with %{?_smp_mflags} and thus we can't use the magic macro.
make
make doc man
@ -125,6 +131,7 @@ ln -s %{_bindir}/distcheck %{buildroot}%{_bindir}/eclipsecheck
%{_libdir}/ocaml/%{libname}
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/*/*.a
%exclude %{_libdir}/ocaml/*/*.cmx
%exclude %{_libdir}/ocaml/*/*.cmxa
%endif
%exclude %{_libdir}/ocaml/*/*.cmi
@ -135,6 +142,7 @@ ln -s %{_bindir}/distcheck %{buildroot}%{_bindir}/eclipsecheck
%license COPYING
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmx
%{_libdir}/ocaml/*/*.cmxa
%endif
%{_libdir}/ocaml/*/*.cmi
@ -159,6 +167,10 @@ ln -s %{_bindir}/distcheck %{buildroot}%{_bindir}/eclipsecheck
%{_mandir}/man8/*.8*
%changelog
* Tue Aug 21 2018 Ben Rosser <rosser.bjr@gmail.com> - 5.0.1-10.20180821git2c1b8df
- Update to newer SCM (git) checkout.
- Modify Makefile in prep section in order to install cmx files.
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 5.0.1-9.20171203git09392e2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

View File

@ -1,2 +1 @@
SHA512 (dose3-5.0.1.tar.gz) = e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84
SHA512 (dose-09392e2.tar.gz) = 0b52fff7ab838b9da92b2610f9e120ff39f81424cc264f9af98b295937f4e87839ea88119de68a10571032ae34f95328b6137e166467557f8d6c885415b7cb81
SHA512 (dose-2c1b8df.tar.gz) = aa850673bdc846e5ee84ec9d1b37e7ca34d6d4a452b0b5f1f8e3df40547bee089d3b15d05b1dfcf5c767785e3ce71a886c67eefa7d7c318dcbe9a0372902f3b3