From e70b50444ce540060509ee266a08f69501a8bea5 Mon Sep 17 00:00:00 2001
From: Tom spot Callaway <spot@fedoraproject.org>
Date: Wed, 29 Dec 2021 12:03:48 -0500
Subject: [PATCH] update to 1.35.0, use modern macros

---
 .gitignore   |  1 +
 busybox.spec | 22 +++++++++++++---------
 sources      |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5be0024..d9c1911 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ busybox-1.15.1.tar.bz2
 /busybox-1.33.1.tar.bz2
 /busybox-1.34.0.tar.bz2
 /busybox-1.34.1.tar.bz2
+/busybox-1.35.0.tar.bz2
diff --git a/busybox.spec b/busybox.spec
index 2af300c..ec49fff 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -1,6 +1,6 @@
 Summary: Statically linked binary providing simplified versions of system commands
 Name: busybox
-Version: 1.34.1
+Version: 1.35.0
 Release: 1%{?dist}
 Epoch: 1
 License: GPLv2
@@ -108,25 +108,29 @@ cp busybox_unstripped busybox.petitboot
 cp docs/busybox.1 docs/busybox.petitboot.1
 
 %install
-mkdir -p $RPM_BUILD_ROOT/sbin
-install -m 755 busybox.static $RPM_BUILD_ROOT/sbin/busybox
-install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot
-mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1
-install -m 644 docs/busybox.static.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
-install -m 644 docs/busybox.petitboot.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.petitboot.1
+mkdir -p %{buildroot}%{_sbindir}
+install -m 755 busybox.static %{buildroot}%{_sbindir}/busybox
+install -m 755 busybox.petitboot %{buildroot}%{_sbindir}/busybox.petitboot
+mkdir -p %{buildroot}%{_mandir}/man1
+install -m 644 docs/busybox.static.1 %{buildroot}%{_mandir}/man1/busybox.1
+install -m 644 docs/busybox.petitboot.1 %{buildroot}%{_mandir}/man1/busybox.petitboot.1
 
 
 %files
 %doc LICENSE README
-/sbin/busybox
+%{_sbindir}/busybox
 %{_mandir}/man1/busybox.1.gz
 
 %files petitboot
 %doc LICENSE README
-/sbin/busybox.petitboot
+%{_sbindir}/busybox.petitboot
 %{_mandir}/man1/busybox.petitboot.1.gz
 
 %changelog
+* Wed Dec 29 2021 Tom Callaway <spot@fedoraproject.org> - 1:1.35.0-1
+- update to 1.35.0
+- use modern macros and install into %%{_sbindir}
+
 * Thu Sep 30 2021 Tom Callaway <spot@fedoraproject.org> - 1:1.34.1-1
 - update to 1.34.1
 
diff --git a/sources b/sources
index 2805ca5..a24d4f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (busybox-1.34.1.tar.bz2) = fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
+SHA512 (busybox-1.35.0.tar.bz2) = 62b2e718b6669271380445ed6db249618d777a4e8d5e6d879fa39ffee43887b6a2e93ceef874c615c565ad492deb772b03a19b7475c403202741579fb151e16a
-- 
2.45.2