public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Michal Hlavinka <mhlavink@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/iotop-c] epel8: update for bin and sbin merge, fixes FTBFS
Date: Sun, 02 Aug 2026 01:06:48 GMT [thread overview]
Message-ID: <178563280844.1.13997175280690923078.rpms-iotop-c-e7070af5e2f7@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/iotop-c
Branch : epel8
Commit : e7070af5e2f7c23096115d824ab21a596d4b3415
Author : Michal Hlavinka <mhlavink@redhat.com>
Date : 2025-01-22T00:03:58+01:00
Stats : +34/-3 in 2 file(s)
URL : https://src.fedoraproject.org/rpms/iotop-c/c/e7070af5e2f7c23096115d824ab21a596d4b3415?branch=epel8
Log:
update for bin and sbin merge, fixes FTBFS
https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
---
diff --git a/iotop-1.27-sbindir.patch b/iotop-1.27-sbindir.patch
new file mode 100644
index 0000000..0d6f20a
--- /dev/null
+++ b/iotop-1.27-sbindir.patch
@@ -0,0 +1,27 @@
+diff --git a/Makefile b/Makefile
+index bffac53..6e23df7 100644
+--- a/Makefile
++++ b/Makefile
+@@ -36,6 +36,7 @@ CFLAGS+=-fanalyzer
+ endif
+
+ PREFIX?=$(DESTDIR)/usr
++BINDIR?=$(PREFIX)/sbin
+ INSTALL?=install
+ STRIP?=strip
+
+@@ -145,12 +146,12 @@ install: $(TARGET)
+ $(E) STRIP $(TARGET)
+ $(Q)$(STRIP) $(TARGET)
+ $(E) INSTALL $(TARGET)
+- $(Q)$(INSTALL) -D -m 0755 $(TARGET) $(PREFIX)/sbin/$(TARGET)
++ $(Q)$(INSTALL) -D -m 0755 $(TARGET) $(BINDIR)/$(TARGET)
+ $(Q)$(INSTALL) -D -m 0644 iotop.8 $(PREFIX)/share/man/man8/iotop.8
+
+ uninstall:
+ $(E) UNINSTALL $(TARGET)
+- $(Q)rm -f $(PREFIX)/sbin/$(TARGET)
++ $(Q)rm -f $(BINDIR)/$(TARGET)
+ $(Q)rm -f $(PREFIX)/share/man/man8/iotop.8
+
+ bld/.mkdir:
diff --git a/iotop-c.spec b/iotop-c.spec
index a668ae0..3e073df 100644
--- a/iotop-c.spec
+++ b/iotop-c.spec
@@ -1,6 +1,6 @@
Name: iotop-c
Version: 1.27
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Simple top-like I/O monitor (implemented in C)
License: GPL-2.0-or-later
@@ -8,6 +8,7 @@ URL: https://github.com/Tomas-M/iotop/
Source0: https://github.com/Tomas-M/iotop/releases/download/v%{version}/iotop-%{version}.tar.xz
Source1: https://github.com/Tomas-M/iotop/releases/download/v%{version}/iotop-%{version}.tar.xz.asc
Source2: https://raw.githubusercontent.com/Tomas-M/iotop/v%{version}/debian/upstream/signing-key.asc
+Patch1: iotop-1.27-sbindir.patch
Provides: iotop
Obsoletes: iotop < 0.7
@@ -44,15 +45,18 @@ possible.
NO_FLTO=1 %make_build
%install
-V=1 STRIP=: %make_install
+V=1 STRIP=: BINDIR=$RPM_BUILD_ROOT%{_bindir} %make_install
%files
%license COPYING
%license LICENSE
-%{_sbindir}/iotop
+%{_bindir}/iotop
%{_mandir}/man8/iotop.8*
%changelog
+* Wed Jan 22 2025 Michal Hlavinka <mhlavink@redhat.com> - 1.27-3
+- update for bin and sbin merge https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin
+
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
reply other threads:[~2026-08-02 1:06 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178563280844.1.13997175280690923078.rpms-iotop-c-e7070af5e2f7@fedoraproject.org \
--to=mhlavink@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox