dist-git conversion

#2781)

.gitignore

@@ -1,5 +1 @@
-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
+calendar-2.0.4.tar.gz

calendar-2.03.2-enable-debug.patch

@@ -1,11 +0,0 @@
---- 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

ocaml-calendar.spec

@@ -1,29 +1,27 @@
-%ifnarch %{ocaml_native_compiler}
-%global debug_package %{nil}
-%endif
+%define opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
+%define debug_package %{nil}
 
 Name:           ocaml-calendar
-Version:        2.04
-Release:        37%{?dist}
+Version:        2.0.4
+Release:        7%{?dist}
 Summary:        Objective Caml library for managing dates and times
+
+Group:          Development/Libraries
 License:        LGPLv2
-
 URL:            http://calendar.forge.ocamlcore.org/
-Source0:        https://forge.ocamlcore.org/frs/download.php/1481/calendar-2.04.tar.gz
+Source0:        http://www.lri.fr/~signoles/prog/calendar/calendar-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+ExcludeArch:    sparc64 s390 s390x
 
-Patch1:         calendar-2.03.2-enable-debug.patch
-
-BuildRequires: make
-BuildRequires:  ocaml >= 4.00.1
-BuildRequires:  ocaml-findlib-devel >= 1.3.3-3
-BuildRequires:  ocaml-ocamldoc
+BuildRequires:  ocaml >= 3.10.1
+BuildRequires:  ocaml-findlib-devel, ocaml-ocamldoc
 BuildRequires:  gawk
 
 # 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
-%global __ocaml_provides_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
-
+%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 -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
 
 %description
 Objective Caml library for managing dates and times.
@@ -31,6 +29,7 @@ Objective Caml library for managing dates and times.
 
 %package        devel
 Summary:        Development files for %{name}
+Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 
@@ -41,7 +40,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n calendar-%{version}
-%patch1 -p1
 
 
 %build
@@ -54,219 +52,37 @@ 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
-%ifarch %{ocaml_native_compiler}
+%if %opt
 %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/*
-%ifarch %{ocaml_native_compiler}
+%if %opt
 %{_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.
-- Suppress bogus requires as well as provides.
-
-* Wed Dec 30 2009 Richard W.M. Jones <rjones@redhat.com> - 2.01.1-3
-- Rebuild for OCaml 3.11.2.
-
-* Thu Oct  8 2009 Richard W.M. Jones <rjones@redhat.com> - 2.01.1-2
-- New upstream release 2.01.1.
-- Patch META file so it doesn't include the library twice.
-
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.4-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sources

@@ -1 +1 @@
-625b4f32c9ff447501868fa1c44f4f4f  calendar-2.04.tar.gz
+f460b1f0544d6c29b9d6517ef8a4b282  calendar-2.0.4.tar.gz