Fix FTBFS

Resolves: #1912983

.gitignore

@@ -22,3 +22,4 @@
 /toolbox-0.0.98.1.tar.xz
 /toolbox-0.0.99.tar.xz
 /toolbox-0.0.99.1.tar.xz
+/toolbox-0.0.99.1-vendored.tar.xz

sources

@@ -1 +1 @@
-SHA512 (toolbox-0.0.99.1.tar.xz) = 6021653eb7fbfc85ea700a9f52f9cfb552efbd4127eb3332a53bd340c8270c4d7a4e54b4a435202fd9e95ee0d90555a46ae9363a930b37fa35e63f239dffc027
+SHA512 (toolbox-0.0.99.1-vendored.tar.xz) = 51097838297a9b177cc2f8e2ec46a9070e03a4412d58b5cc4afe6c7ec7c5e7bd2e5dbf91db573631ad4de62c38349744f918931e89c26d05c7427362291f3eb8

toolbox.spec

@@ -4,36 +4,29 @@ Version:       0.0.99.1
 %global goipath github.com/containers/%{name}
 %gometa
 
-Release:       2%{?dist}
+Release:       3%{?dist}
-Summary:       Unprivileged development environment
+Summary:       Tool for containerized command line environments on Linux
 
 License:       ASL 2.0
 URL:           https://github.com/containers/%{name}
-Source0:       https://github.com/containers/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz
 
-# Fedora specific
+# https://github.com/containers/%%{name}/releases/download/%%{version}/%%{name}-%%{version}.tar.xz
-Patch100:      toolbox-Don-t-use-Go-s-semantic-import-versioning.patch
+# A vendored tarball was created from the upstream tarball:
-Patch101:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild.patch
+# $ cd src
-Patch102:      toolbox-Make-the-build-flags-match-Fedora-s-gobuild-for-PPC64.patch
+# $ go mod vendor
+Source0:       %{name}-%{version}-vendored.tar.xz
+
+# RHEL specific
+Patch100:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild.patch
+Patch101:      toolbox-Make-the-build-flags-match-RHEL-s-gobuild-for-PPC64.patch
 
 BuildRequires: ShellCheck
 BuildRequires: golang >= 1.13
 BuildRequires: golang-github-cpuguy83-md2man
-BuildRequires: golang(github.com/HarryMichal/go-version)
-BuildRequires: golang(github.com/acobaugh/osrelease)
-BuildRequires: golang(github.com/briandowns/spinner) >= 1.10.0
-BuildRequires: golang(github.com/docker/go-units) >= 0.4.0
-BuildRequires: golang(github.com/fsnotify/fsnotify) >= 1.4.7
-BuildRequires: golang(github.com/godbus/dbus) >= 5.0.3
-BuildRequires: golang(github.com/mattn/go-isatty) >= 0.0.12
-BuildRequires: golang(github.com/sirupsen/logrus) >= 1.4.2
-BuildRequires: golang(github.com/spf13/cobra) >= 0.0.5
-BuildRequires: golang(golang.org/x/sys/unix)
 BuildRequires: meson
 BuildRequires: pkgconfig(bash-completion)
 BuildRequires: systemd
 
-Requires:      flatpak-session-helper
 Requires:      podman >= 1.4.0
 
 
@@ -42,82 +35,11 @@ Toolbox is a tool for Linux operating systems, which allows the use of
 containerized command line environments. It is built on top of Podman and
 other standard container technologies from OCI.
 
-# The list of requires packages for -support and -experience should be in sync with:
-# https://github.com/containers/toolbox/blob/master/images/fedora/f33/extra-packages
-%package       support
-Summary:       Required packages for the container image to support %{name}
-
-# These are really required to make the image work with toolbox
-Requires:      passwd
-Requires:      shadow-utils
-Requires:      vte-profile
-
-%description   support
-The %{name}-support package contains all the required packages that are needed
-to be installed in the OCI image to make it work with %{name}.
-
-The %{name}-support package should be typically installed from the Dockerfile
-if the image isn't based on the fedora-toolbox image.
-
-
-%package       experience
-Summary:       Set of packages to enhance the %{name} experience
-
-Requires:      %{name}-support = %{version}-%{release}
-Requires:      bash-completion
-Requires:      bzip2
-Requires:      diffutils
-Requires:      dnf-plugins-core
-Requires:      findutils
-Requires:      flatpak-spawn
-Requires:      fpaste
-Requires:      git
-Requires:      gnupg
-Requires:      gnupg2-smime
-Requires:      gvfs-client
-Requires:      hostname
-Requires:      iputils
-Requires:      jwhois
-Requires:      keyutils
-Requires:      krb5-libs
-Requires:      less
-Requires:      lsof
-Requires:      man-db
-Requires:      man-pages
-Requires:      mlocate
-Requires:      mtr
-Requires:      nss-mdns
-Requires:      openssh-clients
-Requires:      pigz
-Requires:      procps-ng
-Requires:      rsync
-Requires:      sudo
-Requires:      tcpdump
-Requires:      time
-Requires:      traceroute
-Requires:      tree
-Requires:      unzip
-Requires:      wget
-Requires:      which
-Requires:      words
-Requires:      xorg-x11-xauth
-Requires:      xz
-Requires:      zip
-
-%description   experience
-The %{name}-experience package contains all the packages that should be
-installed in the container to provide the same default experience as working
-on the host.
-
-The %{name}-experience package should be typically installed from the
-Dockerfile if the image isn't based on the fedora-toolbox image.
-
 
 %package       tests
 Summary:       Tests for %{name}
 
 Requires:      %{name}%{?_isa} = %{version}-%{release}
-Requires:      bats
 
 %description   tests
 The %{name}-tests package contains system tests for %{name}.
@@ -125,12 +47,11 @@ The %{name}-tests package contains system tests for %{name}.
 
 %prep
 %setup -q
-%patch100 -p1
 
 %ifnarch ppc64
-%patch101 -p1
+%patch100 -p1
 %else
-%patch102 -p1
+%patch101 -p1
 %endif
 
 %gomkdir
@@ -142,6 +63,7 @@ export GOPATH=%{gobuilddir}:%{gopath}
 export CGO_CFLAGS="%{optflags} -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
 ln -s src/cmd cmd
 ln -s src/pkg pkg
+ln -s src/vendor vendor
 %meson --buildtype=plain -Dprofile_dir=%{_sysconfdir}/profile.d
 %meson_build
 
@@ -164,15 +86,15 @@ ln -s src/pkg pkg
 %{_sysconfdir}/profile.d/%{name}.sh
 %{_tmpfilesdir}/%{name}.conf
 
-%files support
-
-%files experience
-
 %files tests
 %{_datadir}/%{name}
 
 
 %changelog
+* Thu Apr 29 2021 Debarshi Ray <rishi@fedoraproject.org> - 0.0.99.1-3
+- Fix FTBFS
+Resolves: #1912983
+
 * Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.99.1-2
 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937