The package rpms/ocaml-react.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocaml-react.git/commit/?id=9903b4....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 9903b4165bc0d6af37d369430699d712b97ca09b
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Sep 1 09:38:50 2020 -0600
Version 1.2.1.
- License is now ISC.
- Build with topkg.
- Drop upstreamed safe string patch.
diff --git a/.gitignore b/.gitignore
index 3718820..8fa154a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/react-1.2.0.tbz
+/react-*.tbz
diff --git a/ocaml-react.spec b/ocaml-react.spec
index 1d7e904..4c8e2ea 100644
--- a/ocaml-react.spec
+++ b/ocaml-react.spec
@@ -1,32 +1,28 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
Name: ocaml-react
-Version: 1.2.0
-Release: 33%{?dist}
+Version: 1.2.1
+Release: 1%{?dist}
Summary: OCaml framework for Functional Reactive Programming (FRP)
-License: BSD
+License: ISC
URL:
http://erratique.ch/software/react
Source0:
http://erratique.ch/software/react/releases/react-%{version}.tbz
-Source1: react-LICENSE
-
-Patch1: react-1.2.0-safe-string-fix.patch
-BuildRequires: ocaml >= 3.10.0
+BuildRequires: ocaml >= 4.01.0
BuildRequires: ocaml-ocamlbuild
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc
+BuildRequires: ocaml-topkg-devel >= 0.9.0
%description
React is an OCaml module for functional reactive programming (FRP). It
-provides support to program with time varying values : applicative
+provides support to program with time varying values : declarative
events and signals. React doesn't define any primitive event or
-signal, this lets the client chooses the concrete timeline.
+signal; it lets the client choose the concrete timeline.
-React is made of a single, independent, module and distributed under
-the new BSD license.
+React is made of a single, independent module and distributed under
+the ISC license.
Given an absolute notion of time Rtime helps you to manage a timeline
and provides time stamp events, delayed events and delayed signals.
@@ -43,34 +39,22 @@ developing applications that use %{name}.
%prep
-%setup -q -n react-%{version}
-%autopatch -p1
-cp -p %{SOURCE1} LICENSE
+%autosetup -n react-%{version}
+
# require debug info
echo $'\ntrue: debug' >> _tags
%build
-ocaml pkg/build.ml \
-%if 0%{?opt}
- native=true \
- native-dynlink=true
-%else
- native=false \
- native-dynlink=false
-%endif
-
-%if %opt
-# Build the tests.
-ocamlbuild -use-ocamlfind test/tests.otarget
-%endif
+ocaml pkg/pkg.ml build --tests true
%install
mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/react
for f in \
pkg/META \
-%if 0%{opt}
+ opam \
+%ifarch %{ocaml_native_compiler}
src/*.cmx \
%endif
src/*.{a,cma,cmi,mli,cmxa,cmxs}
@@ -80,31 +64,38 @@ done
%check
-%if %opt
-./_build/test/test.native
-#./_build/test/clock.native
-#./_build/test/breakout.native
-%endif
+ocaml pkg/pkg.ml test
%files
-%doc LICENSE
-%{_libdir}/ocaml/react
-%if %opt
-%exclude %{_libdir}/ocaml/react/*.cmx
+%license LICENSE.md
+%dir %{_libdir}/ocaml/react/
+%{_libdir}/ocaml/react/*.cma
+%{_libdir}/ocaml/react/*.cmi
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/react/*.cmxs
%endif
-%exclude %{_libdir}/ocaml/react/*.mli
%files devel
%doc CHANGES.md README.md
-%if %opt
+%ifarch %{ocaml_native_compiler}
+%{_libdir}/ocaml/react/*.a
%{_libdir}/ocaml/react/*.cmx
+%{_libdir}/ocaml/react/*.cmxa
%endif
%{_libdir}/ocaml/react/*.mli
+%{_libdir}/ocaml/react/META
+%{_libdir}/ocaml/react/opam
%changelog
+* Tue Sep 1 2020 Jerry James <loganjerry(a)gmail.com> - 1.2.1-1
+- Version 1.2.1
+- License is now ISC
+- Build with topkg
+- Drop upstreamed safe string patch
+
* Fri Aug 21 2020 Richard W.M. Jones <rjones(a)redhat.com> - 1.2.0-33
- OCaml 4.11.0 rebuild
diff --git a/react-1.2.0-safe-string-fix.patch b/react-1.2.0-safe-string-fix.patch
deleted file mode 100644
index 99bf2b6..0000000
--- a/react-1.2.0-safe-string-fix.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- react-1.2.0.old/test/breakout.ml 2014-08-24 00:03:34.000000000 +0100
-+++ react-1.2.0/test/breakout.ml 2017-11-17 15:04:10.473486674 +0000
-@@ -136,9 +136,9 @@
- let time, send_time = E.create ()
- let key, send_key = E.create ()
- let gather () = (* updates primitive events. *)
-- let c = " " in
-+ let c = Bytes.of_string " " in
- let i = Unix.stdin in
-- let input_char i = ignore (Unix.read i c 0 1); c.[0] in
-+ let input_char i = ignore (Unix.read i c 0 1); Bytes.get c 0 in
- let dt = 0.1 in
- while true do
- if Unix.select [i] [] [] dt = ([i], [], []) then send_key (input_char i);
diff --git a/react-LICENSE b/react-LICENSE
deleted file mode 100644
index e46e414..0000000
--- a/react-LICENSE
+++ /dev/null
@@ -1,32 +0,0 @@
-(*----------------------------------------------------------------------------
- Copyright (c) 2009, Daniel C. Bünzli
- All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the
- distribution.
-
- 3. Neither the name of the Daniel C. Bünzli nor the names of
- contributors may be used to endorse or promote products derived
- from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- ----------------------------------------------------------------------------*)
diff --git a/sources b/sources
index c92e4ec..5854eab 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f071a1308b6cad131c55cda8677823c3 react-1.2.0.tbz
+SHA512 (react-1.2.1.tbz) =
60f8788cc820e2be5303caedc80a377c8e5deab170d0eb9df71ff99d6fc57f31357824522f973c6e0d6b3979b58272e7f90b829474a494b94565279c53e8fbb1