public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <filiperosset@fedoraproject.org>
To: git-commits@fedoraproject.org
Subject: [rpms/byobu] rawhide: remove upstreamed patches
Date: Wed, 10 Jun 2026 01:55:59 GMT	[thread overview]
Message-ID: <178105655903.1.16620134013206592994.rpms-byobu-bc5ebdaa2a9b@fedoraproject.org> (raw)

            A new commit has been pushed.

            Repo   : rpms/byobu
            Branch : rawhide
            Commit : bc5ebdaa2a9b16161dffd3c31c204f0519b9b413
            Author : Filipe Rosset <filiperosset@fedoraproject.org>
            Date   : 2026-06-09T22:55:49-03:00
            Stats  : +0/-84 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/byobu/c/bc5ebdaa2a9b16161dffd3c31c204f0519b9b413?branch=rawhide

            Log:
            remove upstreamed patches

Signed-off-by: Filipe Rosset <filiperosset@fedoraproject.org>

---
diff --git a/0001-byobu-autostart-with-fish-shell.patch b/0001-byobu-autostart-with-fish-shell.patch
deleted file mode 100644
index fd847c6..0000000
--- a/0001-byobu-autostart-with-fish-shell.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 974db3df3f752e21e429a46960ef796cf40f4cc7 Mon Sep 17 00:00:00 2001
-From: Priscila Gutierres <prgutier@redhat.com>
-Date: Sun, 5 Jan 2025 15:01:33 -0300
-Subject: [PATCH] change
-
----
- usr/bin/byobu-shell.in | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/usr/bin/byobu-shell.in b/usr/bin/byobu-shell.in
-index 4610a54..2de4745 100755
---- a/usr/bin/byobu-shell.in
-+++ b/usr/bin/byobu-shell.in
-@@ -40,9 +40,6 @@ if [ ! -e "$FLAG" ]; then
- 	echo
- 	touch "$FLAG"
- fi
-+[ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" || exec /bin/sh
- 
--# This needs to be a -l login shell, in order to source profiles
--# and colorize the prompt
--[ -n "$SHELL" -a -x "$SHELL" ] && exec "$SHELL" -l || exec /bin/sh -l
--
--# vi: syntax=sh ts=4 noexpandtab
-+#vi: syntax=sh ts=4 noexpandtab
--- 
-2.47.1
-

diff --git a/0002-byobu-use-dnf.patch b/0002-byobu-use-dnf.patch
deleted file mode 100644
index 6588bf8..0000000
--- a/0002-byobu-use-dnf.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-=== modified file 'usr/lib/byobu/updates_available'
---- usr/lib/byobu/updates_available	2019-05-26 19:15:34 +0000
-+++ usr/lib/byobu/updates_available	2022-03-14 10:11:43 +0000
-@@ -54,6 +54,9 @@
- 	elif eval $BYOBU_TEST apt-get >/dev/null; then
- 		# If apt-get exists, use it
- 		flock -xn "$flock" apt-get -s -o Debug::NoLocking=true upgrade | grep -c ^Inst >$mycache 2>/dev/null &
-+	elif eval $BYOBU_TEST dnf >/dev/null; then
-+		# If dnf exists, use it
-+		flock -xn "$flock" dnf list --upgrades -q -y | grep -vc "Available Upgrades" >$mycache 2>/dev/null &
- 	elif eval $BYOBU_TEST pkcon >/dev/null; then
- 		# use packagekit to show list of packages
- 		LC_ALL=C flock -xn "$flock" pkcon get-updates -p | awk '/^Results:$/ { start=NR }; /^Security/ { security++ }; END { if (!/There are no updates available at this time./) { print NR-start, security }}' > "$mycache" 2>/dev/null &
-@@ -103,6 +106,9 @@
- 		else
- 			return 1
- 		fi
-+	elif [ -e "/var/cache/dnf/packages.db" ]; then
-+		[ "/var/cache/dnf/packages.db" -nt "$mycache" ]
-+		return $?
- 	elif [ -e "/var/lib/PackageKit/transactions.db" ]; then
- 		[ "/var/lib/PackageKit/transactions.db" -nt "$mycache" ]
- 		return $?
-

diff --git a/0002-byobu-use-dnf5.patch b/0002-byobu-use-dnf5.patch
deleted file mode 100644
index de62991..0000000
--- a/0002-byobu-use-dnf5.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-=== modified file 'usr/lib/byobu/updates_available'
---- usr/lib/byobu/updates_available	2019-05-26 19:15:34 +0000
-+++ usr/lib/byobu/updates_available	2022-03-14 10:11:43 +0000
-@@ -54,6 +54,9 @@
- 	elif eval $BYOBU_TEST apt-get >/dev/null; then
- 		# If apt-get exists, use it
- 		flock -xn "$flock" apt-get -s -o Debug::NoLocking=true upgrade | grep -c ^Inst >$mycache 2>/dev/null &
-+	elif eval $BYOBU_TEST dnf >/dev/null; then
-+		# If dnf exists, use it
-+		flock -xn "$flock" dnf list --upgrades -q -y | grep -vc "Available Upgrades" >$mycache 2>/dev/null &
- 	elif eval $BYOBU_TEST pkcon >/dev/null; then
- 		# use packagekit to show list of packages
- 		LC_ALL=C flock -xn "$flock" pkcon get-updates -p | awk '/^Results:$/ { start=NR }; /^Security/ { security++ }; END { if (!/There are no updates available at this time./) { print NR-start, security }}' > "$mycache" 2>/dev/null &
-@@ -103,6 +106,10 @@
- 		else
- 			return 1
- 		fi
-+	elif [ -e "/var/cache/libdnf5" ]; then
-+		NEWEST=$(ls -td /var/cache/libdnf5/*/ | head -1)
-+		[ "$NEWEST" -nt "$mycache" ]
-+		return $?
- 	elif [ -e "/var/lib/PackageKit/transactions.db" ]; then
- 		[ "/var/lib/PackageKit/transactions.db" -nt "$mycache" ]
- 		return $?
-

diff --git a/byobu.spec b/byobu.spec
index 46b3863..a5a6a5a 100644
--- a/byobu.spec
+++ b/byobu.spec
@@ -15,13 +15,6 @@ Source0:	%{url}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # Default windows examples
 Source1:	fedoracommon
 
-# prefer dnf when installed
-# sent upstream: https://code.launchpad.net/~sanjay-ankur/byobu/byobu/+merge/415959
-Patch0:		0002-byobu-use-dnf.patch
-
-# for F41+ where we have dnf5
-Patch1:		0002-byobu-use-dnf5.patch
-
 BuildArch:	noarch
 BuildRequires:	automake
 BuildRequires:	desktop-file-utils

                 reply	other threads:[~2026-06-10  1:55 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=178105655903.1.16620134013206592994.rpms-byobu-bc5ebdaa2a9b@fedoraproject.org \
    --to=filiperosset@fedoraproject.org \
    --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