The package rpms/jbuilder.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/jbuilder.git/commit/?id=ffb9fc60f....
Change:
-%ifnarch i686 armv7hl
Thanks.
Full change:
============
commit ffb9fc60f728ca66ac6d137da3c1a53704f7cf34
Author: Ben Rosser <rosser.bjr(a)gmail.com>
Date: Tue Jul 30 17:03:29 2019 -0400
Renamed to ocaml-dune.
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index d74ec18..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*.rpm
-/jbuilder-1.0.tar.gz
-/jbuilder-1.0-beta16.tar.gz
-/jbuilder-1.0-beta17.tar.gz
-/jbuilder-1.0-beta18.tar.gz
-/jbuilder-1.0-beta20.tar.gz
-/jbuilder-1.0.1.tar.gz
diff --git a/1113.patch b/1113.patch
deleted file mode 100644
index e0e5b20..0000000
--- a/1113.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 63b49f946b7e54b4138455253a4622e4945cd91d Mon Sep 17 00:00:00 2001
-From: Rudi Grinberg <rudi.grinberg(a)gmail.com>
-Date: Wed, 8 Aug 2018 01:30:22 +0300
-Subject: [PATCH] Mark more tests as having external deps
-
-Signed-off-by: Rudi Grinberg <rudi.grinberg(a)gmail.com>
----
- test/blackbox-tests/dune.inc | 2 --
- test/blackbox-tests/gen_tests.ml | 2 ++
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc
-index 7295b221e..b8c3cdae9 100644
---- a/test/blackbox-tests/dune.inc
-+++ b/test/blackbox-tests/dune.inc
-@@ -880,7 +880,6 @@
- (alias findlib)
- (alias findlib-error)
- (alias force-test)
-- (alias gen-opam-install-file)
- (alias github1019)
- (alias github20)
- (alias github24)
-@@ -925,7 +924,6 @@
- (alias redirections)
- (alias reporting-of-cycles)
- (alias scope-bug)
-- (alias scope-ppx-bug)
- (alias select)
- (alias shadow-bindings)
- (alias subst)
-diff --git a/test/blackbox-tests/gen_tests.ml b/test/blackbox-tests/gen_tests.ml
-index 5b2d078c2..85c413b47 100644
---- a/test/blackbox-tests/gen_tests.ml
-+++ b/test/blackbox-tests/gen_tests.ml
-@@ -137,6 +137,8 @@ let exclusions =
- ; make "utop"~external_deps:true
- ; make "configurator" ~skip_platforms:[Win]
- ; make "github764" ~skip_platforms:[Win]
-+ ; make "gen-opam-install-file" ~external_deps:true
-+ ; make "scope-ppx-bug" ~external_deps:true
- ]
-
- let all_tests = lazy (
diff --git a/README.md b/README.md
deleted file mode 100644
index bcc3c3e..0000000
--- a/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# jbuilder
-
-The jbuilder package
\ No newline at end of file
diff --git a/dead.package b/dead.package
new file mode 100644
index 0000000..3ce8f5d
--- /dev/null
+++ b/dead.package
@@ -0,0 +1 @@
+Renamed to ocaml-dune.
diff --git a/jbuilder.spec b/jbuilder.spec
deleted file mode 100644
index 5fc3cf7..0000000
--- a/jbuilder.spec
+++ /dev/null
@@ -1,198 +0,0 @@
-Name: jbuilder
-Version: 1.0.1
-Release: 3%{?dist}
-Summary: A composable build system for OCaml
-
-%global libname %(echo %{name} | sed -e 's/^ocaml-//')
-
-License: ASL 2.0
-URL:
https://github.com/janestreet/jbuilder/
-Source0:
https://github.com/janestreet/%{libname}/archive/%{version}/%{libname}-%{...
-
-# Remove a test that depends on a library that depends on jbuilder.
-# Hurray for recursive dependency chains...
-# Remove further tests that want 'utop' and 'odoc' to exist.
-#Patch0: jbuilder-remove-unrunnable-unit-tests.patch
-
-# Remove tests that depend on ocaml-migrate-parsetree.
-Patch0:
https://patch-diff.githubusercontent.com/raw/ocaml/dune/pull/1113.patch
-
-BuildRequires: ocaml >= 4.02.3
-BuildRequires: ocaml-findlib-devel
-
-# Depend on /usr/bin/sphinx-build for python version invariance.
-BuildRequires: /usr/bin/sphinx-build
-
-# Required by tests.
-BuildRequires: git
-BuildRequires: ocaml-menhir
-BuildRequires: ocaml-result-devel
-
-# Jbuilder has vendored deps (ugh):
-# I'm not clear on how to unbundle them.
-# It seems to be unsupported upstream; the bootstrap process for jbuilder
-# doesn't seem to be able to detect libraries installed systemwide.
-#
https://github.com/janestreet/jbuilder/issues/220
-Provides: bundled(ocaml-opam-file-format)
-Provides: bundled(ocaml-cmdliner) = 1.0.0
-Provides: bundled(ocaml-re)
-
-%description
-Jbuilder is a build system designed for OCaml/Reason projects only. It focuses
-on providing the user with a consistent experience and takes care of most of
-the low-level details of OCaml compilation. All you have to do is provide a
-description of your project and Jbuilder will do the rest.
-
-The scheme it implements is inspired from the one used inside Jane Street and
-adapted to the open source world. It has matured over a long time and is used
-daily by hundred of developers, which means that it is highly tested and
-productive.
-
-%package doc
-Summary: HTML documentation for %{name}
-Requires: %{name} = %{version}-%{release}
-
-BuildArch: noarch
-
-%description doc
-HTML documentation for jbuilder, a composable build system for OCaml.
-
-%prep
-# Eep. Upstream is (slowly) renaming jbuilder -> dune. This has already
-# affected the tarball here.
-%autosetup -n dune-%{version} -p1
-
-# Remove blackbox tests. This is necessary pending a fix to:
-#
https://github.com/ocaml/dune/issues/593
-#rm -rf test/blackbox-tests
-#rm -f example/jbuild
-
-%build
-# The jbuilder build script figures out if the native code compiler is available
-# and uses it if it is, otherwise it uses the bytecode compiler. Thus I think
-# we just need to "make" here.
-%make_build release
-%make_build doc
-
-%install
-# jbuilder's makefile has a "make install" target. Tragically, it uses
opam-install(er)
-# to install itself. Even more tragically, opam now requires jbuilder to build.
-# Therefore as a workaround we can just manually install things ourselves--
-# jbuilder is *mostly* just a binary, making this easy.
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_libdir}/ocaml/jbuilder/
-mkdir -p %{buildroot}%{_mandir}/man1
-
-# The files to install are stored in _build as symlinks; dereference them.
-cp -aL _build/install/default/bin/jbuilder %{buildroot}%{_bindir}/
-cp -aL _build/install/default/bin/dune %{buildroot}%{_bindir}/
-cp -aL _build/install/default/lib/dune/* %{buildroot}%{_libdir}/ocaml/jbuilder/
-cp -aL _build/install/default/man/man1/* %{buildroot}%{_mandir}/man1
-
-# Install documentation by way of pkgdocdir.
-mkdir -p %{buildroot}%{_pkgdocdir}/
-cp -ar README.md CHANGES.md doc/_build/* %{buildroot}%{_pkgdocdir}/
-
-# Run the unit tests. runtest-no-deps.
-%check
-# Ugh. Why is this necessary?
-# Because the tests do things with git and complain if these things aren't set...
-git config --global user.name "Your Name"
-git config --global user.email you(a)example.com
-
-# Also, need to fix something in one of the results files...?
-# This is incredibly fragile, but I really don't want to write a patch.
-# Okay, so this fix only works on 64-bit arches. I... am not sure why.
-%ifnarch i686 armv7hl
-sed "s,\$LIB_PREFIX/lib,%{_libdir}/ocaml,g" -i
test/blackbox-tests/test-cases/merlin-tests/run.t
-sed "s,%{_libdir}/ocaml/bytes,%{_libdir}/ocaml,g" -i
test/blackbox-tests/test-cases/merlin-tests/run.t
-sed "s,%{_libdir}/ocaml/findlib,%{_libdir}/ocaml/bytes,g" -i
test/blackbox-tests/test-cases/merlin-tests/run.t
-sed "s,%{_libdir}/ocaml/ocaml,%{_libdir}/ocaml/findlib,g" -i
test/blackbox-tests/test-cases/merlin-tests/run.t
-%else
-sed "s,\$LIB_PREFIX/lib/ocaml,\$LIB_PREFIX/lib/ocaml/findlib,g" -i
test/blackbox-tests/test-cases/merlin-tests/run.t
-sed "s,\$LIB_PREFIX/lib/findlib,\$LIB_PREFIX/lib/ocaml/bytes,g" -i
test/blackbox-tests/test-cases/merlin-tests/run.t
-sed "s,\$LIB_PREFIX/lib/bytes,\$LIB_PREFIX/lib/ocaml,g" -i
test/blackbox-tests/test-cases/merlin-tests/run.t
-%endif
-
-./_build/default/bin/main_dune.exe build @runtest-no-deps
-
-%files
-%license LICENSE.md
-%doc %{_pkgdocdir}/README.md
-%doc %{_pkgdocdir}/CHANGES.md
-%{_libdir}/ocaml/%{libname}
-%{_bindir}/jbuilder
-%{_bindir}/dune
-%{_mandir}/man1/dune.1*
-%{_mandir}/man1/dune-build.1*
-%{_mandir}/man1/dune-clean.1*
-%{_mandir}/man1/dune-exec.1*
-%{_mandir}/man1/dune-external-lib-deps.1*
-%{_mandir}/man1/dune-help.1*
-%{_mandir}/man1/dune-install.1*
-%{_mandir}/man1/dune-installed-libraries.1*
-%{_mandir}/man1/dune-printenv.1*
-%{_mandir}/man1/dune-promote.1*
-%{_mandir}/man1/dune-rules.1*
-%{_mandir}/man1/dune-runtest.1*
-%{_mandir}/man1/dune-subst.1*
-%{_mandir}/man1/dune-uninstall.1*
-%{_mandir}/man1/dune-utop.1*
-
-%files doc
-%exclude %{_pkgdocdir}/README.md
-%exclude %{_pkgdocdir}/CHANGES.md
-%doc %{_pkgdocdir}/*
-
-%changelog
-* Thu Jul 25 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-3
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng(a)fedoraproject.org> - 1.0.1-2
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Tue Aug 07 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 1.0.1-1
-- Updated to latest upstream release.
-- Manpages have been renamed to 'dune'. A 'dune' binary is now provided
as well.
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.0-0.12.beta20
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed May 02 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 1.0-0.11.beta20
-- Updated to latest upstream release (#1537836).
-
-* Tue Mar 06 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 1.0-0.10.beta18
-- Updated to latest upstream release (#1537836).
-
-* Mon Feb 12 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 1.0-0.9.beta17
-- Update to upstream re-release of beta 17.
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.0-0.8.beta17
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 30 2018 Ben Rosser <rosser.bjr(a)gmail.com> - 1.0-0.7.beta18
-- Fix build failure on ppc64 by always using bytecode ocaml compiler to bootstrap.
-
-* Wed Jan 24 2018 Ben Rosser <rosser.bjr(a)gmail.com> 1.0-0.6.beta17
-- Update to latest upstream release, beta17 (#1537836).
-- Remove unit tests that require external deps (that themselves require jbuilder).
-
-* Tue Nov 14 2017 Ben Rosser <rosser.bjr(a)gmail.com> 1.0-0.5.beta16
-- Update to latest upstream release, beta16 (#1509749).
-- Add pre_tag version suffix to source flie name to avoid confusion.
-
-* Mon Oct 23 2017 Ben Rosser <rosser.bjr(a)gmail.com> 1.0-0.4.beta14
-- Update to latest upstream release, beta14 (#1504414).
-
-* Mon Aug 28 2017 Ben Rosser <rosser.bjr(a)gmail.com> 1.0-0.3.beta12
-- Update to latest upstream release, beta12.
-- Fix typo in description.
-- Use simpler github source URL.
-- Use make_build macros when compiling.
-
-* Tue Aug 15 2017 Ben Rosser <rosser.bjr(a)gmail.com> 1.0-0.2.beta11
-- Update to a git snapshot so opam can be built against.
-- Modernize ocaml packaging.
-
-* Tue Aug 1 2017 Ben Rosser <rosser.bjr(a)gmail.com> 1.0-0.1.beta11
-- Initial package.
diff --git a/sources b/sources
deleted file mode 100644
index a4902d9..0000000
--- a/sources
+++ /dev/null
@@ -1 +0,0 @@
-SHA512 (jbuilder-1.0.1.tar.gz) =
15521b8287ca832208ed14d34c5dcc7b5280d3b9c0dcf8e26a4d3969af3213f0123fee585030e7c21baab9075f346fffe24f0e9543e2dd79e2dce1e1796b4d9b