Update for OCaml 3.12.0.

This commit is contained in:
Richard W.M. Jones 2011-01-06 08:50:37 +00:00
parent cd8f497aa3
commit c97e0e397c
4 changed files with 10 additions and 20 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
calendar-2.01.1.tar.gz calendar-2.01.1.tar.gz
/calendar-2.03.tar.gz

View File

@ -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

View File

@ -2,14 +2,14 @@
%global debug_package %{nil} %global debug_package %{nil}
Name: ocaml-calendar Name: ocaml-calendar
Version: 2.01.1 Version: 2.03
Release: 5%{?dist} Release: 1%{?dist}
Summary: Objective Caml library for managing dates and times Summary: Objective Caml library for managing dates and times
Group: Development/Libraries Group: Development/Libraries
License: LGPLv2 License: LGPLv2
URL: http://calendar.forge.ocamlcore.org/ URL: http://calendar.forge.ocamlcore.org/
Source0: http://forge.ocamlcore.org/frs/download.php/173/calendar-%{version}.tar.gz Source0: http://forge.ocamlcore.org/frs/download.php/427/calendar-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExcludeArch: sparc64 s390 s390x ExcludeArch: sparc64 s390 s390x
@ -17,8 +17,6 @@ BuildRequires: ocaml >= 3.10.1
BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc BuildRequires: ocaml-findlib-devel, ocaml-ocamldoc
BuildRequires: gawk BuildRequires: gawk
Patch0: ocaml-calendar-2.01.1-META.patch
# Ignore all generated modules *except* CalendarLib, since everything # Ignore all generated modules *except* CalendarLib, since everything
# now appears in that namespace. # 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_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
@ -42,7 +40,6 @@ developing applications that use %{name}.
%prep %prep
%setup -q -n calendar-%{version} %setup -q -n calendar-%{version}
%patch0 -p1
%build %build
@ -86,6 +83,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* 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 * Tue Jan 12 2010 Richard W.M. Jones <rjones@redhat.com> - 2.01.1-5
- Replace %%define with %%global. - Replace %%define with %%global.
- Use upstream RPM 4.8 OCaml dependency generator. - Use upstream RPM 4.8 OCaml dependency generator.

View File

@ -1 +1 @@
a30974a97f718688198c5a5dc6235cff calendar-2.01.1.tar.gz c594605758ff685ca84ea42c55a5aba8 calendar-2.03.tar.gz