Architecture specific change in rpms/ocaml-lambda-term.git
by githook-noreply＠fedoraproject.org
The package rpms/ocaml-lambda-term.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-lambda-term.git/commit/?id=....
Change:
-%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit ee6a87641511518bc83e863bbef5fc24d1789320
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Aug 18 13:33:03 2022 -0600
Bump and rebuild
diff --git a/ocaml-lambda-term.spec b/ocaml-lambda-term.spec
index 06bce1f..989b1d9 100644
--- a/ocaml-lambda-term.spec
+++ b/ocaml-lambda-term.spec
@@ -2,7 +2,7 @@
Name: ocaml-lambda-term
Version: 3.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Terminal manipulation library for OCaml
License: BSD-3-Clause
@@ -77,6 +77,9 @@ sed -e 's,%{_datadir}/lambda-termrc,%{_datadir}/lambda-term,' \
%license LICENSE
%changelog
+* Thu Aug 18 2022 Jerry James <loganjerry(a)gmail.com> - 3.2.0-2
+- Bump and rebuild
+
* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 3.2.0-1
- Version 3.2.0
- Convert license to SPDX
commit 20dce4fb16244ec27078145e874c9fa6446d2e75
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Aug 9 10:28:23 2022 -0600
Version 3.2.0
- Convert license to SPDX
- Use new OCaml macros
diff --git a/ocaml-lambda-term.spec b/ocaml-lambda-term.spec
index 7983bba..06bce1f 100644
--- a/ocaml-lambda-term.spec
+++ b/ocaml-lambda-term.spec
@@ -1,17 +1,15 @@
%undefine _package_note_flags
+
Name: ocaml-lambda-term
-Version: 3.1.0
-Release: 15%{?dist}
+Version: 3.2.0
+Release: 1%{?dist}
Summary: Terminal manipulation library for OCaml
-%global libname %(echo %{name} | sed -e 's/^ocaml-//')
-
-License: BSD
+License: BSD-3-Clause
URL: https://github.com/ocaml-community/lambda-term
-Source0: https://github.com/ocaml-community/lambda-term/archive/%{version}/%{libna...
+Source0: %{url}/archive/%{version}/lambda-term-%{version}.tar.gz
-BuildRequires: make
-BuildRequires: ocaml >= 4.02.3
+BuildRequires: ocaml >= 4.08.0
BuildRequires: ocaml-camomile-devel >= 1.0.1
BuildRequires: ocaml-lwt-devel >= 4.0.0
BuildRequires: ocaml-lwt-react-devel
@@ -31,18 +29,16 @@ The main objective of lambda-term is to provide a higher level functional
interface to terminal manipulation than, for example, ncurses, by providing
a native OCaml interface instead of bindings to a C library.
-Lambda-term integrates with zed to provide text edition facilities in
+Lambda-term integrates with zed to provide text editing facilities in
console applications.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: ocaml-camomile-devel%{?_isa}
Requires: ocaml-lwt-devel%{?_isa}
Requires: ocaml-lwt-log-devel%{?_isa}
Requires: ocaml-lwt-react-devel%{?_isa}
Requires: ocaml-mew-vi-devel%{?_isa}
-Requires: ocaml-react-devel%{?_isa}
Requires: ocaml-zed-devel%{?_isa}
%description devel
@@ -50,13 +46,10 @@ The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
%prep
-%autosetup -n %{libname}-%{version}
+%autosetup -n lambda-term-%{version}
%build
-dune build \
- --verbose \
- --for-release-of-packages=%{libname} \
- %{?_smp_mflags}
+%dune_build
# Relink the stublib with RPM_LD_FLAGS
cd _build/default/src
@@ -65,50 +58,30 @@ ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -o lambda_term_stubs \
cd -
%install
-dune install \
- --verbose \
- --for-release-of-packages=%{libname} \
- --prefix=%{_prefix} \
- --libdir=%{_libdir}/ocaml \
- --mandir=%{_mandir} \
- --destdir=%{buildroot}
-
-mkdir -p %{buildroot}%{_mandir}/man{1,5} \
- %{buildroot}%{_datadir}/lambda-term \
- %{buildroot}%{_docdir}
-mv %{buildroot}%{_prefix}/doc/lambda-term %{buildroot}%{_docdir}
+%dune_install
+
+mkdir -p %{buildroot}%{_datadir}/lambda-term
mv %{buildroot}%{_datadir}/lambda-term{rc,-inputrc} %{buildroot}%{_datadir}/lambda-term
+sed -e 's,%{_datadir}/lambda-termrc,%{_datadir}/lambda-term,' \
+ -e '\,%{_datadir}/lambda-term-inputrc,d' \
+ -i .ofiles
%check
-make test
+%dune_check
-%files
+%files -f .ofiles
%license LICENSE
-%doc %{_docdir}/lambda-term
-%{_libdir}/ocaml/%{libname}
-%{_bindir}/lambda-term-actions
-%{_mandir}/man1/lambda-term-actions.1*
-%{_mandir}/man5/lambda-term-inputrc.5*
-%{_datadir}/lambda-term
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/*/*.a
-%exclude %{_libdir}/ocaml/*/*.cmxa
-%exclude %{_libdir}/ocaml/*/*.cmx
-%endif
-%exclude %{_libdir}/ocaml/*/*.mli
-%{_libdir}/ocaml/stublibs/*.so
-
-%files devel
-%license LICENSE
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmxa
-%{_libdir}/ocaml/*/*.cmx
-%endif
-%{_libdir}/ocaml/*/*.mli
+%doc CHANGES.md README.md
+%files devel -f .ofiles-devel
+%license LICENSE
%changelog
+* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 3.2.0-1
+- Version 3.2.0
+- Convert license to SPDX
+- Use new OCaml macros
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 3.1.0-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index d6bebad..eec2aac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lambda-term-3.1.0.tar.gz) = b1601749214747504a248392ec81ce20f4cd44bddbf14424e40725e6d506d925320fc7ef7f4ce58e876769d858c5e3882664e27ca33a9dc74d29a4a22ed0d705
+SHA512 (lambda-term-3.2.0.tar.gz) = b161341268450466da4aa42cb9b78960797ef61384ba9a11c08874286155dc5e0db4d68d313a714003ebc73c63e19bec17e5d39c57a8c32db0f0f7844d1dce6e
1 year, 9 months
Architecture specific change in rpms/ocaml-zmq.git
by githook-noreply＠fedoraproject.org
The package rpms/ocaml-zmq.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-zmq.git/commit/?id=efd44eba....
Change:
-%ifnarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit efd44eba6abf3d9c6e014fb2b39762ad1f65dd41
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Aug 18 12:04:17 2022 -0600
Rebuild for ocaml-lwt 5.6.1.
diff --git a/ocaml-zmq.spec b/ocaml-zmq.spec
index 2b55be4..7170b87 100644
--- a/ocaml-zmq.spec
+++ b/ocaml-zmq.spec
@@ -1,12 +1,8 @@
%undefine _package_note_flags
-%ifnarch %{ocaml_native_compiler}
-%global debug_package %{nil}
-%endif
-
Name: ocaml-zmq
Version: 5.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: ZeroMQ bindings for OCaml
License: MIT
@@ -89,6 +85,9 @@ rm -fr %{buildroot}%{ocamldir}/zmq-async
%files lwt-devel -f .ofiles-zmq-lwt-devel
%changelog
+* Thu Aug 18 2022 Jerry James <loganjerry(a)gmail.com> - 5.1.5-4
+- Rebuild for ocaml-lwt 5.6.1
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
1 year, 9 months
Architecture specific change in rpms/ocaml-ounit.git
by githook-noreply＠fedoraproject.org
The package rpms/ocaml-ounit.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-ounit.git/commit/?id=ef0451....
Change:
-%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit e35d825006e89534a0f71e17b1da55df0d647e5c
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Aug 18 12:01:01 2022 -0600
Bump and rebuild
diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec
index 93a20e0..d71c62b 100644
--- a/ocaml-ounit.spec
+++ b/ocaml-ounit.spec
@@ -6,7 +6,7 @@
Name: ocaml-ounit
Version: 2.2.6
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Unit test framework for OCaml
License: MIT
@@ -108,6 +108,9 @@ files for developing applications that use %{name}-lwt.
%changelog
+* Thu Aug 18 2022 Jerry James <loganjerry(a)gmail.com> - 2.2.6-2
+- Bump and rebuild
+
* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 2.2.6-1
- Version 2.2.6
- Trim BRs
commit ef0451b2add74a698c5907cb5a09e8997dde4558
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Aug 9 10:56:07 2022 -0600
Version 2.2.6
- Trim BRs
- Give up on using odoc to generate documentation
- Use new OCaml macros
diff --git a/.gitignore b/.gitignore
index 00a90bc..cad0705 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ ounit-1.0.3.tar.gz
/ounit-2.0.8.tar.gz
/ounit-v2.2.2.tbz
/ounit-v2.2.4.tbz
+/ounit-2.2.6.tbz
diff --git a/0001-Remove-stdlib-shims.patch b/0001-Remove-stdlib-shims.patch
index 9426ef5..0513a64 100644
--- a/0001-Remove-stdlib-shims.patch
+++ b/0001-Remove-stdlib-shims.patch
@@ -1,39 +1,57 @@
From fec0a725231d5769b3d3454687d6b0e1bd6b5e58 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones(a)redhat.com>
Date: Tue, 5 May 2020 12:30:50 +0100
-Subject: [PATCH] Remove stdlib-shims.
+Subject: [PATCH] Remove stdlib-shims and seq.
-We neither need nor want the stdlib-shims package in Fedora. It is a
-forward compatibility package for older OCaml installations. Patch it
-out instead. Upstream does not want this patch until stdlib-shims is
-obsolete.
+We neither need nor want the stdlib-shims or seq packages in Fedora. They
+are forward compatibility package for older OCaml installations. Patch them
+out instead. Upstream does not want this patch until stdlib-shims and seq
+are obsolete.
---
ounit2.opam | 1 -
src/lib/ounit2/advanced/dune | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
-diff --git a/ounit2.opam b/ounit2.opam
-index d07d8ca..2ae6fe9 100644
---- a/ounit2.opam
-+++ b/ounit2.opam
-@@ -10,7 +10,6 @@ depends: [
+--- a/ounit2-lwt.opam 2022-02-08 11:14:15.000000000 -0700
++++ b/ounit2-lwt.opam 2022-02-19 14:34:26.474961756 -0700
+@@ -11,7 +11,6 @@ depends: [
+ "ocaml" {>= "4.04.0"}
+ "dune" {>= "1.11.0"}
+ "lwt"
+- "seq"
+ "ounit2" {= version}
+ ]
+ build: [
+--- a/ounit2.opam 2022-02-08 11:14:15.000000000 -0700
++++ b/ounit2.opam 2022-02-19 14:33:56.242934851 -0700
+@@ -12,8 +12,6 @@ depends: [
"dune" {>= "1.11.0"}
"base-bytes"
"base-unix"
+- "seq"
- "stdlib-shims"
]
build: [
["dune" "build" "-p" name "-j" jobs]
-diff --git a/src/lib/ounit2/advanced/dune b/src/lib/ounit2/advanced/dune
-index df87fe1..529a7e4 100644
---- a/src/lib/ounit2/advanced/dune
-+++ b/src/lib/ounit2/advanced/dune
+--- a/src/lib/ounit2/advanced/dune 2022-02-08 11:14:15.000000000 -0700
++++ b/src/lib/ounit2/advanced/dune 2022-02-19 14:35:12.907003067 -0700
@@ -7,4 +7,4 @@
(name oUnitAdvanced)
(public_name ounit2.advanced)
(wrapped false)
-- (libraries unix bytes stdlib-shims))
+- (libraries unix bytes seq stdlib-shims))
+ (libraries unix bytes))
+--- a/src/lib/ounit2/dune 2022-02-08 11:14:15.000000000 -0700
++++ b/src/lib/ounit2/dune 2022-02-19 14:34:58.818990532 -0700
+@@ -2,7 +2,7 @@
+ (name oUnit)
+ (public_name ounit2)
+ (wrapped false)
+- (libraries unix seq ounit2.advanced))
++ (libraries unix ounit2.advanced))
+
+ (documentation
+ (package ounit2)
--
2.29.2
diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec
index b1966bb..93a20e0 100644
--- a/ocaml-ounit.spec
+++ b/ocaml-ounit.spec
@@ -1,40 +1,24 @@
%undefine _package_note_flags
+
%ifnarch %{ocaml_native_compiler}
%global debug_package %{nil}
%endif
-%global srcname ounit
-
-# -doc subpackage requires ocaml-odoc which has rather a lot of
-# dependencies. This flag allows the non-essential subpackage to be
-# enabled.
-%bcond_with doc
-
-Name: ocaml-%{srcname}
-Version: 2.2.4
-Release: 9%{?dist}
+Name: ocaml-ounit
+Version: 2.2.6
+Release: 1%{?dist}
Summary: Unit test framework for OCaml
License: MIT
URL: https://github.com/gildor478/ounit
-Source0: %{url}/releases/download/v%{version}/%{srcname}-v%{version}.tbz
+Source0: %{url}/releases/download/v%{version}/ounit-%{version}.tbz
# Remove stdlib-shims downstream. Not needed in Fedora.
Patch0001: 0001-Remove-stdlib-shims.patch
-# https://github.com/gildor478/ounit/issues/85
-Patch0002: ounit-v2.2.4-remove-Thread-kill.patch
-
-BuildRequires: ocaml >= 4.02.3
+BuildRequires: ocaml >= 4.04.0
BuildRequires: ocaml-dune >= 1.11.0
-BuildRequires: ocaml-findlib
BuildRequires: ocaml-lwt-devel
-BuildRequires: ocaml-mmap-devel
-BuildRequires: ocaml-ocplib-endian-devel
-%if %{with doc}
-BuildRequires: ocaml-odoc
-%endif
-BuildRequires: ocaml-result-devel
# The ounit name is now just an alias for ounit2
Provides: %{name}2 = %{version}-%{release}
@@ -48,7 +32,7 @@ frameworks.
%package devel
Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: %{name}2-devel = %{version}-%{release}
@@ -59,7 +43,7 @@ developing applications that use %{name}.
%package lwt
Summary: Helper functions for building Lwt tests using OUnit
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
Provides: %{name}2-lwt = %{version}-%{release}
@@ -70,8 +54,8 @@ OUnit.
%package lwt-devel
Summary: Development files for %{name}-lwt
-Requires: %{name}-devel = %{version}-%{release}
-Requires: %{name}-lwt = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: %{name}-lwt%{?_isa} = %{version}-%{release}
Requires: ocaml-lwt-devel%{?_isa}
Provides: %{name}2-lwt-devel = %{version}-%{release}
@@ -81,125 +65,55 @@ The %{name}-lwt-devel package contains libraries and signature
files for developing applications that use %{name}-lwt.
-%package doc
-Summary: Documentation for %{name}
-BuildArch: noarch
-
-
-%description doc
-Documentation for %{name}.
-
-
%prep
-%autosetup -n %{srcname}-v%{version} -p1
+%autosetup -n ounit-%{version} -p1
%build
-dune build %{?_smp_mflags} --profile release
-%if %{with doc}
-dune build %{?_smp_mflags} @doc --profile release
-%endif
+%dune_build
%check
# Disabled on s390(x) because:
# https://github.com/gildor478/ounit/issues/18
%ifnarch s390 s390x
-dune runtest --profile release
+%dune_check
%endif
%install
-dune install --destdir=%{buildroot} --profile release
-
-%if %{with doc}
-# We do not want the dune markers
-find _build/default/_doc/_html -name .dune-keep -delete
-%endif
-
-# We install the documentation with the doc macro
-rm -fr %{buildroot}%{_prefix}/doc
+%dune_install -s
-%files
+%files -f .ofiles-ounit2
%doc CHANGES.md README.md
%license LICENSE.txt
-%dir %{_libdir}/ocaml/%{srcname}/
-%dir %{_libdir}/ocaml/%{srcname}2/
-%dir %{_libdir}/ocaml/%{srcname}2/advanced/
-%dir %{_libdir}/ocaml/%{srcname}2/threads/
-%{_libdir}/ocaml/%{srcname}2/threads/.private/
-%{_libdir}/ocaml/%{srcname}/META
-%{_libdir}/ocaml/%{srcname}2/META
-%{_libdir}/ocaml/%{srcname}2/*.cma
-%{_libdir}/ocaml/%{srcname}2/*.cmi
-%{_libdir}/ocaml/%{srcname}2/*/*.cma
-%{_libdir}/ocaml/%{srcname}2/*/*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}2/*.cmxs
-%{_libdir}/ocaml/%{srcname}2/*/*.cmxs
-%endif
+%dir %{ocamldir}/ounit/
+%{ocamldir}/ounit/META
-%files devel
-%{_libdir}/ocaml/%{srcname}/dune-package
-%{_libdir}/ocaml/%{srcname}/opam
-%{_libdir}/ocaml/%{srcname}2/dune-package
-%{_libdir}/ocaml/%{srcname}2/opam
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}2/*.a
-%{_libdir}/ocaml/%{srcname}2/*.cmx
-%{_libdir}/ocaml/%{srcname}2/*.cmxa
-%{_libdir}/ocaml/%{srcname}2/*/*.a
-%{_libdir}/ocaml/%{srcname}2/*/*.cmx
-%{_libdir}/ocaml/%{srcname}2/*/*.cmxa
-%endif
-%{_libdir}/ocaml/%{srcname}2/*.cmt
-%{_libdir}/ocaml/%{srcname}2/*.cmti
-%{_libdir}/ocaml/%{srcname}2/*.ml
-%{_libdir}/ocaml/%{srcname}2/*.mli
-%{_libdir}/ocaml/%{srcname}2/*/*.cmt
-%{_libdir}/ocaml/%{srcname}2/*/*.cmti
-%{_libdir}/ocaml/%{srcname}2/*/*.ml
-%{_libdir}/ocaml/%{srcname}2/*/*.mli
-
-
-%files lwt
-%dir %{_libdir}/ocaml/%{srcname}-lwt/
-%dir %{_libdir}/ocaml/%{srcname}2-lwt/
-%{_libdir}/ocaml/%{srcname}-lwt/META
-%{_libdir}/ocaml/%{srcname}2-lwt/META
-%{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cma
-%{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmxs
-%endif
+%files devel -f .ofiles-ounit2-devel
+%{ocamldir}/ounit/dune-package
+%{ocamldir}/ounit/opam
-%files lwt-devel
-%{_libdir}/ocaml/%{srcname}-lwt/dune-package
-%{_libdir}/ocaml/%{srcname}-lwt/opam
-%{_libdir}/ocaml/%{srcname}2-lwt/dune-package
-%{_libdir}/ocaml/%{srcname}2-lwt/opam
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.a
-%{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmx
-%{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmxa
-%endif
-%{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.cmt
-%{_libdir}/ocaml/%{srcname}2-lwt/oUnitLwt.ml
+%files lwt -f .ofiles-ounit2-lwt
+%dir %{ocamldir}/ounit-lwt/
+%{ocamldir}/ounit-lwt/META
-%if %{with doc}
-%files doc
-%doc _build/default/_doc/_html/
-%doc _build/default/_doc/_mlds/
-%doc _build/default/_doc/_odoc/
-%license LICENSE.txt
-%endif
+%files lwt-devel -f .ofiles-ounit2-lwt-devel
+%{ocamldir}/ounit-lwt/dune-package
+%{ocamldir}/ounit-lwt/opam
%changelog
+* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 2.2.6-1
+- Version 2.2.6
+- Trim BRs
+- Give up on using odoc to generate documentation
+- Use new OCaml macros
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.2.4-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/ounit-v2.2.4-remove-Thread-kill.patch b/ounit-v2.2.4-remove-Thread-kill.patch
deleted file mode 100644
index 1180fe4..0000000
--- a/ounit-v2.2.4-remove-Thread-kill.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ounit-v2.2.4.old/src/lib/ounit2/threads/oUnitRunnerThreads.ml 2021-03-01 21:14:43.656815139 +0000
-+++ ounit-v2.2.4/src/lib/ounit2/threads/oUnitRunnerThreads.ml 2020-12-19 23:59:04.000000000 +0000
-@@ -143,8 +143,8 @@
- Mutex.lock worker_finished_mutex
- done;
- if not !worker_finished then begin
-- (* This will fail... because probably not implemented. *)
-- Thread.kill thread;
-+ (* This will fail... because probably not implemented.
-+ Thread.kill thread; *)
- worker_finished := true;
- Condition.broadcast worker_finished_cond
- end;
diff --git a/sources b/sources
index a66c308..3005979 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ounit-v2.2.4.tbz) = d69dc501a360c31f7854322b5e2c2abcb1e43890737e1cc00c167ee104d5dee471b6b8d8186f8044b0482c91a8f15210a25d833a1e03ed7baabfba923815962f
+SHA512 (ounit-2.2.6.tbz) = d7cb36a1fe245d02afab606cd1ee755a178ee4cb18fbbfec1df32baa88fa90ef6c9a50d9fd5bde46c7fd9c481f2debe4bafac75c4e3bdfbdb63fc18b0ccce3cc
1 year, 9 months
Architecture specific change in rpms/ocaml-curl.git
by githook-noreply＠fedoraproject.org
The package rpms/ocaml-curl.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-curl.git/commit/?id=1aa148d....
Change:
-%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit a9e0f527f79b69a7dc29e10861b073fa31d0928d
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Aug 18 11:57:43 2022 -0600
Bump and rebuild.
diff --git a/ocaml-curl.spec b/ocaml-curl.spec
index b593e29..5381569 100644
--- a/ocaml-curl.spec
+++ b/ocaml-curl.spec
@@ -1,7 +1,7 @@
%undefine _package_note_flags
Name: ocaml-curl
Version: 0.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OCaml Curl library (ocurl)
License: MIT
@@ -81,6 +81,9 @@ make -C examples clean
%changelog
+* Tue Aug 18 2022 Jerry James <loganjerry(a)gmail.com> - 0.9.2-2
+- Bump and rebuild
+
* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 0.9.2-1
- Version 0.9.2
- New project URL
commit 1aa148d4bbfba7050bb2500eb0c3e75560f998ea
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Aug 9 10:18:36 2022 -0600
Version 0.9.2
- New project URL
- Use new OCaml macros
diff --git a/ocaml-curl.spec b/ocaml-curl.spec
index 453da2e..b593e29 100644
--- a/ocaml-curl.spec
+++ b/ocaml-curl.spec
@@ -1,24 +1,20 @@
%undefine _package_note_flags
Name: ocaml-curl
-Version: 0.9.1
-Release: 18%{?dist}
+Version: 0.9.2
+Release: 1%{?dist}
Summary: OCaml Curl library (ocurl)
License: MIT
-URL: http://ocurl.forge.ocamlcore.org/
+URL: https://ygrek.org/p/ocurl/
Source0: https://github.com/ygrek/ocurl/archive/%{version}/ocurl-%{version}.tar.gz
-BuildRequires: make
-BuildRequires: ocaml >= 4.02.0
+BuildRequires: make
+BuildRequires: ocaml >= 4.03.0
BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-findlib-devel
-BuildRequires: curl-devel >= 7.28.0
+BuildRequires: ocaml-findlib
+BuildRequires: libcurl-devel >= 7.28.0
BuildRequires: ocaml-lwt-ppx-devel
-BuildRequires: gawk
-
-# Explicitly require Curl (fixes #711261). Since ocaml-curl uses
-# -custom rather than ocamlmklib, automatic detection is infeasible.
-Requires: curl-devel >= 7.28.0
+BuildRequires: python3
%description
@@ -28,7 +24,9 @@ programming language Ocaml to the networking library libcurl.
%package devel
Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: ocaml-lwt-devel%{?_isa}
+Requires: libcurl-devel%{?_isa} >= 7.28.0
%description devel
@@ -40,7 +38,7 @@ developing applications that use %{name}.
%autosetup -p1 -n ocurl-%{version}
# Files in the archive have spurious +x mode.
-find -type f | xargs chmod 0644
+find . -type f -perm /0111 -exec chmod 0644 {} +
chmod 0755 configure install-sh
# Link with debuginfo and RPM_LD_FLAGS
@@ -63,39 +61,31 @@ make doc
%install
-export DESTDIR=%buildroot
-export OCAMLFIND_DESTDIR=%buildroot%{_libdir}/ocaml
+export OCAMLFIND_DESTDIR=%buildroot%{ocamldir}
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
-make install
+%make_install
+cp -p opam %{buildroot}%{ocamldir}/curl
# Make clean in the examples dir so our docs don't contain binaries.
make -C examples clean
+%ocaml_files
+
-%files
+%files -f .ofiles
%license COPYING
-%{_libdir}/ocaml/curl
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/curl/*.a
-%exclude %{_libdir}/ocaml/curl/*.cmx
-%exclude %{_libdir}/ocaml/curl/*.cmxa
-%endif
-%exclude %{_libdir}/ocaml/curl/*.mli
-%{_libdir}/ocaml/stublibs/*.so
-%{_libdir}/ocaml/stublibs/*.so.owner
-
-
-%files devel
+
+
+%files devel -f .ofiles-devel
%doc doc examples
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/curl/*.a
-%{_libdir}/ocaml/curl/*.cmx
-%{_libdir}/ocaml/curl/*.cmxa
-%endif
-%{_libdir}/ocaml/curl/*.mli
%changelog
+* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 0.9.2-1
+- Version 0.9.2
+- New project URL
+- Use new OCaml macros
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.9.1-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index 25e6445..289740c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ocurl-0.9.1.tar.gz) = f4acb596f213ce57e749c9805225330b532e17718f3b228745b438cd1fe6d89b37e56d401a11c329107729dd0e6bdd4a425d547f9a83dabe32edbf18aca585b5
+SHA512 (ocurl-0.9.2.tar.gz) = de9b06a2a4cbf804b6c947ef1011a75f45e3effbc29db054a9b72453920a0f554baa06d06b2a36eeee33090df7f9eb35280404237e2e3be219fb2dc98fe2bc82
1 year, 9 months
Architecture specific change in rpms/ocaml-lwt-log.git
by githook-noreply＠fedoraproject.org
The package rpms/ocaml-lwt-log.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-lwt-log.git/commit/?id=a17b....
Change:
-%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit a17bfb94dc7219798913c52b2e597586e9b32151
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Aug 9 13:10:21 2022 -0600
Rebuild for ocaml-lwt 5.6.1
- Use SPDX license name
- Use new OCaml macros
diff --git a/ocaml-lwt-log.spec b/ocaml-lwt-log.spec
index 083fcf8..0ed5795 100644
--- a/ocaml-lwt-log.spec
+++ b/ocaml-lwt-log.spec
@@ -1,17 +1,15 @@
%undefine _package_note_flags
+
Name: ocaml-lwt-log
Version: 1.1.1
-Release: 23%{?dist}
+Release: 24%{?dist}
Summary: Lwt logging library
-%global libname %(echo %{name} | sed -e 's/^ocaml-//')
-
-License: LGPLv2+
+License: LGPL-2.1-or-later WITH OCaml-LGPL-linking-exception
URL: https://github.com/ocsigen/lwt_log
-Source0: https://github.com/ocsigen/lwt_log/archive/%{version}/%{libname}-%{versio...
+Source0: https://github.com/ocsigen/lwt_log/archive/%{version}/lwt-log-%{version}....
BuildRequires: ocaml
-BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-lwt-devel
BuildRequires: ocaml-dune
@@ -22,6 +20,7 @@ Lwt-friendly logging library.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: ocaml-lwt-devel%{?_isa}
%description devel
The %{name}-devel package contains libraries and signature files for
@@ -31,44 +30,26 @@ developing applications that use %{name}.
%autosetup -n lwt_log-%{version}
%build
-dune build
+%dune_build
%install
-export OCAMLFIND_DESTDIR=%{buildroot}%{_libdir}/ocaml
-mkdir -p $OCAMLFIND_DESTDIR
-dune install --prefix %{buildroot}%{_prefix}/ --libdir %{buildroot}%{_libdir}/ocaml/
-
-# Remove .ml files.
-rm -rf %{buildroot}%{_libdir}/ocaml/lwt_log/*.ml
-rm -rf %{buildroot}%{_libdir}/ocaml/lwt_log/*/*.ml
+%dune_install
-# Hmm... the above needs refinement. Remove spurious doc files.
-rm -rf %{buildroot}%{_prefix}/doc
+%check
+%dune_check
-# Remove dune-package files.
-find %{buildroot}%{_libdir} -name dune-package -delete
-
-%files
+%files -f .ofiles
%license COPYING
%doc README.md CHANGES
-%{_libdir}/ocaml/lwt_log
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/lwt_log/*/*.a
-%exclude %{_libdir}/ocaml/lwt_log/*/*.cmxa
-%exclude %{_libdir}/ocaml/lwt_log/*/*.cmx
-%endif
-%exclude %{_libdir}/ocaml/lwt_log/*/*.mli
-
-%files devel
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt_log/*/*.a
-%{_libdir}/ocaml/lwt_log/*/*.cmxa
-%{_libdir}/ocaml/lwt_log/*/*.cmx
-%endif
-%{_libdir}/ocaml/lwt_log/*/*.mli
+%files devel -f .ofiles-devel
%changelog
+* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 1.1.1-24
+- Rebuild for ocaml-lwt 5.6.1
+- Use SPDX license name
+- Use new OCaml macros
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.1.1-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
1 year, 9 months
Architecture specific change in rpms/ocaml-csv.git
by githook-noreply＠fedoraproject.org
The package rpms/ocaml-csv.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-csv.git/commit/?id=72bee8ac....
Change:
-%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 66c4b98a4118fccf9ce87aaa60047b43fec4b6b2
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Aug 18 11:51:50 2022 -0600
Bump and rebuild
diff --git a/ocaml-csv.spec b/ocaml-csv.spec
index acf8763..cfcdd5f 100644
--- a/ocaml-csv.spec
+++ b/ocaml-csv.spec
@@ -1,7 +1,7 @@
%undefine _package_note_flags
Name: ocaml-csv
Version: 2.4
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: OCaml library for reading and writing CSV files
License: LGPL-2.1-only WITH OCaml-LGPL-linking-exception
@@ -87,6 +87,9 @@ rm -r %{buildroot}%{ocamldir}/csvtool
%changelog
+* Thu Aug 18 2022 Jerry James <loganjerry(a)gmail.com> - 2.4-8
+- Bump and rebuild
+
* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 2.4-7
- Rebuild for ocaml-lwt 5.6.1
- Change license from LGPLv2+ to LGPL-2.1-only WITH OCaml-LGPL-linking-exception
commit 72bee8acb81dd1c1d1ce45cd6eba5ab3a004e6f5
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Aug 9 13:01:53 2022 -0600
Rebuild for ocaml-lwt 5.6.1
- Change license from LGPLv2+ to LGPL-2.1-only WITH OCaml-LGPL-linking-exception
- Trim BuildRequires
- Use new OCaml macros
diff --git a/ocaml-csv.spec b/ocaml-csv.spec
index c595d9c..acf8763 100644
--- a/ocaml-csv.spec
+++ b/ocaml-csv.spec
@@ -1,21 +1,17 @@
%undefine _package_note_flags
Name: ocaml-csv
Version: 2.4
-Release: 6%{?dist}
+Release: 7%{?dist}
Summary: OCaml library for reading and writing CSV files
-License: LGPLv2+
+License: LGPL-2.1-only WITH OCaml-LGPL-linking-exception
URL: https://github.com/Chris00/ocaml-csv/
-Source0: https://github.com/Chris00/ocaml-csv/releases/tag/2.4/%{name}-%{version}....
+Source0: https://github.com/Chris00/ocaml-csv/archive/%{version}/%{name}-%{version...
-BuildRequires: ocaml >= 4.00.1
-BuildRequires: ocaml-ocamlbuild
-BuildRequires: ocaml-ocamldoc
-BuildRequires: ocaml-findlib-devel >= 1.3.3-3
-BuildRequires: ocaml-dune-devel
+BuildRequires: ocaml >= 4.03.0
+BuildRequires: ocaml-dune
BuildRequires: ocaml-uutf-devel
BuildRequires: ocaml-lwt-devel
-BuildRequires: gawk
%description
@@ -29,7 +25,7 @@ handling CSV files from shell scripts.
%package devel
Summary: Development files for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
@@ -39,7 +35,7 @@ developing applications that use %{name}.
%package lwt
Summary: LWT bindings for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description lwt
@@ -48,7 +44,9 @@ The %{name}-lwt package contains LWT bindings for %{name}.
%package lwt-devel
Summary: LWT development files for %{name}
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-lwt%{?_isa} = %{version}-%{release}
+Requires: %{name}-devel%{?_isa} = %{version}-%{release}
+Requires: ocaml-lwt-devel%{?_isa}
%description lwt-devel
@@ -57,76 +55,44 @@ developing applications that use LWT with %{name}.
%prep
-%setup -q -n %{name}-%{version}
+%autosetup
%build
# _smp_mflags breaks the build for some reason.
# https://github.com/Chris00/ocaml-csv/issues/34
-dune build --display=verbose -j1
+%dune_build -j1
%install
-dune install --destdir=%{buildroot}
-
-# We do not want the ml files
-find %{buildroot}%{_libdir}/ocaml -name \*.ml -delete
+%dune_install -s
# Remove the csvtool META file and opam project
-rm -r %{buildroot}%{_libdir}/ocaml/csvtool
-
-# We install the documentation with the doc macro
-rm -fr %{buildroot}%{_prefix}/doc
+rm -r %{buildroot}%{ocamldir}/csvtool
-%ifarch %{ocaml_native_compiler}
-# Add missing executable bits
-find %{buildroot}%{_libdir}/ocaml -name \*.cmxs -exec chmod a+x {} \+
-%endif
-
-%files
+%files -f .ofiles-csv
%license LICENSE.md
-%{_libdir}/ocaml/csv
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/csv/*.a
-%exclude %{_libdir}/ocaml/csv/*.cmxa
-%exclude %{_libdir}/ocaml/csv/*.cmx
-%endif
-%exclude %{_libdir}/ocaml/csv/*.mli
%{_bindir}/csvtool
-%files devel
+%files devel -f .ofiles-csv-devel
%doc CHANGES.md README.md
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/csv/*.a
-%{_libdir}/ocaml/csv/*.cmxa
-%{_libdir}/ocaml/csv/*.cmx
-%endif
-%{_libdir}/ocaml/csv/*.mli
-
-
-%files lwt
-%{_libdir}/ocaml/csv-lwt
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/csv-lwt/*.a
-%exclude %{_libdir}/ocaml/csv-lwt/*.cmxa
-%exclude %{_libdir}/ocaml/csv-lwt/*.cmx
-%endif
-%exclude %{_libdir}/ocaml/csv-lwt/*.mli
-%{_bindir}/csvtool
-%files lwt-devel
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/csv-lwt/*.a
-%{_libdir}/ocaml/csv-lwt/*.cmxa
-%{_libdir}/ocaml/csv-lwt/*.cmx
-%endif
-%{_libdir}/ocaml/csv-lwt/*.mli
+%files lwt -f .ofiles-csv-lwt
+
+
+%files lwt-devel -f .ofiles-csv-lwt-devel
%changelog
+* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 2.4-7
+- Rebuild for ocaml-lwt 5.6.1
+- Change license from LGPLv2+ to LGPL-2.1-only WITH OCaml-LGPL-linking-exception
+- Trim BuildRequires
+- Use new OCaml macros
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.4-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
1 year, 9 months
Architecture specific change in rpms/ocaml-lwt.git
by githook-noreply＠fedoraproject.org
The package rpms/ocaml-lwt.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-lwt.git/commit/?id=5483316d....
Change:
-%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 278f8d25ea08dc947d110660da944514a711cf27
Author: Jerry James <loganjerry(a)gmail.com>
Date: Thu Aug 18 11:36:25 2022 -0600
Rebuild for ocaml-ppxlib 0.27.0
diff --git a/ocaml-lwt.spec b/ocaml-lwt.spec
index 4e75e37..bbd3966 100644
--- a/ocaml-lwt.spec
+++ b/ocaml-lwt.spec
@@ -2,7 +2,7 @@
Name: ocaml-lwt
Version: 5.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: OCaml lightweight thread library
# The project as a whole is MIT. The following files are BSD-2-Clause:
@@ -174,8 +174,11 @@ rm -rf %{buildroot}%{ocamldir}/lwt_ppx_let
%changelog
+* Thu Aug 18 2022 Jerry James <loganjerry(a)gmail.com> - 5.6.1-2
+- Rebuild for ocaml-ppxlib 0.27.0
+
* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 5.6.1-1
-- Version 5.6.0
+- Version 5.6.1
- Change license from LGPL to MIT and BSD-2-Clause
- Use new OCaml macros
commit 5483316dea28ba6c5c09c71c88e87f1353bf1c99
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Aug 9 10:41:39 2022 -0600
Version 5.6.0
- Change license from LGPL to MIT and BSD-2-Clause
- Use new OCaml macros
diff --git a/ocaml-lwt.spec b/ocaml-lwt.spec
index c585548..4e75e37 100644
--- a/ocaml-lwt.spec
+++ b/ocaml-lwt.spec
@@ -1,38 +1,36 @@
%undefine _package_note_flags
+
Name: ocaml-lwt
-Version: 5.4.2
-Release: 10%{?dist}
+Version: 5.6.1
+Release: 1%{?dist}
Summary: OCaml lightweight thread library
-# The openssl linking exception is granted.
-License: LGPLv2+ with exceptions
+# The project as a whole is MIT. The following files are BSD-2-Clause:
+# - src/core/lwt_condition.ml
+# - src/core/lwt_condition.mli
+# - src/core/lwt_mvar.ml
+# - src/core/lwt_mvar.mli
+License: MIT and BSD-2-Clause
URL: https://ocsigen.org/lwt
Source0: https://github.com/ocsigen/lwt/archive/%{version}/lwt-%{version}.tar.gz
-BuildRequires: ocaml >= 4.02.0
+BuildRequires: ocaml >= 4.08
+BuildRequires: ocaml-dune >= 1.8.0
+BuildRequires: ocaml-dune-configurator-devel
BuildRequires: ocaml-findlib
-
-BuildRequires: dune
-BuildRequires: ocaml-dune-devel
-BuildRequires: ocaml-cppo
-BuildRequires: ocaml-result-devel
-BuildRequires: ocaml-seq-devel
-BuildRequires: ocaml-bisect-ppx-devel
-
-# lwt.unix dependencies
-BuildRequires: ocaml-mmap-devel
+BuildRequires: ocaml-cppo >= 1.1.0
BuildRequires: ocaml-ocplib-endian-devel
# lwt_luv dependencies.
BuildRequires: ocaml-luv-devel
# lwt_react dependencies.
-BuildRequires: ocaml-react-devel
+BuildRequires: ocaml-react-devel >= 1.0.0
# lwt_ppx dependencies.
BuildRequires: ocaml-ppxlib-devel >= 0.16.0
+BuildRequires: ocaml-ppx-let-devel
-BuildRequires: glib2-devel
BuildRequires: libev-devel
@@ -43,10 +41,7 @@ is part of the Ocsigen project.
%package devel
Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: ocaml-mmap-devel%{?_isa}
Requires: ocaml-ocplib-endian-devel%{?_isa}
-Requires: ocaml-result-devel%{?_isa}
-Requires: ocaml-seq-devel%{?_isa}
Requires: libev-devel%{?_isa}
%description devel
@@ -66,7 +61,6 @@ Summary: Development files for ocaml-lwt-luv
Requires: %{name}-luv%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: ocaml-luv-devel%{?_isa}
-Requires: ocaml-result-devel%{?_isa}
%description luv-devel
The %{name}-luv-devel package contains libraries and signature files for
@@ -111,6 +105,12 @@ developing applications that use %{name}-ppx.
%prep
%autosetup -n lwt-%{version}
+# We do not have MultiCore OCaml, so do not have domainslib. Remove lwt_domain
+# so we do not try to build it. Revisit this when OCaml 5.x is released.
+rm -rf src/domain
+rm -rf test/domain
+rm lwt_domain.opam
+
# It looks like one test fails.
# Actually, it looks like all the "mcast" tests fail in koji.
# They should probably be disabled via a patch, but this works for now.
@@ -123,7 +123,7 @@ sed 's,test_mcast "mcast-nojoin-noloop" false false;,(*test_mcast "mcast-nojoin-
# Enable libev and pthread.
dune exec src/unix/config/discover.exe -- --save \
--use-libev true --use-pthread true
-dune build %{?_smp_mflags} --profile=release --verbose
+%dune_build
# Relink the stublib with RPM_LD_FLAGS
cd _build/default/src/unix
@@ -132,132 +132,53 @@ ocamlmklib -g -ldopt "$RPM_LD_FLAGS" -lev -lpthread -lm -o lwt_unix_stubs \
cd -
%install
-dune install --profile=release --destdir %{buildroot}
+%dune_install -s
-# Remove spurious dune-installed documentation.
-rm -rf %{buildroot}/%{_prefix}/doc
+# Remove test-only directory
+rm -rf %{buildroot}%{ocamldir}/lwt_ppx_let
%check
# Disable this test on s390x.
# https://bugzilla.redhat.com/show_bug.cgi?id=1826511
%ifnarch s390x
-dune runtest --profile=release
+%dune_check
%endif
-%files
+%files -f .ofiles-lwt
%doc CHANGES README.md
%license LICENSE.md
-%dir %{_libdir}/ocaml/lwt/
-%dir %{_libdir}/ocaml/lwt/unix/
-%{_libdir}/ocaml/lwt/META
-%{_libdir}/ocaml/lwt/dune-package
-%{_libdir}/ocaml/lwt/opam
-%{_libdir}/ocaml/lwt/*.cma
-%{_libdir}/ocaml/lwt/*.cmi
-%{_libdir}/ocaml/lwt/unix/*.cma
-%{_libdir}/ocaml/lwt/unix/*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt/*.cmxs
-%{_libdir}/ocaml/lwt/unix/*.cmxs
-%endif
-%{_libdir}/ocaml/stublibs/*.so
-%files devel
+%files devel -f .ofiles-lwt-devel
%doc CHANGES README.md
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt/*.a
-%{_libdir}/ocaml/lwt/*.cmxa
-%{_libdir}/ocaml/lwt/*.cmx
-%{_libdir}/ocaml/lwt/unix/*.a
-%{_libdir}/ocaml/lwt/unix/*.cmxa
-%{_libdir}/ocaml/lwt/unix/*.cmx
-%endif
-%{_libdir}/ocaml/lwt/*.cmt
-%{_libdir}/ocaml/lwt/*.cmti
-%{_libdir}/ocaml/lwt/*.ml
-%{_libdir}/ocaml/lwt/*.mli
-%{_libdir}/ocaml/lwt/unix/*.cmt
-%{_libdir}/ocaml/lwt/unix/*.cmti
-%{_libdir}/ocaml/lwt/unix/*.h
-%{_libdir}/ocaml/lwt/unix/*.ml
-%{_libdir}/ocaml/lwt/unix/*.mli
-
-%files luv
+%license LICENSE.md
+
+%files luv -f .ofiles-lwt_luv
%doc CHANGES README.md
%license LICENSE.md
-%dir %{_libdir}/ocaml/lwt_luv/
-%{_libdir}/ocaml/lwt_luv/META
-%{_libdir}/ocaml/lwt_luv/dune-package
-%{_libdir}/ocaml/lwt_luv/opam
-%{_libdir}/ocaml/lwt_luv/*.cma
-%{_libdir}/ocaml/lwt_luv/*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt_luv/*.cmxs
-%endif
-%files luv-devel
+%files luv-devel -f .ofiles-lwt_luv-devel
%doc CHANGES README.md
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt_luv/*.a
-%{_libdir}/ocaml/lwt_luv/*.cmxa
-%{_libdir}/ocaml/lwt_luv/*.cmx
-%endif
-%{_libdir}/ocaml/lwt_luv/*.cmt
-%{_libdir}/ocaml/lwt_luv/*.cmti
-%{_libdir}/ocaml/lwt_luv/*.ml
-%{_libdir}/ocaml/lwt_luv/*.mli
-%files react
+%files react -f .ofiles-lwt_react
%doc CHANGES README.md
%license LICENSE.md
-%dir %{_libdir}/ocaml/lwt_react/
-%{_libdir}/ocaml/lwt_react/META
-%{_libdir}/ocaml/lwt_react/dune-package
-%{_libdir}/ocaml/lwt_react/opam
-%{_libdir}/ocaml/lwt_react/*.cma
-%{_libdir}/ocaml/lwt_react/*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt_react/*.cmxs
-%endif
-%files react-devel
+%files react-devel -f .ofiles-lwt_react-devel
%doc CHANGES README.md
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt_react/*.a
-%{_libdir}/ocaml/lwt_react/*.cmxa
-%{_libdir}/ocaml/lwt_react/*.cmx
-%endif
-%{_libdir}/ocaml/lwt_react/*.cmt
-%{_libdir}/ocaml/lwt_react/*.cmti
-%{_libdir}/ocaml/lwt_react/*.ml
-%{_libdir}/ocaml/lwt_react/*.mli
-
-%files ppx
-%dir %{_libdir}/ocaml/lwt_ppx/
-%{_libdir}/ocaml/lwt_ppx/META
-%{_libdir}/ocaml/lwt_ppx/dune-package
-%{_libdir}/ocaml/lwt_ppx/opam
-%{_libdir}/ocaml/lwt_ppx/ppx.exe
-%{_libdir}/ocaml/lwt_ppx/*.cma
-%{_libdir}/ocaml/lwt_ppx/*.cmi
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt_ppx/*.cmxs
-%endif
-%files ppx-devel
+%files ppx -f .ofiles-lwt_ppx
+%doc CHANGES README.md
+
+%files ppx-devel -f .ofiles-lwt_ppx-devel
%doc CHANGES README.md
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/lwt_ppx/*.a
-%{_libdir}/ocaml/lwt_ppx/*.cmxa
-%{_libdir}/ocaml/lwt_ppx/*.cmx
-%endif
-%{_libdir}/ocaml/lwt_ppx/*.cmt
-%{_libdir}/ocaml/lwt_ppx/*.cmti
-%{_libdir}/ocaml/lwt_ppx/*.ml
-%{_libdir}/ocaml/lwt_ppx/*.mli
%changelog
+* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 5.6.1-1
+- Version 5.6.0
+- Change license from LGPL to MIT and BSD-2-Clause
+- Use new OCaml macros
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 5.4.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index 4559311..e49618a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lwt-5.4.2.tar.gz) = 9f46fb2e56dc7bd57a12d5ab4dc68719947a1462f336087a95e991d087bb9b5b8dee2592d0f7d35abc507d9a641dd221c44c949c81d00e26c673a067d94ba3f4
+SHA512 (lwt-5.6.1.tar.gz) = 698875bd3bfcd5baa47eb48e412f442d289f9972421321541860ebe110b9af1949c3fbc253768495726ec547fe4ba25483cd97ff39bc668496fba95b2ed9edd8
1 year, 9 months
Architecture specific change in rpms/ocaml-sedlex.git
by githook-noreply＠fedoraproject.org
The package rpms/ocaml-sedlex.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-sedlex.git/commit/?id=61214....
Change:
-%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 61214809729fdc5ca411a791cb83a14ef9e25837
Author: Jerry James <loganjerry(a)gmail.com>
Date: Tue Aug 9 12:52:32 2022 -0600
Version 3.0
- Remove unused ocaml-seq-devel BR
- Use new OCaml macros
diff --git a/ocaml-sedlex.spec b/ocaml-sedlex.spec
index c85c947..3999e08 100644
--- a/ocaml-sedlex.spec
+++ b/ocaml-sedlex.spec
@@ -1,8 +1,8 @@
%undefine _package_note_flags
Name: ocaml-sedlex
-Version: 2.6
-Release: 3%{?dist}
+Version: 3.0
+Release: 1%{?dist}
Summary: Unicode-friendly lexer generator
License: MIT
@@ -20,7 +20,6 @@ BuildRequires: ocaml-dune
BuildRequires: ocaml-odoc
BuildRequires: ocaml-ppxlib-devel
BuildRequires: ocaml-gen-devel
-BuildRequires: ocaml-seq-devel
BuildRequires: unicode-ucd
%description
@@ -52,42 +51,34 @@ univer=$(sed -n 's/.*PropList-\([.[:digit:]]*\)\.txt/\1/p' %{_datadir}/unicode/u
sed -i "s/14\\.0\\.0/$univer/" examples/regressions.ml
%build
-dune build %{?_smp_mflags} -p sedlex --verbose --profile release
-dune build %{?_smp_mflags} @doc --profile release
+%dune_build
+%dune_build @doc
-%install
-dune install --destdir="$RPM_BUILD_ROOT" --verbose --profile release
-# These will be installed using doc and license directives.
-rm -r $RPM_BUILD_ROOT%{_prefix}/doc/sedlex/{CHANGES,README.md,LICENSE}
+%install
+%dune_install
%check
-dune runtest --release
+%dune_check
-%files
+%files -f .ofiles
%doc README.md CHANGES
%license LICENSE
-%{_libdir}/ocaml/*
-%ifarch %{ocaml_native_compiler}
-%exclude %{_libdir}/ocaml/*/*.a
-%exclude %{_libdir}/ocaml/*/*.cmxa
-%exclude %{_libdir}/ocaml/*/*.cmx
-%endif
-%files devel
+%files devel -f .ofiles-devel
%doc README.md CHANGES
%license LICENSE
-%ifarch %{ocaml_native_compiler}
-%{_libdir}/ocaml/*/*.a
-%{_libdir}/ocaml/*/*.cmxa
-%{_libdir}/ocaml/*/*.cmx
-%endif
%changelog
+* Mon Aug 8 2022 Jerry James <loganjerry(a)gmail.com> - 3.0-1
+- Version 3.0
+- Remove unused ocaml-seq-devel BR
+- Use new OCaml macros
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.6-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index 57db2af..e116260 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ocaml-sedlex-2.6.tar.gz) = 25806a8187c423ab2bf2439cdc1970e0ad8bb9c98dd51f0f5845180656b12fa37f95c7b160db4300336f92a534887d47631f5d9a1e461bcea0f83654c1413168
+SHA512 (ocaml-sedlex-3.0.tar.gz) = 564780b7af8b3ddd32c9164caa42fd24b2ff59e0bf9977bcee4c3ddea2be3f0c870bd95949b639c5f1942e0fa2604902f5cd3eb9041d59b6ee2367895df556df
1 year, 9 months
Architecture specific change in rpms/opae.git
by githook-noreply＠fedoraproject.org
The package rpms/opae.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/opae.git/commit/?id=124114c5cc71b....
Change:
+ExclusiveArch: x86_64
Thanks.
Full change:
============
commit 124114c5cc71bcfd4b5d98e4299af201370df8cb
Author: Tom Rix <trix(a)redhat.com>
Date: Thu Aug 18 06:54:50 2022 -0700
opae-2.1.0-2.1
A new source tarball.
Signed-off-by: Tom Rix <trix(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index ed3da1e..7870340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
/opae-1.4.0-1.tar.gz
/opae-1.4.1-1.tar.gz
/opae-2.0.0-2.tar.gz
-/opae-2.1.0-1.tar.gz
\ No newline at end of file
+/opae-2.1.0-1.tar.gz
+/opae-2.1.0-2.tar.gz
diff --git a/opae.spec b/opae.spec
index 6bd751f..2f4e026 100644
--- a/opae.spec
+++ b/opae.spec
@@ -1,24 +1,21 @@
-%define opae_release 1
-
Summary: Open Programmable Acceleration Engine (OPAE) SDK
Name: opae
-Version: 2.1.0
-Release: %{opae_release}%{?dist}.2
-License: BSD
-ExclusiveArch: x86_64
-
-Group: Development/Libraries
Vendor: Intel Corporation
+License: BSD
-
+Version: 2.1.0
+%define opae_release 2
+%define patch_level 1
+Release: %{opae_release}.%{patch_level}%{?dist}
URL: https://github.com/OPAE/%{name}-sdk
Source0: https://github.com/OPAE/opae-sdk/releases/download/%{version}-%{opae_rele...
+Group: Development/Libraries
+ExclusiveArch: x86_64
BuildRequires: make
BuildRequires: cmake
-BuildRequires: git
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: json-c-devel
@@ -355,6 +352,9 @@ done
%changelog
+* Thu Aug 18 2022 Tom Rix <trix(a)redat.com> - 2.1.0-2.1
+- Upstate tarball to 2.1.0-2
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-1.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index 1f1f4c4..8d0c4a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (opae-2.1.0-1.tar.gz) = 17fa27aa21eda109f1d343af6e5205d845fe73e38dd61a30d606d2565c505d6f43f0c8244ef03fdb3ec1123041e73133cb5b63fb487c132fd07c663f964cb11c
+SHA512 (opae-2.1.0-2.tar.gz) = 5b7ef3942ed0c99a4f3043fb077a5d549584cbf29069f2521e7501978f5c9b68209e7df8906e6aeb869ef186e81962c2678ac14c0bf3519299e11b1b18b12d8a
commit f5b7bd768134461da956a70ab7f3a0269ec34794
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 22 01:55:24 2022 +0000
Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/opae.spec b/opae.spec
index ae79d35..6bd751f 100644
--- a/opae.spec
+++ b/opae.spec
@@ -3,7 +3,7 @@
Summary: Open Programmable Acceleration Engine (OPAE) SDK
Name: opae
Version: 2.1.0
-Release: %{opae_release}%{?dist}.1
+Release: %{opae_release}%{?dist}.2
License: BSD
ExclusiveArch: x86_64
@@ -355,6 +355,9 @@ done
%changelog
+* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-1.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
* Mon Jun 13 2022 Python Maint <python-maint(a)redhat.com> - 2.1.0-1.1
- Rebuilt for Python 3.11
commit 1c396833696fcb7010480af31a9ec464e7334893
Author: Python Maint <python-maint(a)redhat.com>
Date: Mon Jun 13 19:56:57 2022 +0200
Rebuilt for Python 3.11
diff --git a/opae.spec b/opae.spec
index eb7dbc9..ae79d35 100644
--- a/opae.spec
+++ b/opae.spec
@@ -3,7 +3,7 @@
Summary: Open Programmable Acceleration Engine (OPAE) SDK
Name: opae
Version: 2.1.0
-Release: %{opae_release}%{?dist}
+Release: %{opae_release}%{?dist}.1
License: BSD
ExclusiveArch: x86_64
@@ -355,6 +355,9 @@ done
%changelog
+* Mon Jun 13 2022 Python Maint <python-maint(a)redhat.com> - 2.1.0-1.1
+- Rebuilt for Python 3.11
+
* Tue Mar 15 2022 The OPAE Dev Team <opae(a)lists.01.org> - 2.1.0-1
- Update OPAE spec file and tarball generation script.
- Added support to Intel FPGA DFL Driver that has been upstreamed to Linux Kernel v5.7-5.17.
commit 79839539229ad2e221f5824950e7a77374acc2b2
Author: aravuri <ananda.ravuri(a)intel.com>
Date: Fri May 13 11:01:59 2022 -0700
opae-sdk: remove Requires from opae.spec file
Signed-off-by: aravuri <ananda.ravuri(a)intel.com>
diff --git a/opae.spec b/opae.spec
index f25007a..eb7dbc9 100644
--- a/opae.spec
+++ b/opae.spec
@@ -10,14 +10,7 @@ ExclusiveArch: x86_64
Group: Development/Libraries
Vendor: Intel Corporation
-Requires: uuid
-Requires: json-c
-Requires: python3
-Requires: systemd
-Requires: tbb
-Requires: hwloc
-Requires: spdlog
-Requires: libedit
+
URL: https://github.com/OPAE/%{name}-sdk
Source0: https://github.com/OPAE/opae-sdk/releases/download/%{version}-%{opae_rele...
commit 184a611876f8310a6296586092de50e130cdb9fe
Author: aravuri <ananda.ravuri(a)intel.com>
Date: Mon May 9 10:40:05 2022 -0700
fix ope spec file code review comments
Signed-off-by: aravuri <ananda.ravuri(a)intel.com>
diff --git a/opae.spec b/opae.spec
index ac5ded6..f25007a 100644
--- a/opae.spec
+++ b/opae.spec
@@ -364,51 +364,52 @@ done
%changelog
* Tue Mar 15 2022 The OPAE Dev Team <opae(a)lists.01.org> - 2.1.0-1
- Update OPAE spec file and tarball generation script.
-- Added support to FPGA Linux kernel DFL driver patchset-6.
+- Added support to Intel FPGA DFL Driver that has been upstreamed to Linux Kernel v5.7-5.17.
- Added support to Intel FPGA PCIe N6000/D5005/N3000 series.
+- Removed OPAE-SIM from OPAE-SDK.
- Various bug fixes
- Various Static code scan bug fixes.
- Updated OPAE documentation.
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2.8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
+
* Sat Dec 04 2021 Tom Rix <trix(a)redhat.com> - 2.0.0-2.7
- Disable pacsign, the user user of the local libcrypto
- Remove the whole libcrypto directory in prep
- Remove python3-sphinx, doxygen from BuildRequires
-
+
* Fri Dec 03 2021 Tom Rix <trix(a)redhat.com> - 2.0.0-2.6
- Fix Source0 url
- Remove git from BuildRequires
- Remove libcrypto.so in prep stage
-
+
* Fri Dec 03 2021 Miro Hroncok <mhroncok(a)redhat.com> - 2.0.0-2.5
- Do not provide libcrypto.so.1.1()(64bit)
- Fixes rhbz#2028852
-
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
+
* Sat Jul 10 2021 Bjorn Esser <besser82(a)fedoraproject.org> - 2.0.0-2.2
- Rebuild for versioned symbols in json-c
-
+
* Thu Jul 08 2021 Bjorn Esser <besser82(a)fedoraproject.org> - 2.0.0-2.1
- Fix automatic bump of the release tag
- Add a patch to replace the deprecated pthread_yield function
- Whitespace cleanup
- Use new-style cmake macros
-
+
* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 2.0.0-2.2
- Rebuilt for Python 3.10
-
+
* Mon May 10 2021 Jonathan Wakely <jwakely(a)redhat.com> - 2.0.0-2.1
- Rebuilt for removed libstdc++ symbols (#1937698)
-
+
* Mon Dec 14 2020 The OPAE Dev Team <opae(a)lists.01.org> - 2.0.0-2
- Update OPAE spec file and tarball generation script
- Fix build errors
-
+
* Thu Sep 17 2020 Ananda Ravuri <ananda.ravuri(a)intel.com> 2.0.0-1
- Various Static code scan bug fixes
- Added support to FPGA Linux kernel Device Feature List (DFL) driver.
@@ -421,7 +422,7 @@ done
- Added python3 support.
- OPAE USMG API are deprecated.
- Updated OPAE documentation.
-
+
* Tue Dec 17 2019 Korde Nakul <nakul.korde(a)intel.com> 1.4.0-1
- Added support to FPGA Linux kernel Device Feature List (DFL) driver patch set2.
- Increased test cases and test coverage
commit 8e3f58fecbd805dff2da8bc335db9d0e79dd8676
Author: aravuri <ananda.ravuri(a)intel.com>
Date: Tue Apr 19 15:19:45 2022 -0700
update opae 2.1.0 release"
Signed-off-by: aravuri <ananda.ravuri(a)intel.com>
diff --git a/.gitignore b/.gitignore
index af67404..ed3da1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/opae-1.4.0-1.tar.gz
/opae-1.4.1-1.tar.gz
/opae-2.0.0-2.tar.gz
+/opae-2.1.0-1.tar.gz
\ No newline at end of file
diff --git a/opae.spec b/opae.spec
index 6912797..ac5ded6 100644
--- a/opae.spec
+++ b/opae.spec
@@ -1,43 +1,50 @@
-# Upstream minor release.
-%global opae_release 2
-
-# For handling bump release by rpmdev-bumpspec and mass rebuild.
-%global baserelease 8
-
-# There is a (possibly pre-built) bundled OpenSSL 1.1 in this pacakge
-# Make sure we don't provide libcrypto.so.1.1 etc.
-# https://bugzilla.redhat.com/show_bug.cgi?id=2028852
-%global __provides_exclude ^libcrypto
+%define opae_release 1
Summary: Open Programmable Acceleration Engine (OPAE) SDK
Name: opae
-Version: 2.0.0
-Release: %{opae_release}.%{baserelease}%{?dist}
+Version: 2.1.0
+Release: %{opae_release}%{?dist}
License: BSD
ExclusiveArch: x86_64
Group: Development/Libraries
Vendor: Intel Corporation
-Requires: uuid, json-c, python3
+
+Requires: uuid
+Requires: json-c
+Requires: python3
+Requires: systemd
+Requires: tbb
+Requires: hwloc
+Requires: spdlog
+Requires: libedit
+
URL: https://github.com/OPAE/%{name}-sdk
Source0: https://github.com/OPAE/opae-sdk/releases/download/%{version}-%{opae_rele...
-Patch0000: opae-2.0.0-pthread_yield_deprecated.patch
-BuildRequires: gcc, gcc-c++
+BuildRequires: make
BuildRequires: cmake
-BuildRequires: python3-devel
+BuildRequires: git
+BuildRequires: gcc
+BuildRequires: gcc-c++
BuildRequires: json-c-devel
BuildRequires: libuuid-devel
+BuildRequires: python3-devel
+BuildRequires: python3-jsonschema
+BuildRequires: python3-pip
+BuildRequires: python3-setuptools
+BuildRequires: python3-pyyaml
+BuildRequires: python3-pybind11
BuildRequires: rpm-build
+BuildRequires: systemd-devel
+BuildRequires: tbb-devel
BuildRequires: hwloc-devel
-BuildRequires: systemd
BuildRequires: pybind11-devel
-BuildRequires: python3-setuptools
-BuildRequires: tbb-devel
-BuildRequires: python3-pip
-BuildRequires: python3-virtualenv
-BuildRequires: systemd-rpm-macros
+BuildRequires: cli11-devel
+BuildRequires: spdlog-devel
+BuildRequires: libedit-devel
+
%description
Open Programmable Acceleration Engine (OPAE) is a software framework
@@ -45,9 +52,9 @@ for managing and accessing programmable accelerators (FPGAs).
Its main parts are:
* OPAE Software Development Kit (OPAE SDK) (this package)
-* OPAE Linux driver for Intel(R) Xeon(R) CPU with
- Integrated FPGAs and Intel(R) PAC with Arria(R) 10 GX FPGA
-* Basic Building Block (BBB) library for accelerating AFU
+* OPAE Linux driver for Intel(R) PAC with Arria(R) 10 GX FPGA
+* Intel(R) PAC N6000/D5005, Silicom FPGA SmartNIC N5010 Series,
+* Intel FPGA Programmable Acceleration Card N6000
OPAE SDK is a collection of libraries and tools to facilitate the
development of software applications and accelerators using OPAE.
@@ -56,26 +63,39 @@ streamlined and easy-to-use interface for software applications to
discover, access, and manage FPGA devices and accelerators using
the OPAE software stack.
-
%package devel
Summary: OPAE headers, sample source, and documentation
+Requires: opae
Requires: libuuid-devel, %{name}%{?_isa} = %{version}-%{release}
+Requires: openssl-devel
%description devel
OPAE headers, tools, sample source, and documentation
+%package extra-tools
+Summary: Additional OPAE tools
+Requires: opae-devel
+
+%description extra-tools
+This package contains OPAE extra tools binaries,
+software tools for accelerators
+
+
%{?python_disable_dependency_generator}
+# Workaround a problem with pybind11 *.so not having build-id's
+%undefine _missing_build_ids_terminate_build
%prep
%setup -q -n %{name}-%{version}-%{opae_release}
-%patch0 -p1 -b.pythread_yield
-# libcrypto.so is in the tarball
-rm -rf python/pacsign/pacsign/hsm_managers/openssl/library
%build
-%cmake -DCMAKE_INSTALL_PREFIX=/usr -DOPAE_PRESERVE_REPOS=ON -DOPAE_BUILD_LEGACY=ON -DOPAE_BUILD_SAMPLES=ON
+%cmake -DCMAKE_INSTALL_PREFIX=/usr \
+ -DOPAE_PRESERVE_REPOS=ON \
+ -DOPAE_BUILD_PYTHON_DIST=ON \
+ -DOPAE_BUILD_FPGABIST=ON
+
%cmake_build
@@ -86,86 +106,93 @@ cp LICENSE %{buildroot}%{_datadir}/opae/LICENSE
cp COPYING %{buildroot}%{_datadir}/opae/COPYING
mkdir -p %{buildroot}%{_usr}/src/opae/cmake/modules
-
-for s in FindSphinx.cmake
-do
- cp "cmake/${s}" %{buildroot}%{_usr}/src/opae/cmake/
-done
-
-
-mkdir -p %{buildroot}%{_usr}/src/opae/opae-libs/cmake/modules
-for s in FindHwloc.cmake \
- OPAE.cmake \
- FindUUID.cmake \
- Findjson-c.cmake \
- OPAECompiler.cmake \
- OPAEGit.cmake \
- OPAEPackaging.cmake
+for s in \
+ FindCLI11.cmake \
+ FindCap.cmake \
+ FindHwloc.cmake \
+ FindSphinx.cmake \
+ FindTbb.cmake \
+ FindUUID.cmake \
+ FindUdev.cmake \
+ Findedit.cmake \
+ Findjson-c.cmake \
+ Findspdlog.cmake \
+ OFS.cmake \
+ OPAE.cmake \
+ OPAECompiler.cmake \
+ OPAEExternal.cmake \
+ OPAEGit.cmake \
+ OPAEPackaging.cmake \
+ OPAETest.cmake
do
- cp "opae-libs/cmake/modules/${s}" %{buildroot}%{_usr}/src/opae/opae-libs/cmake/modules
- chmod a+x %{buildroot}%{_usr}/src/opae/opae-libs/cmake/modules/$s
+ cp "cmake/modules/${s}" %{buildroot}%{_usr}/src/opae/cmake/modules
+ chmod a+x %{buildroot}%{_usr}/src/opae/cmake/modules/$s
done
mkdir -p %{buildroot}%{_usr}/src/opae/samples
mkdir -p %{buildroot}%{_usr}/src/opae/samples/hello_fpga/
mkdir -p %{buildroot}%{_usr}/src/opae/samples/hello_events/
mkdir -p %{buildroot}%{_usr}/src/opae/samples/object_api/
-
+mkdir -p %{buildroot}%{_usr}/src/opae/samples/n5010-test/
cp samples/hello_fpga/hello_fpga.c %{buildroot}%{_usr}/src/opae/samples/hello_fpga/
cp samples/hello_events/hello_events.c %{buildroot}%{_usr}/src/opae/samples/hello_events/
cp samples/object_api/object_api.c %{buildroot}%{_usr}/src/opae/samples/object_api/
+cp samples/n5010-test/n5010-test.c %{buildroot}%{_usr}/src/opae/samples/n5010-test/
-cd %{__cmake_builddir}
-
-DESTDIR=%{buildroot} cmake -DCOMPONENT=opaeclib -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=opaecxxcorelib -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=samples -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=opaetoolslibs -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgainfo -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgaconf -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=tooluserclk -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolmmlink -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=samplebin -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=libopaeheaders -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolpackager -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=jsonschema -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolmmlink -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=opaeboardlib -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgametrics -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolbist_app -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpga_dma_test -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpga_dma_N3000_test -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgabist -P cmake_install.cmake
-
-
-DESTDIR=%{buildroot} cmake -DCOMPONENT=opaecxxutils -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=opaecxxnlb -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgadiagapps -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgadiag -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgad -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgad_api -P cmake_install.cmake
-DESTDIR=%{buildroot} cmake -DCOMPONENT=toolfpgad_vc -P cmake_install.cmake
+%cmake_install
+
prev=$PWD
-pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/python/opae.admin/
-%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
+pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/binaries/opae.io
+%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
popd
-# pacsign uses internal libcrypto
-# Fix upstream before installing
-# pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/python/pacsign
-# %{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
-# popd
+pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/binaries/hssi
+%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
+popd
-pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/scripts
-install -m 755 eth_group_mdev.sh %{buildroot}/usr/bin/eth_group_mdev.sh
+pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/binaries/fpgadiag
+%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
popd
+pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/%__cmake_builddir/libraries/pyopae/stage
+%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
+popd
+pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/libraries/pyopaeuio
+%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
+popd
+
+pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/python/opae.admin
+%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
+popd
+
+pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/python/pacsign
+%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
+popd
-for file in %{buildroot}%{python3_sitelib}/opae/admin/tools/{fpgaflash,fpgaotsu,fpgaport,fpgasupdate,ihex2ipmi,rsu,super_rsu,bitstream_info}.py; do
+pushd %{_topdir}/BUILD/%{name}-%{version}-%{opae_release}/python/packager
+%{__python3} setup.py install --single-version-externally-managed --root=%{buildroot}
+popd
+
+# Make rpmlint happy about install permissions
+# admin tools
+for file in %{buildroot}%{python3_sitelib}/opae/admin/tools/{fpgaflash,fpgaotsu,fpgaport,fpgasupdate,ihex2ipmi,rsu,super_rsu,bitstream_info,opaevfio,pci_device,fpgareg}.py; do
+ chmod a+x $file
+done
+# ethernet
+for file in %{buildroot}%{python3_sitelib}/ethernet/{hssicommon,hssiloopback,hssimac,hssistats}.py; do
+ chmod a+x $file
+done
+# diag
+for file in %{buildroot}%{python3_sitearch}/opae/diag/{common,fecmode,fpgadiag,fpgalpbk,fpgamac,fpgastats,fvlbypass,mactest,mux}.py; do
+ chmod a+x $file
+done
+
+# packager
+for file in %{buildroot}%{python3_sitelib}/packager/tools/{afu_json_mgr,packager}.py; do
chmod a+x $file
done
@@ -176,76 +203,89 @@ done
%license %{_datadir}/opae/LICENSE
%license %{_datadir}/opae/COPYING
-%{_libdir}/libopae-c.so.%{version}
-%{_libdir}/libopae-c.so.2
-%{_libdir}/libbitstream.so.%{version}
-%{_libdir}/libbitstream.so.2
-%{_libdir}/libopae-cxx-core.so.%{version}
-%{_libdir}/libopae-cxx-core.so.2
-%{_libdir}/libopae-c++-utils.so.%{version}
-%{_libdir}/libopae-c++-utils.so.2
-%{_libdir}/libopae-c++-nlb.so.%{version}
-%{_libdir}/libopae-c++-nlb.so.2
-%{_libdir}/libfpgad-api.so.%{version}
-%{_libdir}/libfpgad-api.so.2
-
-
-%post devel
-%systemd_post fpgad.service
+%{_libdir}/libopae-c.so.*
+%{_libdir}/libbitstream.so.*
+%{_libdir}/libopae-c++-nlb.so.*
+%{_libdir}/libopae-cxx-core.so.*
+%{_libdir}/libopae-c++-utils.so.*
+%{_libdir}/libfpgad-api.so.*
+%{_libdir}/libmml-srv.so.*
+%{_libdir}/libmml-stream.so.*
+%{_libdir}/libofs.so.*
+%{_libdir}/libopaemem.so.*
+%{_libdir}/libopaeuio.so.*
+%{_libdir}/libopaevfio.so.*
+%{_libdir}/libofs_cpeng.so.*
+
+%{_libdir}/opae/libxfpga.so
+%{_libdir}/opae/libopae-v.so
+%{_libdir}/opae/libmodbmc.so
+%{_libdir}/opae/libfpgad-xfpga.so
+%{_libdir}/opae/libfpgad-vc.so
+%{_libdir}/opae/libboard_a10gx.so
+%{_libdir}/opae/libboard_n3000.so
+%{_libdir}/opae/libboard_d5005.so
+%{_libdir}/opae/libboard_n5010.so
+%{_libdir}/opae/libboard_n6000.so
+%{_bindir}/fpgad
+%{_bindir}/fpgaconf
+%{_bindir}/fpgainfo
+%{_bindir}/fpgasupdate
+%{_bindir}/rsu
+%{_bindir}/pci_device
-%preun devel
+%{python3_sitelib}/opae.admin*
+%{python3_sitelib}/opae/admin*
+
+%config(noreplace) %{_sysconfdir}/opae/fpgad.cfg*
+%config(noreplace) %{_sysconfdir}/sysconfig/fpgad.conf*
+
+%{_datadir}/doc/opae.admin/LICENSE
+%{_unitdir}/fpgad.service
+
+%post
+%systemd_post fpgad.service
+/sbin/ldconfig
+
+%preun
%systemd_preun fpgad.service
%files devel
%dir %{_includedir}/opae
-%{_includedir}/opae/*
+%{_includedir}/opae/*.h
+%{_includedir}/opae/cxx/core.h
+%{_includedir}/opae/cxx/core/*.h
%dir %{_usr}/src/opae
%{_usr}/src/opae/samples/hello_fpga/hello_fpga.c
%{_usr}/src/opae/samples/hello_events/hello_events.c
%{_usr}/src/opae/samples/object_api/object_api.c
-%{_usr}/src/opae/cmake/*
-%{_usr}/src/opae/opae-libs/cmake/modules/*
+%{_usr}/src/opae/samples/n5010-test/n5010-test.c
+%{_usr}/src/opae/samples/n5010-ctl/n5010-ctl.c
+%{_usr}/src/opae/cmake/modules/*
+%{_usr}/src/opae/argsfilter/argsfilter.c
+%{_usr}/src/opae/argsfilter/argsfilter.h
-%{_libdir}/opae/libboard_a10gx.so*
-%{_libdir}/opae/libboard_n3000.so*
-%{_libdir}/opae/libboard_d5005.so*
+%{_libdir}/libfpgad-api.so
%{_libdir}/libopae-c++-nlb.so
%{_libdir}/libopae-cxx-core.so
%{_libdir}/libopae-c++-utils.so
%{_libdir}/libopae-c.so
%{_libdir}/libbitstream.so
-%{_libdir}/libfpgad-api.so
-%{_libdir}/opae/libxfpga.so*
-%{_libdir}/opae/libmodbmc.so*
-%{_bindir}/bist_app*
-%{_bindir}/dummy_afu
-%{_bindir}/bist_common.py*
-%{_bindir}/bist_dma.py*
-%{_bindir}/bist_def.py*
-%{_bindir}/bist_nlb3.py*
-%{_bindir}/bist_nlb0.py*
-%{_bindir}/fpgabist*
-%{_bindir}/nlb0*
-%{_bindir}/nlb3*
-%{_bindir}/nlb7*
-%{_bindir}/fecmode*
-%{_bindir}/fpgamac*
-%{_bindir}/fvlbypass*
-%{_bindir}/mactest*
-%{_bindir}/fpgadiag*
-%{_bindir}/fpgalpbk*
-%{_bindir}/fpgastats*
-%{_bindir}/bitstreaminfo*
-%{_bindir}/fpgaflash*
-%{_bindir}/fpgaotsu*
-%{_bindir}/fpgaport*
-%{_bindir}/fpgasupdate*
-%{_bindir}/rsu*
-%{_bindir}/super-rsu*
-%{_bindir}/fpgaconf
-%{_bindir}/fpgainfo
+%{_libdir}/libmml-stream.so
+%{_libdir}/libmml-srv.so
+%{_libdir}/libofs.so
+%{_libdir}/libofs_cpeng.so
+%{_libdir}/libopaemem.so
+%{_libdir}/libopaeuio.so
+%{_libdir}/libopaevfio.so
+
+%{_bindir}/bitstreaminfo
+%{_bindir}/fpgaflash
+%{_bindir}/fpgaotsu
+%{_bindir}/fpgaport
+%{_bindir}/super-rsu
%{_bindir}/mmlink
%{_bindir}/userclk
%{_bindir}/hello_fpga
@@ -255,65 +295,120 @@ done
%{_bindir}/afu_json_mgr
%{_bindir}/packager
%{_bindir}/fpgametrics
+%{_bindir}/n5010-test
+%{_bindir}/n5010-ctl
+%{_bindir}/PACSign
+%{_bindir}/opaevfio
+%{_bindir}/opaevfiotest
+%{_bindir}/regmap-debugfs
+%{_bindir}/fpgareg
+%{_bindir}/afu_platform_config
+%{_bindir}/afu_platform_info
+%{_bindir}/afu_synth_setup
+%{_bindir}/hssiloopback
+%{_bindir}/hssimac
+%{_bindir}/hssistats
+%{_bindir}/opaeuiotest
+%{_bindir}/pac_hssi_config.py
+%{_bindir}/rtl_src_config
+%{_bindir}/nlb0
+%{_bindir}/nlb3
+%{_bindir}/nlb7
+%{_bindir}/vabtool
+
+
+%{_usr}/share/opae/*
+%{python3_sitelib}/ethernet*
+%{python3_sitelib}/hssi_ethernet*
+%{python3_sitelib}/pacsign*
+%{python3_sitelib}/packager*
+%{python3_sitearch}/libvfio*
+
+%{python3_sitearch}/opae.fpga*
+%{python3_sitearch}/opae/fpga*
+%{python3_sitearch}/opae*
+
+%files extra-tools
+%{_bindir}/bist_app
+%{_bindir}/dummy_afu
+%{_bindir}/bist_app.py
+%{_bindir}/bist_common.py
+%{_bindir}/bist_dma.py
+%{_bindir}/bist_def.py
+%{_bindir}/bist_nlb3.py
+%{_bindir}/bist_nlb0.py
+%{_bindir}/fpgabist
+%{_bindir}/fecmode
+%{_bindir}/fpgamac
+%{_bindir}/fvlbypass
+%{_bindir}/mactest
+%{_bindir}/fpgadiag
+%{_bindir}/fpgalpbk
+%{_bindir}/fpgastats
%{_bindir}/fpga_dma_N3000_test
%{_bindir}/fpga_dma_test
-# Disable pacsign until internal libcrypto usage is solved in the upstream
-# % {_bindir}/PACSign*
-%{_bindir}/fpgad
-%config(noreplace) %{_sysconfdir}/opae/fpgad.cfg*
-%config(noreplace) %{_sysconfdir}/sysconfig/fpgad.conf*
-%{_unitdir}/fpgad.service
-%{_libdir}/opae/libfpgad-vc.so*
-%{_bindir}/eth_group_mdev.sh
-%{_usr}/share/opae/*
-%{_datadir}/doc/opae.admin/LICENSE
-%{python3_sitelib}/opae*
-# Disable pacsign until internal libcrypto usage is solved in the upstream
-# % {python3_sitelib}/pacsign*
-# part of the jsonschema testsuite, do not deliver
-%exclude /usr/share/opae/python/jsonschema-2.3.0/json/bin/jsonschema_suite
+%{_bindir}/host_exerciser
+%{_bindir}/bist
+%{_bindir}/hps
+%{_bindir}/hssi
+%{_bindir}/opae.io
+%{_bindir}/mem_tg
+
+%{python3_sitearch}/opae.diag*
+%{python3_sitearch}/opae/diag*
+%{python3_sitearch}/opae.io*
+%{python3_sitearch}/opae/io*
+%{python3_sitearch}/pyopaeuio*
%changelog
+* Tue Mar 15 2022 The OPAE Dev Team <opae(a)lists.01.org> - 2.1.0-1
+- Update OPAE spec file and tarball generation script.
+- Added support to FPGA Linux kernel DFL driver patchset-6.
+- Added support to Intel FPGA PCIe N6000/D5005/N3000 series.
+- Various bug fixes
+- Various Static code scan bug fixes.
+- Updated OPAE documentation.
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2.8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
+
* Sat Dec 04 2021 Tom Rix <trix(a)redhat.com> - 2.0.0-2.7
- Disable pacsign, the user user of the local libcrypto
- Remove the whole libcrypto directory in prep
- Remove python3-sphinx, doxygen from BuildRequires
-
+
* Fri Dec 03 2021 Tom Rix <trix(a)redhat.com> - 2.0.0-2.6
- Fix Source0 url
- Remove git from BuildRequires
- Remove libcrypto.so in prep stage
-
-* Fri Dec 03 2021 Miro Hrončok <mhroncok(a)redhat.com> - 2.0.0-2.5
+
+* Fri Dec 03 2021 Miro Hroncok <mhroncok(a)redhat.com> - 2.0.0-2.5
- Do not provide libcrypto.so.1.1()(64bit)
- Fixes rhbz#2028852
-
+
* Thu Jul 22 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.0-2.3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat Jul 10 2021 Björn Esser <besser82(a)fedoraproject.org> - 2.0.0-2.2
+
+* Sat Jul 10 2021 Bjorn Esser <besser82(a)fedoraproject.org> - 2.0.0-2.2
- Rebuild for versioned symbols in json-c
-
-* Thu Jul 08 2021 Björn Esser <besser82(a)fedoraproject.org> - 2.0.0-2.1
+
+* Thu Jul 08 2021 Bjorn Esser <besser82(a)fedoraproject.org> - 2.0.0-2.1
- Fix automatic bump of the release tag
- Add a patch to replace the deprecated pthread_yield function
- Whitespace cleanup
- Use new-style cmake macros
-
+
* Fri Jun 04 2021 Python Maint <python-maint(a)redhat.com> - 2.0.0-2.2
- Rebuilt for Python 3.10
-
+
* Mon May 10 2021 Jonathan Wakely <jwakely(a)redhat.com> - 2.0.0-2.1
- Rebuilt for removed libstdc++ symbols (#1937698)
-
+
* Mon Dec 14 2020 The OPAE Dev Team <opae(a)lists.01.org> - 2.0.0-2
- Update OPAE spec file and tarball generation script
- Fix build errors
-
+
* Thu Sep 17 2020 Ananda Ravuri <ananda.ravuri(a)intel.com> 2.0.0-1
- Various Static code scan bug fixes
- Added support to FPGA Linux kernel Device Feature List (DFL) driver.
@@ -326,7 +421,7 @@ done
- Added python3 support.
- OPAE USMG API are deprecated.
- Updated OPAE documentation.
-
+
* Tue Dec 17 2019 Korde Nakul <nakul.korde(a)intel.com> 1.4.0-1
- Added support to FPGA Linux kernel Device Feature List (DFL) driver patch set2.
- Increased test cases and test coverage
diff --git a/sources b/sources
index cd26214..1f1f4c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (opae-2.0.0-2.tar.gz) = 20e2a1c1de80f9ab82ee3ecf0020be2d4a9f5beddca4aea562fe5174b45734d5c6e977379a145298b2995c44273f0359b17a1282beeee4d9caf7ef7d9818ed18
+SHA512 (opae-2.1.0-1.tar.gz) = 17fa27aa21eda109f1d343af6e5205d845fe73e38dd61a30d606d2565c505d6f43f0c8244ef03fdb3ec1123041e73133cb5b63fb487c132fd07c663f964cb11c
1 year, 9 months
Architecture specific change in rpms/opae.git
by githook-noreply＠fedoraproject.org
The package rpms/opae.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/opae.git/commit/?id=124114c5cc71b....
Change:
+ExclusiveArch: x86_64
Thanks.
Full change:
============
commit 124114c5cc71bcfd4b5d98e4299af201370df8cb
Author: Tom Rix <trix(a)redhat.com>
Date: Thu Aug 18 06:54:50 2022 -0700
opae-2.1.0-2.1
A new source tarball.
Signed-off-by: Tom Rix <trix(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index ed3da1e..7870340 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
/opae-1.4.0-1.tar.gz
/opae-1.4.1-1.tar.gz
/opae-2.0.0-2.tar.gz
-/opae-2.1.0-1.tar.gz
\ No newline at end of file
+/opae-2.1.0-1.tar.gz
+/opae-2.1.0-2.tar.gz
diff --git a/opae.spec b/opae.spec
index 6bd751f..2f4e026 100644
--- a/opae.spec
+++ b/opae.spec
@@ -1,24 +1,21 @@
-%define opae_release 1
-
Summary: Open Programmable Acceleration Engine (OPAE) SDK
Name: opae
-Version: 2.1.0
-Release: %{opae_release}%{?dist}.2
-License: BSD
-ExclusiveArch: x86_64
-
-Group: Development/Libraries
Vendor: Intel Corporation
+License: BSD
-
+Version: 2.1.0
+%define opae_release 2
+%define patch_level 1
+Release: %{opae_release}.%{patch_level}%{?dist}
URL: https://github.com/OPAE/%{name}-sdk
Source0: https://github.com/OPAE/opae-sdk/releases/download/%{version}-%{opae_rele...
+Group: Development/Libraries
+ExclusiveArch: x86_64
BuildRequires: make
BuildRequires: cmake
-BuildRequires: git
BuildRequires: gcc
BuildRequires: gcc-c++
BuildRequires: json-c-devel
@@ -355,6 +352,9 @@ done
%changelog
+* Thu Aug 18 2022 Tom Rix <trix(a)redat.com> - 2.1.0-2.1
+- Upstate tarball to 2.1.0-2
+
* Fri Jul 22 2022 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.1.0-1.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
diff --git a/sources b/sources
index 1f1f4c4..8d0c4a7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (opae-2.1.0-1.tar.gz) = 17fa27aa21eda109f1d343af6e5205d845fe73e38dd61a30d606d2565c505d6f43f0c8244ef03fdb3ec1123041e73133cb5b63fb487c132fd07c663f964cb11c
+SHA512 (opae-2.1.0-2.tar.gz) = 5b7ef3942ed0c99a4f3043fb077a5d549584cbf29069f2521e7501978f5c9b68209e7df8906e6aeb869ef186e81962c2678ac14c0bf3519299e11b1b18b12d8a
1 year, 9 months