Skip to content

Commit 581bc70

Browse files
authored
Merge pull request #1004 from HuijingHei/sync-spec
spec: Sync with changes in Fedora
2 parents 9c05c61 + 446e927 commit 581bc70

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

contrib/packaging/bootupd.spec

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@ Summary: Bootloader updater
99

1010
License: Apache-2.0
1111
URL: https://github.com/coreos/bootupd
12-
Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.tar.zstd
12+
Source0: %{crates_source}
1313
Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
1414
%if 0%{?fedora} || 0%{?rhel} >= 10
1515
ExcludeArch: %{ix86}
1616
%endif
1717

18-
BuildRequires: git-core
1918
# For now, see upstream
2019
BuildRequires: make
2120
BuildRequires: openssl-devel
@@ -57,18 +56,12 @@ License: Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND BSD-3-Clause
5756
%{_unitdir}/bootloader-update.service
5857

5958
%prep
60-
%autosetup -n %{crate}-%{version} -p1 -Sgit -a1
61-
# Default -v vendor config doesn't support non-crates.io deps (i.e. git)
62-
cp .cargo/vendor-config.toml .
63-
%cargo_prep -N
64-
cat vendor-config.toml >> .cargo/config.toml
65-
rm vendor-config.toml
59+
%autosetup -n %{crate}-%{version} -p1 -a1
60+
%cargo_prep -v vendor
6661

6762
%build
6863
%cargo_build
6964
%cargo_vendor_manifest
70-
# https://pagure.io/fedora-rust/rust-packaging/issue/33
71-
sed -i -e '/https:\/\//d' cargo-vendor.txt
7265
%cargo_license_summary
7366
%{cargo_license} > LICENSE.dependencies
7467

0 commit comments

Comments
 (0)