OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.cvsignore

@@ -1 +0,0 @@
-calendar-2.01.1.tar.gz

.gitignore

@@ -0,0 +1,5 @@
+calendar-2.01.1.tar.gz
+/calendar-2.03.tar.gz
+/calendar-2.03.1.tar.gz
+/calendar-2.03.2.tar.gz
+/calendar-2.04.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: ocaml-calendar
-# $Id: Makefile,v 1.1 2007/08/08 21:03:03 kevin Exp $
-NAME := ocaml-calendar
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

calendar-2.03.2-enable-debug.patch

@@ -0,0 +1,11 @@
+--- calendar-2.03.2/Makefile.in.old	2013-09-14 16:15:43.760253519 +0100
++++ calendar-2.03.2/Makefile.in	2013-09-14 16:16:03.233279962 +0100
+@@ -86,7 +86,7 @@
+ 
+ CAMLIBS	= $(addprefix -I , $(DIRS))
+ 
+-CAMLFLAGS= $(CAMLIBS)
++CAMLFLAGS= -g $(CAMLIBS)
+ BYTEFLAGS= $(CAMLFLAGS)
+ LINK_OPTFLAGS = $(CAMLFLAGS) -noassert
+ OPTFLAGS = $(LINK_OPTFLAGS) -for-pack CalendarLib

import.log

@@ -1 +0,0 @@
-ocaml-calendar-2_0_4-1_fc10:HEAD:ocaml-calendar-2.0.4-1.fc10.src.rpm:1215680482

ocaml-calendar-2.01.1-META.patch

@@ -1,13 +0,0 @@
---- calendar-2.01.1/Makefile.in.orig	2009-10-08 14:28:50.633555407 +0100
-+++ calendar-2.01.1/Makefile.in	2009-10-08 14:29:07.767560374 +0100
-@@ -114,8 +114,8 @@
- META: Makefile
- 	echo "description = \"$(NAME) library\"" > $@
- 	echo "version = \"$(VERSION)\"" >> $@
--	echo "archive(byte) = \"$(NAMELIB).cmo $(NAMELIB).cma\"" >> $@
--	echo "archive(native) = \"$(NAMELIB).cmx $(NAMELIB).cmxa\"" >> $@
-+	echo "archive(byte) = \"$(NAMELIB).cma\"" >> $@
-+	echo "archive(native) = \"$(NAMELIB).cmxa\"" >> $@
- 	echo "requires = \"unix str\"" >> $@
- 
- # Generic rules

ocaml-calendar.spec

@@ -1,24 +1,24 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%ifnarch %{ocaml_native_compiler}
 %global debug_package %{nil}
+%endif
 
 Name:           ocaml-calendar
-Version:        2.01.1
+Version:        2.04
-Release:        5%{?dist}
+Release:        37%{?dist}
 Summary:        Objective Caml library for managing dates and times
-
-Group:          Development/Libraries
 License:        LGPLv2
+
 URL:            http://calendar.forge.ocamlcore.org/
-Source0:        http://forge.ocamlcore.org/frs/download.php/173/calendar-%{version}.tar.gz
+Source0:        https://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExcludeArch:    sparc64 s390 s390x
 
-BuildRequires:  ocaml >= 3.10.1
+Patch1:         calendar-2.03.2-enable-debug.patch
-BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
+
+BuildRequires: make
+BuildRequires:  ocaml >= 4.00.1
+BuildRequires:  ocaml-findlib-devel >= 1.3.3-3
+BuildRequires:  ocaml-ocamldoc
 BuildRequires:  gawk
 
-Patch0:         ocaml-calendar-2.01.1-META.patch
-
 # Ignore all generated modules *except* CalendarLib, since everything
 # now appears in that namespace.
 %global __ocaml_requires_opts -i Calendar_builder -i Calendar_sig -i Date -i Date_sig -i Fcalendar -i Ftime -i Period -i Printer -i Time -i Time_sig -i Time_Zone -i Utils -i Version
@@ -31,7 +31,6 @@ Objective Caml library for managing dates and times.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -42,7 +41,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n calendar-%{version}
-%patch0 -p1
+%patch1 -p1
 
 
 %build
@@ -55,37 +54,207 @@ iconv -f iso-8859-1 -t utf-8 < TODO.old > TODO
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 export DESTDIR=$RPM_BUILD_ROOT
 export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
 mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
 make install
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files
-%defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING
 %{_libdir}/ocaml/calendar
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %exclude %{_libdir}/ocaml/calendar/*.cmx
 %endif
 %exclude %{_libdir}/ocaml/calendar/*.mli
 
 
 %files devel
-%defattr(-,root,root,-)
 %doc CHANGES README TODO LGPL COPYING calendarFAQ-2.6.txt doc/*
-%if %opt
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/calendar/*.cmx
 %endif
 %{_libdir}/ocaml/calendar/*.mli
 
 
 %changelog
+* Mon Mar  1 14:31:55 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 2.04-37
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-36
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-35
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-34
+- OCaml 4.11.0 rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-33
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-32
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-31
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-30
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-29
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-28
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-26
+- OCaml 4.10.0+beta1 rebuild.
+
+* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 2.04-25
+- OCaml 4.09.0 for riscv64
+
+* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 2.04-24
+- OCaml 4.09.0 (final) rebuild.
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 2.04-23
+- OCaml 4.08.1 (final) rebuild.
+
+* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 2.04-22
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Jun 27 2019 Richard W.M. Jones <rjones@redhat.com> - 2.04-20
+- OCaml 4.08.0 (final) rebuild.
+
+* Mon Apr 29 2019 Richard W.M. Jones <rjones@redhat.com> - 2.04-19
+- OCaml 4.08.0 (beta 3) rebuild.
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-18
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 2.04-16
+- OCaml 4.07.0 (final) rebuild.
+
+* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 2.04-15
+- OCaml 4.07.0-rc1 rebuild.
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 2.04-13
+- OCaml 4.06.0 rebuild.
+
+* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 2.04-12
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 2.04-9
+- OCaml 4.04.2 rebuild.
+
+* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 2.04-8
+- Rebuild for OCaml 4.04.1.
+
+* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Nov 09 2016 Dan Horák <dan@danny.cz> - 2.04-6
+- rebuild for s390x codegen bug
+
+* Fri Nov 04 2016 Richard W.M. Jones <rjones@redhat.com> - 2.04-5
+- Rebuild for OCaml 4.04.0.
+
+* Wed Oct 19 2016 Dan Horák <dan[at]danny.cz> - 2.04-4
+- disable debuginfo subpackage on interpreted builds
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.04-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jul 28 2015 Richard W.M. Jones <rjones@redhat.com> - 2.04-2
+- OCaml 4.02.3 rebuild.
+
+* Tue Jul 21 2015 Richard W.M. Jones <rjones@redhat.com> - 2.04-1
+- New upstream version 2.04.
+- Enable bytecode compilation.
+
+* Wed Jun 24 2015 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-14
+- Bump release and rebuild.
+
+* Wed Jun 17 2015 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-13
+- ocaml-4.02.2 rebuild.
+
+* Mon Feb 16 2015 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-12
+- ocaml-4.02.1 rebuild.
+
+* Sat Aug 30 2014 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-11
+- ocaml-4.02.0 final rebuild.
+
+* Sat Aug 23 2014 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-10
+- Rebuild for ocaml-4.02.0+rc1.
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.03.2-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Fri Aug 01 2014 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-8
+- ocaml-4.02.0-0.8.git10e45753.fc22 build.
+
+* Thu Jul 17 2014 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-7
+- Rebuild for OCaml 4.02.0 beta.
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.03.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sat Sep 14 2013 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-5
+- Rebuild for OCaml 4.01.0.
+- Enable debuginfo.
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.03.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.03.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Nov 27 2012 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-2
+- BR >= OCaml 4.00.1 so we can't be built against the wrong OCaml.
+
+* Mon Oct 29 2012 Richard W.M. Jones <rjones@redhat.com> - 2.03.2-1
+- New upstream version 2.03.2.
+- Rebuild for OCaml 4.00.1.
+- Remove upstream patch.
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.03.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Sat Jun 09 2012 Richard W.M. Jones <rjones@redhat.com> - 2.03.1-4
+- Rebuild for OCaml 4.00.0.
+
+* Sat Apr 28 2012 Richard W.M. Jones <rjones@redhat.com> - 2.03.1-2
+- Bump and rebuild against new OCaml compiler in ARM.
+
+* Fri Jan  6 2012 Richard W.M. Jones <rjones@redhat.com> - 2.03.1-1
+- New upstream version 2.03.1.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.03-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Thu Jan  6 2011 Richard W.M. Jones <rjones@redhat.com> - 2.03-1
+- New upstream version 2.03.
+- Rebuild for OCaml 3.12.0.
+- Remove META file patch, now upstream.
+
 * Tue Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 2.01.1-5
 - Replace %%define with %%global.
 - Use upstream RPM 4.8 OCaml dependency generator.

sources

@@ -1 +1 @@
-a30974a97f718688198c5a5dc6235cff  calendar-2.01.1.tar.gz
+625b4f32c9ff447501868fa1c44f4f4f  calendar-2.04.tar.gz