.butane.metadata

@@ -1 +1 @@
-0ab1129a11a5de1d0d7fe4d02b1fc8a11d6a21ed SOURCES/butane-0.23.0.tar.gz
+155918d3d50db5848c9184306c41a66d923e60db SOURCES/butane-0.19.0.tar.gz

.gitignore

@@ -1 +1 @@
-SOURCES/butane-0.23.0.tar.gz
+SOURCES/butane-0.19.0.tar.gz

SPECS/butane.spec

@@ -10,7 +10,7 @@
 # https://github.com/coreos/butane
 %global goipath         github.com/coreos/butane
 %global gomodulesmode   GO111MODULE=on
-Version:                0.23.0
+Version:                0.19.0
 
 %gometa
 
@@ -25,33 +25,28 @@ Name:           butane
 Release:        1%{?dist}
 Summary:        Butane config transpiler
 
-License:        Apache-2.0
+# Upstream license specification: Apache-2.0
+License:        ASL 2.0
 URL:            %{gourl}
 Source0:        %{gosource}
 
-# Upgrade path from old FCCT package; can be dropped in Fedora 36
-Provides:       fedora-coreos-config-transpiler = %{version}-%{release}
-Obsoletes:      fedora-coreos-config-transpiler < 0.10.0-2
-# Provided by FCCT package; can be dropped in Fedora 36
-Provides:       fcct = %{version}-%{release}
 
 # Generated by go-mods-to-bundled-provides.py
 Provides: bundled(golang(github.com/clarketm/json)) = 1.17.1
 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.1
 Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.5.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/doc)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/merge)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/errors)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/parse)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/validations)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/util)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_0/types)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_1/types)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_2/types)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_3/types)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_4/types)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_5_experimental/types)) = 2.17.0
-Provides: bundled(golang(github.com/coreos/ignition/v2/config/validate)) = 2.17.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/merge)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/errors)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/parse)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/shared/validations)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/util)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_0/types)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_1/types)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_2/types)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_3/types)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_4/types)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/v3_5_experimental/types)) = 2.15.0
+Provides: bundled(golang(github.com/coreos/ignition/v2/config/validate)) = 2.15.0
 Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20230201181013.gitd72178a18687
 Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20230201181013.gitd72178a18687
 Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20230201181013.gitd72178a18687
@@ -59,7 +54,7 @@ Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-2023020118101
 Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20230201181013.gitd72178a18687
 Provides: bundled(golang(github.com/coreos/vcontext/yaml)) = 0.0.0-20230201181013.gitd72178a18687
 Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6-0.20210604193023.gitd5e0c0615ace
-Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.4
+Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.2
 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0
 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
 
@@ -67,28 +62,22 @@ Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
 %{common_description}
 
 %package redistributable
-Summary:       Statically built Butane for Linux, macOS and Windows
-License:       Apache-2.0
+Summary:       Butane for macOS and Windows
+License:       ASL 2.0
 BuildArch:     noarch
 
-# In case someone has this subpackage installed, obsolete the old name
-# Drop in Fedora 38
-Obsoletes:     butane-nonlinux < 0.13.1-3
-
 %description redistributable
 %{common_description}
 
-This package contains statically linked Linux, macOS and Windows Butane
-binaries built through cross-compilation. Do not install it. It is only
-used for building release binaries to be signed by Fedora release
-engineering and uploaded to the Butane GitHub releases page.
+This package contains macOS and Windows Butane binaries built through
+cross-compilation.
 
 %prep
 %goprep -k
 %autopatch -p1
 
 %build
-export LDFLAGS="-X github.com/coreos/butane/internal/version.Raw=%{version} "
+export LDFLAGS="-X github.com/coreos/butane/internal/version.Raw=%{version} $LDFLAGS"
 export GOFLAGS="-mod=vendor"
 
 echo "Building butane..."
@@ -96,31 +85,18 @@ echo "Building butane..."
 
 %global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x 
 
-echo "Building Linux Butane with static linking..."
-CGO_ENABLED=0 GOARCH=arm64 GOOS=linux %gocrossbuild -o butane-aarch64-unknown-linux-gnu-static internal/main.go
-CGO_ENABLED=0 GOARCH=ppc64le GOOS=linux %gocrossbuild -o butane-ppc64le-unknown-linux-gnu-static internal/main.go
-CGO_ENABLED=0 GOARCH=s390x GOOS=linux %gocrossbuild -o butane-s390x-unknown-linux-gnu-static internal/main.go
-CGO_ENABLED=0 GOARCH=amd64 GOOS=linux %gocrossbuild -o butane-x86_64-unknown-linux-gnu-static internal/main.go
-
 echo "Building macOS Butane..."
-GOARCH=amd64 GOOS=darwin %gocrossbuild -o butane-x86_64-apple-darwin internal/main.go
-GOARCH=arm64 GOOS=darwin %gocrossbuild -o butane-aarch64-apple-darwin internal/main.go
+GOARCH=amd64 GOOS=darwin %gocrossbuild -o butane-darwin-amd64 internal/main.go
 
 echo "Building Windows Butane..."
-GOARCH=amd64 GOOS=windows %gocrossbuild -o butane-x86_64-pc-windows-gnu.exe internal/main.go
+GOARCH=amd64 GOOS=windows %gocrossbuild -o butane-windows-amd64.exe internal/main.go
 
 %install
 install -d -p %{buildroot}%{_bindir}
 install -p -m 0755 ./butane %{buildroot}%{_bindir}
-ln -s butane %{buildroot}%{_bindir}/fcct
-install -d -p %{buildroot}%{_datadir}/butane
-install -p -m 0644 ./butane-aarch64-apple-darwin %{buildroot}%{_datadir}/butane
-install -p -m 0644 ./butane-aarch64-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane
-install -p -m 0644 ./butane-ppc64le-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane
-install -p -m 0644 ./butane-s390x-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane
-install -p -m 0644 ./butane-x86_64-apple-darwin %{buildroot}%{_datadir}/butane
-install -p -m 0644 ./butane-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/butane
-install -p -m 0644 ./butane-x86_64-unknown-linux-gnu-static %{buildroot}%{_datadir}/butane
+install -d -p %{buildroot}%{_datadir}/butane-redistributable
+install -p -m 0644 ./butane-darwin-amd64 %{buildroot}%{_datadir}/butane-redistributable
+install -p -m 0644 ./butane-windows-amd64.exe %{buildroot}%{_datadir}/butane-redistributable
 
 %if %{with check}
 %check
@@ -131,85 +107,29 @@ install -p -m 0644 ./butane-x86_64-unknown-linux-gnu-static %{buildroot}%{_datad
 %license %{golicenses}
 %doc %{godocs}
 %{_bindir}/butane
-%{_bindir}/fcct
 
 %files redistributable
 %license %{golicenses}
-%dir %{_datadir}/butane
-%{_datadir}/butane/butane-aarch64-apple-darwin
-%{_datadir}/butane/butane-aarch64-unknown-linux-gnu-static
-%{_datadir}/butane/butane-ppc64le-unknown-linux-gnu-static
-%{_datadir}/butane/butane-s390x-unknown-linux-gnu-static
-%{_datadir}/butane/butane-x86_64-apple-darwin
-%{_datadir}/butane/butane-x86_64-pc-windows-gnu.exe
-%{_datadir}/butane/butane-x86_64-unknown-linux-gnu-static
+%dir %{_datadir}/butane-redistributable
+%{_datadir}/butane-redistributable/butane-darwin-amd64
+%{_datadir}/butane-redistributable/butane-windows-amd64.exe
 
 %changelog
-* Thu Dec 12 2024 Yasmin Valim <ydesouza@redhat.com> - 0.23.0-1
-- new version
-
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.22.0-2
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.22.0-1
-- Rebuilt for MSVSphere 10
-
-* Thu Sep 26 2024 Yasmin Valim <ydesouza@redhat.com> - 0.22.0-1
+* Wed Oct 18 2023 Steven Presti <spresti@redhat.com> - 0.19.0-1
 - new version
 
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.19.0-4
-- Bump release for June 2024 mass rebuild
+* Thu Apr 06 2023 Steven Presti <spresti@redhat.com> - 0.18.0-1
+- New version
 
-* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Tue Oct 03 2023 Steven Presti <spresti@redhat.com> - 0.19.0-1
+* Mon Jan 09 2023 Sohan Kunkerkar <skunkerk@redhat.com> - 0.17.0-1
 - New release
 
-* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Mar 28 2023 Steven Presti <spresti@redhat.com> - 0.18.0-1
+* Mon Oct 17 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.16.0-1
 - New release
 
-* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.17.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Wed Jan 4 2023 Sohan Kunkerkar <skunkerk@redhat.com> - 0.17.0-1
-- New release
-
-* Fri Oct 14 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.16.0-1
-- New release
-- Switch License tags to SPDX
-
-* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jun 27 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.15.0-2
-- Add macOS aarch64 binary to -redistributable
-
-* Mon Jun 27 2022 Steven Presti <spresti@redhat.com> - 0.15.0-1
-- New release
-
-* Fri Jun 17 2022 Robert-André Mauchin <zebob.m@gmail.com> - 0.14.0-2
-- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
-
 * Thu Jan 27 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.14.0-1
 - New release
 
-* Tue Jan 25 2022 Benjamin Gilbert <bgilbert@redhat.com> - 0.13.1-3
-- Rename -nonlinux subpackage to -redistributable
-- Add static Linux binaries to -redistributable
-- Enable %%gocheck only on Fedora
-
-* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.13.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
 * Wed Aug 04 2021 Benjamin Gilbert <bgilbert@redhat.com> - 0.13.1-1
 - New release