Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
4dc2379925 | ||
|
a9d56c99da | ||
|
9e9eb6b945 | ||
|
|
382cf20cb5 | ||
|
2118735872 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1 @@
|
||||
omake-0.9.8.5-3.tar.gz
|
||||
/omake-0.9.8.6-0.rc1.tar.gz
|
||||
/omake-0.10.3.tar.gz
|
||||
|
||||
26
ocaml-omake-debian-stdin-stdout-fix.patch
Executable file
26
ocaml-omake-debian-stdin-stdout-fix.patch
Executable file
@ -0,0 +1,26 @@
|
||||
#! /bin/sh /usr/share/dpatch/dpatch-run
|
||||
## 10_stdin_stdout_fix.dpatch by Mike Furr <mfurr@debian.org>
|
||||
##
|
||||
## All lines beginning with `## DP:' are a description of the patch.
|
||||
## DP: stdin <-> stdout fix (upstream r12115)
|
||||
|
||||
@DPATCH@
|
||||
diff -urNad omake-0.9.8.5~/src/build/omake_rule.ml omake-0.9.8.5/src/build/omake_rule.ml
|
||||
--- omake-0.9.8.5~/src/build/omake_rule.ml 2007-07-02 14:20:23.000000000 -0400
|
||||
+++ omake-0.9.8.5/src/build/omake_rule.ml 2007-09-06 12:52:23.752616976 -0400
|
||||
@@ -1040,12 +1040,12 @@
|
||||
* Evaluate the commands NOW.
|
||||
*)
|
||||
and exec_commands venv pos loc commands =
|
||||
- let stdin = channel_of_var venv pos loc stdin_var in
|
||||
let stdout = channel_of_var venv pos loc stdout_var in
|
||||
- let stdin = Lm_channel.descr stdin in
|
||||
+ let stderr = channel_of_var venv pos loc stderr_var in
|
||||
let stdout = Lm_channel.descr stdout in
|
||||
+ let stderr = Lm_channel.descr stderr in
|
||||
List.iter (fun command ->
|
||||
- let pid = eval_shell_internal stdin stdout command in
|
||||
+ let pid = eval_shell_internal stdout stderr command in
|
||||
let status, _ = eval_shell_wait venv pos pid in
|
||||
let code =
|
||||
match status with
|
||||
234
ocaml-omake.spec
234
ocaml-omake.spec
@ -1,23 +1,31 @@
|
||||
%define debug_package %{nil}
|
||||
|
||||
Name: ocaml-omake
|
||||
Version: 0.10.3
|
||||
Release: 13%{?dist}
|
||||
Summary: Build system with automated dependency analysis
|
||||
Version: 0.9.8.5
|
||||
Release: 3%{?dist}
|
||||
Summary: OCaml build system with automated dependency analysis
|
||||
|
||||
Group: Development/Tools
|
||||
License: LGPLv2+ with exceptions and GPLv2+ and BSD
|
||||
URL: http://omake.metaprl.org/download.html
|
||||
Source0: http://omake.metaprl.org/downloads/omake-%{version}-3.tar.gz
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
ExcludeArch: ppc64
|
||||
|
||||
URL: http://projects.camlcity.org/projects/omake.html
|
||||
Source0: http://download.camlcity.org/download/omake-%{version}.tar.gz
|
||||
Patch0: ocaml-omake-debian-stdin-stdout-fix.patch
|
||||
|
||||
# omake can be used on non-OCaml projects (RHBZ#548536).
|
||||
Provides: omake
|
||||
|
||||
BuildRequires: ocaml >= 3.10.2-2
|
||||
BuildRequires: ocaml >= 3.09.2
|
||||
BuildRequires: ocaml-findlib-devel
|
||||
BuildRequires: gamin-devel
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: ncurses-devel
|
||||
BuildRequires: hevea
|
||||
#BuildRequires: hevea
|
||||
BuildRequires: chrpath
|
||||
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_requires /usr/lib/rpm/ocaml-find-requires.sh
|
||||
%define __find_provides /usr/lib/rpm/ocaml-find-provides.sh
|
||||
|
||||
|
||||
%description
|
||||
OMake is a build system designed for scalability and portability. It
|
||||
@ -41,206 +49,44 @@ features many additional enhancements, including the following.
|
||||
|
||||
%prep
|
||||
%setup -q -n omake-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
|
||||
%build
|
||||
# In latest omake it seems to be impossible to set LIBDIR, so we will
|
||||
# always install the dependent files in /usr/lib/omake. XXX
|
||||
./configure -prefix %{_prefix}
|
||||
make all
|
||||
make all \
|
||||
PREFIX=%{_prefix} MANDIR=%{_mandir} BINDIR=%{_bindir} LIBDIR=%{_libdir}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install \
|
||||
INSTALL_ROOT=$RPM_BUILD_ROOT
|
||||
INSTALL_ROOT=$RPM_BUILD_ROOT \
|
||||
PREFIX=%{_prefix} MANDIR=%{_mandir} BINDIR=%{_bindir} LIBDIR=%{_libdir}
|
||||
|
||||
chmod 0755 $RPM_BUILD_ROOT%{_bindir}/*
|
||||
strip $RPM_BUILD_ROOT%{_bindir}/omake
|
||||
strip $RPM_BUILD_ROOT%{_bindir}/cvs_realclean
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%files
|
||||
%doc CONTRIBUTORS.org LICENSE LICENSE.OMake README.md
|
||||
%doc ChangeLog
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE LICENSE.OMake ocamldep/LICENSE.ocamldep-omake
|
||||
%doc CHANGELOG.txt
|
||||
%doc doc/txt/omake-doc.txt doc/ps/omake-doc.pdf doc/html/
|
||||
%{_prefix}/lib/omake/
|
||||
%{_libdir}/omake/
|
||||
%{_bindir}/ocamldep-omake
|
||||
%{_bindir}/omake
|
||||
%{_bindir}/osh
|
||||
%{_bindir}/cvs_realclean
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-12
|
||||
- OCaml 4.08.0 (final) rebuild.
|
||||
|
||||
* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-11
|
||||
- OCaml 4.08.0 (beta 3) rebuild.
|
||||
|
||||
* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.10.3-10
|
||||
- Rebuild for readline 8.0
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-8
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-7
|
||||
- OCaml 4.07.0 (final) rebuild.
|
||||
|
||||
* Wed Jun 20 2018 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-6
|
||||
- OCaml 4.07.0-rc1 rebuild.
|
||||
|
||||
* Thu May 17 2018 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-5
|
||||
- Re-add the dist tag, dropped accidentally in 0.10.3 rebase.
|
||||
|
||||
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Nov 22 2017 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-3
|
||||
- Abandon attempts to set LIBDIR, just use /usr/lib instead.
|
||||
|
||||
* Wed Nov 08 2017 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-2
|
||||
- OCaml 4.06.0 rebuild.
|
||||
|
||||
* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 0.10.3-1
|
||||
- New upstream version 0.10.3.
|
||||
- New upstream website (camlcity.org) and maintainer.
|
||||
- Modernize the spec file.
|
||||
- Remove old patches which no longer apply.
|
||||
- Reenable hevea dependency.
|
||||
- Remove "cvs_realclean".
|
||||
|
||||
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.29
|
||||
- OCaml 4.05.0 rebuild.
|
||||
|
||||
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8.6-0.rc1.28
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8.6-0.rc1.27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.26
|
||||
- OCaml 4.04.2 rebuild.
|
||||
|
||||
* Fri May 12 2017 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.25
|
||||
- OCaml 4.04.1 rebuild.
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8.6-0.rc1.24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Fri Nov 04 2016 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.23
|
||||
- Rebuild for OCaml 4.04.0.
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8.6-0.rc1.22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Tue Jan 05 2016 Richard Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.21
|
||||
- Use global instead of define.
|
||||
|
||||
* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.20
|
||||
- OCaml 4.02.3 rebuild.
|
||||
|
||||
* Wed Jul 22 2015 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.19
|
||||
- s/390x: Disable stripping on bytecode-only platforms.
|
||||
|
||||
* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.18
|
||||
- ocaml-4.02.2 final rebuild.
|
||||
|
||||
* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.17
|
||||
- ocaml-4.02.2 rebuild.
|
||||
|
||||
* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.16
|
||||
- ocaml-4.02.1 rebuild.
|
||||
|
||||
* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.15
|
||||
- ocaml-4.02.0 final rebuild.
|
||||
|
||||
* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.14
|
||||
- ocaml-4.02.0+rc1 rebuild.
|
||||
|
||||
* Mon Aug 18 2014 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.13
|
||||
- Kill -warn-error option that caused failure to build on OCaml 4.02.
|
||||
|
||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.6-0.rc1.12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Aug 09 2014 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.11
|
||||
- ocaml-4.02.0-0.8.git10e45753.fc22 rebuild.
|
||||
|
||||
* Mon Jul 21 2014 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.10
|
||||
- OCaml 4.02.0 beta rebuild.
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.6-0.rc1.9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Thu Sep 19 2013 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.8
|
||||
- OCaml 4.01.0 rebuild.
|
||||
- Modernize the spec file.
|
||||
- Enable debuginfo.
|
||||
- Add patch to remove more warnings.
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.6-0.rc1.7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.6-0.rc1.6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Fri Aug 10 2012 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.4
|
||||
- Change Debian patch to disable all compile warnings.
|
||||
|
||||
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.6-0.rc1.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sun Jun 10 2012 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1.3
|
||||
- Rebuild for OCaml 4.00.0.
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.6-0.rc1.2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.6-0.rc1.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Jan 5 2011 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.6-0.rc1
|
||||
- New upstream version 0.9.8.6-0.rc1.
|
||||
- Remove patches - all are upstream.
|
||||
- Add patch to disable new warning in OCaml 3.12 (by Stephane Glondu).
|
||||
- No separate omake-ocamldep program.
|
||||
|
||||
* Tue Jan 5 2010 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-12
|
||||
- Use upstream RPM 4.8 OCaml dependency generator.
|
||||
|
||||
* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-11
|
||||
- Rebuild for OCaml 3.11.2.
|
||||
|
||||
* Thu Dec 17 2009 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-10
|
||||
- Add 'Provides: omake' (RHBZ#548536).
|
||||
- Remove OCaml from the summary, since omake is not an OCaml-specific tool.
|
||||
|
||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.5-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Sat May 23 2009 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-8
|
||||
- Rebuild for OCaml 3.11.1
|
||||
|
||||
* Thu Apr 16 2009 S390x secondary arch maintainer <fedora-s390x@lists.fedoraproject.org>
|
||||
- ExcludeArch sparc64, s390, s390x as we don't have OCaml on those archs
|
||||
(added sparc64 per request from the sparc maintainer)
|
||||
|
||||
* Tue Mar 3 2009 Caolán McNamara <caolanm@redhat.com> - 0.9.8.5-7
|
||||
- patch src/libmojave-external/cutil/lm_printf.c rather than
|
||||
src/clib/lm_printf.c as the latter is created as a link of the
|
||||
former during the build
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8.5-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Fri Feb 6 2009 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-5
|
||||
- Patch for "attempt to free a non-heap object" (Jakub Jelinek).
|
||||
|
||||
* Fri Dec 5 2008 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-4
|
||||
- Rebuild for OCaml 3.11.0.
|
||||
|
||||
* Fri May 16 2008 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-3
|
||||
- Rebuild with OCaml 3.10.2-2 (fixes bz 445545).
|
||||
* Fri Apr 25 2008 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-3
|
||||
- ExcludeArch ppc64 (just for F-8).
|
||||
|
||||
* Wed Apr 23 2008 Richard W.M. Jones <rjones@redhat.com> - 0.9.8.5-2
|
||||
- Added stdin/stdout fix patch from Debian.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user