rpms/butane
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Rename subpackage for Windows & macOS binaries

Browse Source 
Resolves: rhbz#2013681
This commit is contained in:
Timothée Ravier 2022-01-10 20:21:50 +01:00
parent f793921433
commit 1bda253b40
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
butane.spec
View File

@ -60,18 +60,16 @@ Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.0-20191010095647.gitfc94e3f716
%description %description
%{common_description} %{common_description}
%package nonlinux %package redistributable
Summary: Butane for macOS and Windows Summary: Butane for macOS and Windows
License: ASL 2.0 License: ASL 2.0
BuildArch: noarch BuildArch: noarch
%description nonlinux %description redistributable
%{common_description} %{common_description}
This package contains macOS and Windows Butane binaries built through This package contains macOS and Windows Butane binaries built through
cross-compilation. Do not install it. It is only used for building release cross-compilation.
binaries to be signed by Fedora release engineering and uploaded to the
Butane GitHub releases page.
%prep %prep
%goprep -k %goprep -k
@ -87,18 +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 %global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x
echo "Building macOS Butane..." echo "Building macOS Butane..."
GOARCH=amd64 GOOS=darwin %gocrossbuild -o butane-x86_64-apple-darwin internal/main.go GOARCH=amd64 GOOS=darwin %gocrossbuild -o butane-darwin-amd64 internal/main.go
echo "Building Windows Butane..." 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
install -d -p %{buildroot}%{_bindir} install -d -p %{buildroot}%{_bindir}
install -p -m 0755 ./butane %{buildroot}%{_bindir} install -p -m 0755 ./butane %{buildroot}%{_bindir}
ln -s butane %{buildroot}%{_bindir}/fcct ln -s butane %{buildroot}%{_bindir}/fcct
install -d -p %{buildroot}%{_datadir}/butane install -d -p %{buildroot}%{_datadir}/butane-redistributable
install -p -m 0644 ./butane-x86_64-apple-darwin %{buildroot}%{_datadir}/butane install -p -m 0644 ./butane-darwin-amd64 %{buildroot}%{_datadir}/butane-redistributable
install -p -m 0644 ./butane-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/butane install -p -m 0644 ./butane-windows-amd64.exe %{buildroot}%{_datadir}/butane-redistributable
%if %{with check} %if %{with check}
%check %check
@ -111,11 +109,11 @@ install -p -m 0644 ./butane-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/bu
%{_bindir}/butane %{_bindir}/butane
%{_bindir}/fcct %{_bindir}/fcct
%files nonlinux %files redistributable
%license %{golicenses} %license %{golicenses}
%dir %{_datadir}/butane %dir %{_datadir}/butane-redistributable
%{_datadir}/butane/butane-x86_64-apple-darwin %{_datadir}/butane-redistributable/butane-darwin-amd64
%{_datadir}/butane/butane-x86_64-pc-windows-gnu.exe %{_datadir}/butane-redistributable/butane-windows-amd64.exe
%changelog %changelog
* Wed Aug 04 2021 Benjamin Gilbert <bgilbert@redhat.com> - 0.13.1-1 * Wed Aug 04 2021 Benjamin Gilbert <bgilbert@redhat.com> - 0.13.1-1