From 3e51bc48150cf6af56fa1580212637cbd272875d Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 13 Dec 2017 23:33:26 +0100
Subject: [PATCH 01/38] Update to 0.0.11

---
 sensible-utils.spec          | 32 ++++++++++++++++++++++----------
 sensible-utils_editors.patch | 29 ++++++++++++++++-------------
 sensible-utils_gettext.patch | 31 +++++++++++++++++++++++++++++++
 sensible-utils_stderr.patch  |  6 +++---
 4 files changed, 72 insertions(+), 26 deletions(-)
 create mode 100644 sensible-utils_gettext.patch

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 9eb9d24..c71557e 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,18 +1,26 @@
 Name:           sensible-utils
-Version:        0.0.9
-Release:        8%{?dist}
+Version:        0.0.11
+Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
 License:        GPLv2+
 URL:            https://packages.debian.org/unstable/admin/%{name}
-Source0:        http://ftp.de.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.tar.gz
+Source0:        http://ftp.de.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.tar.xz
+
+BuildRequires:  automake autoconf
+BuildRequires:  make
+BuildRequires:  po4a
+
+# Needed by select-editor
+Requires:       gettext
 
 # Silence stderr when looking for $EDITOR, $VISUAL and $SELECTED_EDITOR (#1467077)
 Patch0:         sensible-utils_stderr.patch
 # Use --config instead of --list in update-alternatives --config editor (#1489159)
 Patch1:         sensible-utils_editors.patch
-
+# Just require gettext instead of installing a wrapper
+Patch2:         sensible-utils_gettext.patch
 
 %description
 This package provides a number of small utilities which are used by programs to
@@ -20,15 +28,13 @@ sensibly select and spawn an appropriate browser, editor, or pager.
 
 
 %prep
-%autosetup -p1
-
-# The french manpage is latin1, the german and spanish ones are encoded with
-# some unusable non-iso encoding and are left as is.
-file=po4a/fr/sensible-editor.1
-iconv -f latin1 -t utf8 < $file > $file.new && mv -f $file.new $file
+%autosetup -p1 -n %{name}.git
 
 
 %build
+# Needed for Patch2
+autoreconf -ifv
+
 %configure
 %make_build
 
@@ -47,6 +53,12 @@ iconv -f latin1 -t utf8 < $file > $file.new && mv -f $file.new $file
 
 
 %changelog
+* Wed Dec 13 2017 Sandro Mani <manisandro@gmail.com> - 0.0.11-1
+- Update to 0.0.11
+
+* Tue Oct 31 2017 Sandro Mani <manisandro@gmail.com> - 0.0.10-1
+- Update to 0.0.10
+
 * Wed Sep 06 2017 Sandro Mani <manisandro@gmail.com> - 0.0.9-8
 - Use --config instead of --list in update-alternatives --config editor
 
diff --git a/sensible-utils_editors.patch b/sensible-utils_editors.patch
index ca52715..3a231ef 100644
--- a/sensible-utils_editors.patch
+++ b/sensible-utils_editors.patch
@@ -1,18 +1,21 @@
-diff -rupN sensible-utils-0.0.9/select-editor sensible-utils-0.0.9-new/select-editor
---- sensible-utils-0.0.9/select-editor	2013-06-06 14:22:08.000000000 +0200
-+++ sensible-utils-0.0.9-new/select-editor	2017-09-06 22:43:28.275849873 +0200
-@@ -8,12 +8,12 @@ PATH=$PATH:/usr/sbin
- # Ensure that $HOME/.selected_editor is writeable
+diff -rupN sensible-utils.git/select-editor.in sensible-utils.git-new/select-editor.in
+--- sensible-utils.git/select-editor.in	2017-11-15 11:33:17.000000000 +0100
++++ sensible-utils.git-new/select-editor.in	2017-12-13 23:03:58.975511633 +0100
+@@ -14,7 +14,7 @@ EASIEST="/bin/nano"
  touch $HOME/.selected_editor || exit 1
  
+ sorted_list_of_editors() {
+-               update-alternatives --query editor | while read emptyline; do
++               update-alternatives --config editor | while read emptyline; do
+                        # skip the first entry (header) as well as the rest of processed entries
+                        if [ -z "$emptyline" ]; then continue; fi
+ 
+@@ -35,7 +35,7 @@ sorted_list_of_editors() {
+ }
+ 
+ 
 -editors=`update-alternatives --list editor | wc -l`
 +editors=`update-alternatives --config editor | wc -l`
  if [ $editors -gt 1 ]; then
- 	echo
- 	echo "`gettext 'Select an editor.  To change later, run'`" "'select-editor'."
- 	i=0
--	editors=`update-alternatives --list editor`
-+	editors=`update-alternatives --config editor`
- 	for e in $editors; do
- 		i=`expr $i + 1`
- 		desc=
+         # fix simple to 1 see #777168
+         simple=1
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
new file mode 100644
index 0000000..c969a1b
--- /dev/null
+++ b/sensible-utils_gettext.patch
@@ -0,0 +1,31 @@
+diff -rupN sensible-utils.git/Makefile.am sensible-utils.git-new/Makefile.am
+--- sensible-utils.git/Makefile.am	2017-11-15 11:33:17.000000000 +0100
++++ sensible-utils.git-new/Makefile.am	2017-12-13 23:23:51.514132587 +0100
+@@ -5,8 +5,6 @@ SUBDIRS = man
+ 
+ TESTS =
+ 
+-binpkgdatadir = $(pkgdatadir)/bin
+-
+ edit = sed \
+              -e 's|@binpkgdatadir[@]|$(binpkgdatadir)|g' \
+              -e 's|@prefix[@]|$(prefix)|g'
+@@ -23,4 +21,3 @@ select-editor: $(srcdir)/select-editor.i
+ 
+ 
+ bin_SCRIPTS = sensible-browser sensible-editor sensible-pager select-editor
+-binpkgdata_SCRIPTS = tools/gettext
+diff -rupN sensible-utils.git/select-editor.in sensible-utils.git-new/select-editor.in
+--- sensible-utils.git/select-editor.in	2017-12-13 23:24:05.133136734 +0100
++++ sensible-utils.git-new/select-editor.in	2017-12-13 23:23:39.060128507 +0100
+@@ -3,10 +3,6 @@
+ # To generate localization information, run:
+ #   xgettext -o - -L Shell select-editor
+ 
+-# if no gettext it will fallback to gettext on /usr/share/sensible-utils/bin
+-# see #728612
+-PATH=$PATH:/usr/sbin:@binpkgdatadir@
+-
+ # EASIEST editor
+ EASIEST="/bin/nano"
+ 
diff --git a/sensible-utils_stderr.patch b/sensible-utils_stderr.patch
index a530ea9..f6930cd 100644
--- a/sensible-utils_stderr.patch
+++ b/sensible-utils_stderr.patch
@@ -1,6 +1,6 @@
-diff -rupN sensible-utils-0.0.9/sensible-editor sensible-utils-0.0.9-new/sensible-editor
---- sensible-utils-0.0.9/sensible-editor	2013-06-06 03:10:34.000000000 +0200
-+++ sensible-utils-0.0.9-new/sensible-editor	2017-07-14 11:47:14.973126644 +0200
+diff -rupN sensible-utils.git/sensible-editor sensible-utils.git-new/sensible-editor
+--- sensible-utils.git/sensible-editor	2013-06-06 03:10:34.000000000 +0200
++++ sensible-utils.git-new/sensible-editor	2017-12-13 23:00:52.150508370 +0100
 @@ -4,9 +4,9 @@ ret="$?"
  
  # Prevent recursive loops, where these values are set to this script

From 4bfb5011afbc51777986b417af2ada712b4dcac9 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 14 Dec 2017 10:55:35 +0100
Subject: [PATCH 02/38] Update sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 3b2abdd..d68ea8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /sensible-utils_0.0.9.tar.gz
+/sensible-utils_0.0.11.tar.xz
diff --git a/sources b/sources
index ab9a1ff..d625653 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-559012932ffa95a7bbd8f8423869b652  sensible-utils_0.0.9.tar.gz
+SHA512 (sensible-utils_0.0.11.tar.xz) = 41847f91651e30051220446ce6d6d8b5e56442b050a955e1b33881dafd1e204db8a356ffe56fd465da9f92c736c59e040d2cc273036ce081162f5f56147d1796

From 9817dde560e46d9328286a8dbf1dee3731a043a2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 9 Feb 2018 16:30:20 +0000
Subject: [PATCH 03/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index c71557e..6c81c8d 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.11
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Wed Dec 13 2017 Sandro Mani <manisandro@gmail.com> - 0.0.11-1
 - Update to 0.0.11
 

From 48f8b61ed1fdefba37e0df45203c0fa4896e9fba Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 13 Mar 2018 10:15:13 +0100
Subject: [PATCH 04/38] Update to 0.0.12

---
 .gitignore                   |  1 +
 sensible-utils.spec          |  7 +++++--
 sensible-utils_editors.patch |  2 +-
 sensible-utils_gettext.patch | 16 ++++++++--------
 sensible-utils_stderr.patch  |  2 +-
 sources                      |  2 +-
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index d68ea8c..612ee18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /sensible-utils_0.0.9.tar.gz
 /sensible-utils_0.0.11.tar.xz
+/sensible-utils_0.0.12.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index 6c81c8d..d20d0ad 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
-Version:        0.0.11
-Release:        2%{?dist}
+Version:        0.0.12
+Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Tue Mar 13 2018 Sandro Mani <manisandro@gmail.com> - 0.0.12-1
+- Update to 0.0.12
+
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.11-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
diff --git a/sensible-utils_editors.patch b/sensible-utils_editors.patch
index 3a231ef..131d275 100644
--- a/sensible-utils_editors.patch
+++ b/sensible-utils_editors.patch
@@ -1,6 +1,6 @@
 diff -rupN sensible-utils.git/select-editor.in sensible-utils.git-new/select-editor.in
 --- sensible-utils.git/select-editor.in	2017-11-15 11:33:17.000000000 +0100
-+++ sensible-utils.git-new/select-editor.in	2017-12-13 23:03:58.975511633 +0100
++++ sensible-utils.git-new/select-editor.in	2018-03-13 10:11:14.612976126 +0100
 @@ -14,7 +14,7 @@ EASIEST="/bin/nano"
  touch $HOME/.selected_editor || exit 1
  
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
index c969a1b..a5b21a1 100644
--- a/sensible-utils_gettext.patch
+++ b/sensible-utils_gettext.patch
@@ -1,23 +1,23 @@
 diff -rupN sensible-utils.git/Makefile.am sensible-utils.git-new/Makefile.am
---- sensible-utils.git/Makefile.am	2017-11-15 11:33:17.000000000 +0100
-+++ sensible-utils.git-new/Makefile.am	2017-12-13 23:23:51.514132587 +0100
-@@ -5,8 +5,6 @@ SUBDIRS = man
- 
- TESTS =
+--- sensible-utils.git/Makefile.am	2018-03-12 11:17:53.000000000 +0100
++++ sensible-utils.git-new/Makefile.am	2018-03-13 10:11:14.618976126 +0100
+@@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
+ AM_TESTS_ENVIRONMENT=\
+     PATH="$(topsrcdir):$$PATH"; export PATH;
  
 -binpkgdatadir = $(pkgdatadir)/bin
 -
  edit = sed \
               -e 's|@binpkgdatadir[@]|$(binpkgdatadir)|g' \
               -e 's|@prefix[@]|$(prefix)|g'
-@@ -23,4 +21,3 @@ select-editor: $(srcdir)/select-editor.i
+@@ -25,4 +23,3 @@ select-editor: $(srcdir)/select-editor.i
  
  
  bin_SCRIPTS = sensible-browser sensible-editor sensible-pager select-editor
 -binpkgdata_SCRIPTS = tools/gettext
 diff -rupN sensible-utils.git/select-editor.in sensible-utils.git-new/select-editor.in
---- sensible-utils.git/select-editor.in	2017-12-13 23:24:05.133136734 +0100
-+++ sensible-utils.git-new/select-editor.in	2017-12-13 23:23:39.060128507 +0100
+--- sensible-utils.git/select-editor.in	2018-03-13 10:11:14.617976126 +0100
++++ sensible-utils.git-new/select-editor.in	2018-03-13 10:11:14.618976126 +0100
 @@ -3,10 +3,6 @@
  # To generate localization information, run:
  #   xgettext -o - -L Shell select-editor
diff --git a/sensible-utils_stderr.patch b/sensible-utils_stderr.patch
index f6930cd..0802d54 100644
--- a/sensible-utils_stderr.patch
+++ b/sensible-utils_stderr.patch
@@ -1,6 +1,6 @@
 diff -rupN sensible-utils.git/sensible-editor sensible-utils.git-new/sensible-editor
 --- sensible-utils.git/sensible-editor	2013-06-06 03:10:34.000000000 +0200
-+++ sensible-utils.git-new/sensible-editor	2017-12-13 23:00:52.150508370 +0100
++++ sensible-utils.git-new/sensible-editor	2018-03-13 10:11:14.605976126 +0100
 @@ -4,9 +4,9 @@ ret="$?"
  
  # Prevent recursive loops, where these values are set to this script
diff --git a/sources b/sources
index d625653..0e19cad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.11.tar.xz) = 41847f91651e30051220446ce6d6d8b5e56442b050a955e1b33881dafd1e204db8a356ffe56fd465da9f92c736c59e040d2cc273036ce081162f5f56147d1796
+SHA512 (sensible-utils_0.0.12.tar.xz) = b1e2fbd984d97a74a2b254990514b4b83ce7c4a89a3f27f5fbc9ebffb536e05d7fbfda748228b3d2dbe3469c9ae6f327d8371481da92a4b37397d5d011e5b403

From 84eb99eb48682b3c9f0d443e030995a0f3923fc8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 14 Jul 2018 05:58:18 +0000
Subject: [PATCH 05/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index d20d0ad..6236288 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Mar 13 2018 Sandro Mani <manisandro@gmail.com> - 0.0.12-1
 - Update to 0.0.12
 

From 62a41bde2079a41fa437706fa1f9245d370fe958 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 2 Feb 2019 15:11:45 +0000
Subject: [PATCH 06/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 6236288..8b604d4 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 3965918805497bcacb10c582dfb2c930707914f8 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 26 Jul 2019 23:04:41 +0000
Subject: [PATCH 07/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 8b604d4..0555640 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From bd67c8ac1579c5b8db0f37d4d145aca8f4044d19 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 30 Jan 2020 23:13:43 +0000
Subject: [PATCH 08/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 0555640..1967196 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 3c96868606c17aa48055503a451b4a58e587583c Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 29 Jul 2020 10:32:31 +0000
Subject: [PATCH 09/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 1967196..e5dab29 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.12
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 

From 8113edd5f2d114c2f08f8ad05ff28cd440df9edc Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 15 Jan 2021 21:12:03 +0100
Subject: [PATCH 10/38] Update to 0.0.14

---
 .gitignore                   |  1 +
 sensible-utils.spec          |  7 +++++--
 sensible-utils_editors.patch |  8 ++++----
 sensible-utils_gettext.patch | 20 +++-----------------
 sensible-utils_stderr.patch  | 18 +++++++++---------
 sources                      |  2 +-
 6 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 612ee18..110f191 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /sensible-utils_0.0.9.tar.gz
 /sensible-utils_0.0.11.tar.xz
 /sensible-utils_0.0.12.tar.xz
+/sensible-utils_0.0.14.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index e5dab29..0ef43a5 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
-Version:        0.0.12
-Release:        6%{?dist}
+Version:        0.0.14
+Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Fri Jan 15 2021 Sandro Mani <manisandro@gmail.com> - 0.0.14-1
+- Update to 0.0.14
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.12-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sensible-utils_editors.patch b/sensible-utils_editors.patch
index 131d275..3e4c6b1 100644
--- a/sensible-utils_editors.patch
+++ b/sensible-utils_editors.patch
@@ -1,8 +1,8 @@
-diff -rupN sensible-utils.git/select-editor.in sensible-utils.git-new/select-editor.in
---- sensible-utils.git/select-editor.in	2017-11-15 11:33:17.000000000 +0100
-+++ sensible-utils.git-new/select-editor.in	2018-03-13 10:11:14.612976126 +0100
+diff -rupN --no-dereference sensible-utils.git/select-editor.in sensible-utils.git-new/select-editor.in
+--- sensible-utils.git/select-editor.in	2021-01-12 22:49:54.000000000 +0100
++++ sensible-utils.git-new/select-editor.in	2021-01-15 21:05:18.830354488 +0100
 @@ -14,7 +14,7 @@ EASIEST="/bin/nano"
- touch $HOME/.selected_editor || exit 1
+ touch "$HOME/.selected_editor" || exit 1
  
  sorted_list_of_editors() {
 -               update-alternatives --query editor | while read emptyline; do
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
index a5b21a1..43df02a 100644
--- a/sensible-utils_gettext.patch
+++ b/sensible-utils_gettext.patch
@@ -1,6 +1,6 @@
-diff -rupN sensible-utils.git/Makefile.am sensible-utils.git-new/Makefile.am
---- sensible-utils.git/Makefile.am	2018-03-12 11:17:53.000000000 +0100
-+++ sensible-utils.git-new/Makefile.am	2018-03-13 10:11:14.618976126 +0100
+diff -rupN --no-dereference sensible-utils.git/Makefile.am sensible-utils.git-new/Makefile.am
+--- sensible-utils.git/Makefile.am	2019-11-17 13:21:22.000000000 +0100
++++ sensible-utils.git-new/Makefile.am	2021-01-15 21:05:18.839354475 +0100
 @@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
  AM_TESTS_ENVIRONMENT=\
      PATH="$(topsrcdir):$$PATH"; export PATH;
@@ -15,17 +15,3 @@ diff -rupN sensible-utils.git/Makefile.am sensible-utils.git-new/Makefile.am
  
  bin_SCRIPTS = sensible-browser sensible-editor sensible-pager select-editor
 -binpkgdata_SCRIPTS = tools/gettext
-diff -rupN sensible-utils.git/select-editor.in sensible-utils.git-new/select-editor.in
---- sensible-utils.git/select-editor.in	2018-03-13 10:11:14.617976126 +0100
-+++ sensible-utils.git-new/select-editor.in	2018-03-13 10:11:14.618976126 +0100
-@@ -3,10 +3,6 @@
- # To generate localization information, run:
- #   xgettext -o - -L Shell select-editor
- 
--# if no gettext it will fallback to gettext on /usr/share/sensible-utils/bin
--# see #728612
--PATH=$PATH:/usr/sbin:@binpkgdatadir@
--
- # EASIEST editor
- EASIEST="/bin/nano"
- 
diff --git a/sensible-utils_stderr.patch b/sensible-utils_stderr.patch
index 0802d54..99d1067 100644
--- a/sensible-utils_stderr.patch
+++ b/sensible-utils_stderr.patch
@@ -1,16 +1,16 @@
-diff -rupN sensible-utils.git/sensible-editor sensible-utils.git-new/sensible-editor
---- sensible-utils.git/sensible-editor	2013-06-06 03:10:34.000000000 +0200
-+++ sensible-utils.git-new/sensible-editor	2018-03-13 10:11:14.605976126 +0100
+diff -rupN --no-dereference sensible-utils.git/sensible-editor sensible-utils.git-new/sensible-editor
+--- sensible-utils.git/sensible-editor	2021-01-12 23:01:50.000000000 +0100
++++ sensible-utils.git-new/sensible-editor	2021-01-15 21:05:18.821354500 +0100
 @@ -4,9 +4,9 @@ ret="$?"
  
  # Prevent recursive loops, where these values are set to this script
  p="$(which sensible-editor)"
--[ "$(which $EDITOR || true)" = "$p" ] && EDITOR=
--[ "$(which $VISUAL || true)" = "$p" ] && VISUAL=
--[ "$(which $SELECTED_EDITOR || true)" = "$p" ] && SELECTED_EDITOR=
-+[ "$(which $EDITOR 2> /dev/null || true)" = "$p" ] && EDITOR=
-+[ "$(which $VISUAL 2> /dev/null || true)" = "$p" ] && VISUAL=
-+[ "$(which $SELECTED_EDITOR 2> /dev/null || true)" = "$p" ] && SELECTED_EDITOR=
+-[ -n "$EDITOR" ] && [ "$(which $EDITOR || true)" = "$p" ] && EDITOR=
+-[ -n "$VISUAL" ] && [ "$(which $VISUAL || true)" = "$p" ] && VISUAL=
+-[ -n "$SELECTED_EDITOR" ] && [ "$(which $SELECTED_EDITOR || true)" = "$p" ] && SELECTED_EDITOR=
++[ -n "$EDITOR" ] && [ "$(which $EDITOR 2> /dev/null || true)" = "$p" ] && EDITOR=
++[ -n "$VISUAL" ] && [ "$(which $VISUAL 2> /dev/null || true)" = "$p" ] && VISUAL=
++[ -n "$SELECTED_EDITOR" ] && [ "$(which $SELECTED_EDITOR 2> /dev/null || true)" = "$p" ] && SELECTED_EDITOR=
  
  if [ -n "$VISUAL" ]; then
  	${VISUAL} "$@"
diff --git a/sources b/sources
index 0e19cad..b90324e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.12.tar.xz) = b1e2fbd984d97a74a2b254990514b4b83ce7c4a89a3f27f5fbc9ebffb536e05d7fbfda748228b3d2dbe3469c9ae6f327d8371481da92a4b37397d5d011e5b403
+SHA512 (sensible-utils_0.0.14.tar.xz) = 15ba996f811ab3a9c1f5726f35766d74aafdf925c5c2392b33c6643d6c439796a742f9d0f4625c79de640e6b5e4a6a032b768eb1bc4ac31b448f9767b0ceed44

From 09d473f0cb167bf4f5fe2cc9d83c416829bd708e Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 27 Jan 2021 20:12:44 +0000
Subject: [PATCH 11/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 0ef43a5..73a9729 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Fri Jan 15 2021 Sandro Mani <manisandro@gmail.com> - 0.0.14-1
 - Update to 0.0.14
 

From 171c82fcb60f6fc814634ffaea6c5da087fb68ea Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 23 Jul 2021 17:21:56 +0000
Subject: [PATCH 12/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 73a9729..c093356 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.14
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -53,6 +53,9 @@ autoreconf -ifv
 
 
 %changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.14-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 

From f9c12a59056ae12cadf186586dbefc5933a71f1b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 27 Aug 2021 10:48:27 +0200
Subject: [PATCH 13/38] Update to 0.0.16

---
 .gitignore                   |  1 +
 sensible-utils.spec          | 17 ++++++++---------
 sensible-utils_editors.patch | 21 ---------------------
 sensible-utils_gettext.patch |  6 +++---
 sensible-utils_stderr.patch  | 16 ----------------
 sources                      |  2 +-
 6 files changed, 13 insertions(+), 50 deletions(-)
 delete mode 100644 sensible-utils_editors.patch
 delete mode 100644 sensible-utils_stderr.patch

diff --git a/.gitignore b/.gitignore
index 110f191..f4a8183 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /sensible-utils_0.0.11.tar.xz
 /sensible-utils_0.0.12.tar.xz
 /sensible-utils_0.0.14.tar.xz
+/sensible-utils_0.0.16.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index c093356..5fa7cb6 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
-Version:        0.0.14
-Release:        3%{?dist}
+Version:        0.0.16
+Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -15,12 +15,8 @@ BuildRequires:  po4a
 # Needed by select-editor
 Requires:       gettext
 
-# Silence stderr when looking for $EDITOR, $VISUAL and $SELECTED_EDITOR (#1467077)
-Patch0:         sensible-utils_stderr.patch
-# Use --config instead of --list in update-alternatives --config editor (#1489159)
-Patch1:         sensible-utils_editors.patch
 # Just require gettext instead of installing a wrapper
-Patch2:         sensible-utils_gettext.patch
+Patch0:         sensible-utils_gettext.patch
 
 %description
 This package provides a number of small utilities which are used by programs to
@@ -28,11 +24,11 @@ sensibly select and spawn an appropriate browser, editor, or pager.
 
 
 %prep
-%autosetup -p1 -n %{name}.git
+%autosetup -p1 -n %{name}
 
 
 %build
-# Needed for Patch2
+# Needed for Patch0
 autoreconf -ifv
 
 %configure
@@ -53,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Fri Aug 27 2021 Sandro Mani <manisandro@gmail.com> - 0.0.16-1
+- Update to 0.0.16
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.14-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sensible-utils_editors.patch b/sensible-utils_editors.patch
deleted file mode 100644
index 3e4c6b1..0000000
--- a/sensible-utils_editors.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN --no-dereference sensible-utils.git/select-editor.in sensible-utils.git-new/select-editor.in
---- sensible-utils.git/select-editor.in	2021-01-12 22:49:54.000000000 +0100
-+++ sensible-utils.git-new/select-editor.in	2021-01-15 21:05:18.830354488 +0100
-@@ -14,7 +14,7 @@ EASIEST="/bin/nano"
- touch "$HOME/.selected_editor" || exit 1
- 
- sorted_list_of_editors() {
--               update-alternatives --query editor | while read emptyline; do
-+               update-alternatives --config editor | while read emptyline; do
-                        # skip the first entry (header) as well as the rest of processed entries
-                        if [ -z "$emptyline" ]; then continue; fi
- 
-@@ -35,7 +35,7 @@ sorted_list_of_editors() {
- }
- 
- 
--editors=`update-alternatives --list editor | wc -l`
-+editors=`update-alternatives --config editor | wc -l`
- if [ $editors -gt 1 ]; then
-         # fix simple to 1 see #777168
-         simple=1
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
index 43df02a..21d93f3 100644
--- a/sensible-utils_gettext.patch
+++ b/sensible-utils_gettext.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference sensible-utils.git/Makefile.am sensible-utils.git-new/Makefile.am
---- sensible-utils.git/Makefile.am	2019-11-17 13:21:22.000000000 +0100
-+++ sensible-utils.git-new/Makefile.am	2021-01-15 21:05:18.839354475 +0100
+diff -rupN --no-dereference sensible-utils/Makefile.am sensible-utils-new/Makefile.am
+--- sensible-utils/Makefile.am	2021-08-07 16:03:18.000000000 +0200
++++ sensible-utils-new/Makefile.am	2021-08-27 10:31:06.183121257 +0200
 @@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
  AM_TESTS_ENVIRONMENT=\
      PATH="$(topsrcdir):$$PATH"; export PATH;
diff --git a/sensible-utils_stderr.patch b/sensible-utils_stderr.patch
deleted file mode 100644
index 99d1067..0000000
--- a/sensible-utils_stderr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -rupN --no-dereference sensible-utils.git/sensible-editor sensible-utils.git-new/sensible-editor
---- sensible-utils.git/sensible-editor	2021-01-12 23:01:50.000000000 +0100
-+++ sensible-utils.git-new/sensible-editor	2021-01-15 21:05:18.821354500 +0100
-@@ -4,9 +4,9 @@ ret="$?"
- 
- # Prevent recursive loops, where these values are set to this script
- p="$(which sensible-editor)"
--[ -n "$EDITOR" ] && [ "$(which $EDITOR || true)" = "$p" ] && EDITOR=
--[ -n "$VISUAL" ] && [ "$(which $VISUAL || true)" = "$p" ] && VISUAL=
--[ -n "$SELECTED_EDITOR" ] && [ "$(which $SELECTED_EDITOR || true)" = "$p" ] && SELECTED_EDITOR=
-+[ -n "$EDITOR" ] && [ "$(which $EDITOR 2> /dev/null || true)" = "$p" ] && EDITOR=
-+[ -n "$VISUAL" ] && [ "$(which $VISUAL 2> /dev/null || true)" = "$p" ] && VISUAL=
-+[ -n "$SELECTED_EDITOR" ] && [ "$(which $SELECTED_EDITOR 2> /dev/null || true)" = "$p" ] && SELECTED_EDITOR=
- 
- if [ -n "$VISUAL" ]; then
- 	${VISUAL} "$@"
diff --git a/sources b/sources
index b90324e..0b425d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.14.tar.xz) = 15ba996f811ab3a9c1f5726f35766d74aafdf925c5c2392b33c6643d6c439796a742f9d0f4625c79de640e6b5e4a6a032b768eb1bc4ac31b448f9767b0ceed44
+SHA512 (sensible-utils_0.0.16.tar.xz) = c2dfb6a4eca210c69492ce967c1d3c12531e512b47b0c33179ad5f9dd2e7975b4383c9c0f6c6f6a27a7d9544fcffdeba1935fe85446ba4afb2c34a3b559c92e5

From 6e31b711c87dfca7555100ceb6c697ab24993f3b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Mon, 30 Aug 2021 14:16:31 +0200
Subject: [PATCH 14/38] Update to 0.0.17

---
 .gitignore                   | 1 +
 sensible-utils.spec          | 5 ++++-
 sensible-utils_gettext.patch | 2 +-
 sources                      | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f4a8183..12e0e99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /sensible-utils_0.0.12.tar.xz
 /sensible-utils_0.0.14.tar.xz
 /sensible-utils_0.0.16.tar.xz
+/sensible-utils_0.0.17.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index 5fa7cb6..8266114 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,5 +1,5 @@
 Name:           sensible-utils
-Version:        0.0.16
+Version:        0.0.17
 Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
@@ -49,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Mon Aug 30 2021 Sandro Mani <manisandro@gmail.com> - 0.0.17-1
+- Update to 0.0.17
+
 * Fri Aug 27 2021 Sandro Mani <manisandro@gmail.com> - 0.0.16-1
 - Update to 0.0.16
 
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
index 21d93f3..4781c0e 100644
--- a/sensible-utils_gettext.patch
+++ b/sensible-utils_gettext.patch
@@ -1,6 +1,6 @@
 diff -rupN --no-dereference sensible-utils/Makefile.am sensible-utils-new/Makefile.am
 --- sensible-utils/Makefile.am	2021-08-07 16:03:18.000000000 +0200
-+++ sensible-utils-new/Makefile.am	2021-08-27 10:31:06.183121257 +0200
++++ sensible-utils-new/Makefile.am	2021-08-30 14:11:29.624068642 +0200
 @@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
  AM_TESTS_ENVIRONMENT=\
      PATH="$(topsrcdir):$$PATH"; export PATH;
diff --git a/sources b/sources
index 0b425d9..fc49766 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.16.tar.xz) = c2dfb6a4eca210c69492ce967c1d3c12531e512b47b0c33179ad5f9dd2e7975b4383c9c0f6c6f6a27a7d9544fcffdeba1935fe85446ba4afb2c34a3b559c92e5
+SHA512 (sensible-utils_0.0.17.tar.xz) = fb7803cacc4222f232f64850e5559aca0b56ad98b6fd31f36c89740d72f7a235e7f2934ebce1d788882bff7196d59a2ed6cc3584f31e1c1c9e3593cedca2382b

From 08cd78ffb15648bc1135f8a4c5f4a1c480590ec4 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jan 2022 00:40:49 +0000
Subject: [PATCH 15/38] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 8266114..385eb71 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -49,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Mon Aug 30 2021 Sandro Mani <manisandro@gmail.com> - 0.0.17-1
 - Update to 0.0.17
 

From d2a3aaca0a464bda3cba151f76f64c6e12236aa1 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 23 Jul 2022 08:22:25 +0000
Subject: [PATCH 16/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 385eb71..4066cb7 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -49,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.17-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.17-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 

From e7663f3160b82892b835ad8b60d6a081aba99fb5 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 30 Aug 2022 16:50:27 +0200
Subject: [PATCH 17/38] Require gettext-runtime

---
 sensible-utils.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 4066cb7..232e05b 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -13,7 +13,7 @@ BuildRequires:  make
 BuildRequires:  po4a
 
 # Needed by select-editor
-Requires:       gettext
+Requires:       gettext-runtime
 
 # Just require gettext instead of installing a wrapper
 Patch0:         sensible-utils_gettext.patch
@@ -49,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Tue Aug 30 2022 Sandro Mani <manisandro@gmail.com> - 0.0.17-4
+- Require gettext-runtime
+
 * Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 

From 22e88c0f8efeaa6badcfe23d019e41c55d78ff70 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 18 Nov 2022 22:30:28 +0100
Subject: [PATCH 18/38] Use SPDX license tag

---
 sensible-utils.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 232e05b..6d36292 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -4,7 +4,7 @@ Release:        4%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
-License:        GPLv2+
+License:        GPL-2.0-or-later
 URL:            https://packages.debian.org/unstable/admin/%{name}
 Source0:        http://ftp.de.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.tar.xz
 

From 34fa7187ef92ff7d3b75299f1d5924e62a575f88 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 21 Jan 2023 03:00:06 +0000
Subject: [PATCH 19/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 6d36292..83a97b7 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -49,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.17-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Tue Aug 30 2022 Sandro Mani <manisandro@gmail.com> - 0.0.17-4
 - Require gettext-runtime
 

From 374e07372ea50adb31ad404311eef17ccc3782c7 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 19 Mar 2023 12:17:33 +0100
Subject: [PATCH 20/38] Update to 0.0.18

---
 .gitignore                   | 1 +
 sensible-utils.spec          | 7 +++++--
 sensible-utils_gettext.patch | 8 ++++----
 sources                      | 2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 12e0e99..29a2f03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /sensible-utils_0.0.14.tar.xz
 /sensible-utils_0.0.16.tar.xz
 /sensible-utils_0.0.17.tar.xz
+/sensible-utils_0.0.18.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index 83a97b7..f7bf9c5 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
-Version:        0.0.17
-Release:        5%{?dist}
+Version:        0.0.18
+Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -49,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sun Mar 19 2023 Sandro Mani <manisandro@gmail.com> - 0.0.18-1
+- Update to 0.0.18
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.17-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
index 4781c0e..cb54e54 100644
--- a/sensible-utils_gettext.patch
+++ b/sensible-utils_gettext.patch
@@ -1,9 +1,9 @@
 diff -rupN --no-dereference sensible-utils/Makefile.am sensible-utils-new/Makefile.am
---- sensible-utils/Makefile.am	2021-08-07 16:03:18.000000000 +0200
-+++ sensible-utils-new/Makefile.am	2021-08-30 14:11:29.624068642 +0200
+--- sensible-utils/Makefile.am	2022-08-29 23:06:04.000000000 +0200
++++ sensible-utils-new/Makefile.am	2023-03-19 12:17:27.569239593 +0100
 @@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
  AM_TESTS_ENVIRONMENT=\
-     PATH="$(topsrcdir):$$PATH"; export PATH;
+     PATH="$(top_srcdir):$$PATH"; export PATH;
  
 -binpkgdatadir = $(pkgdatadir)/bin
 -
@@ -13,5 +13,5 @@ diff -rupN --no-dereference sensible-utils/Makefile.am sensible-utils-new/Makefi
 @@ -25,4 +23,3 @@ select-editor: $(srcdir)/select-editor.i
  
  
- bin_SCRIPTS = sensible-browser sensible-editor sensible-pager select-editor
+ bin_SCRIPTS = sensible-browser sensible-editor sensible-pager select-editor sensible-terminal
 -binpkgdata_SCRIPTS = tools/gettext
diff --git a/sources b/sources
index fc49766..b29197a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.17.tar.xz) = fb7803cacc4222f232f64850e5559aca0b56ad98b6fd31f36c89740d72f7a235e7f2934ebce1d788882bff7196d59a2ed6cc3584f31e1c1c9e3593cedca2382b
+SHA512 (sensible-utils_0.0.18.tar.xz) = fe6b2dfcaf7c9ffbfac068e1b266f37cfdda9e1d736ddc69994f2fd9f1a58a7bfb99c7b12170971510831a67a9a831d2c68ae350e28a33c5be9c556f817c4160

From 89a726856b9273e683ed2ac52b9a6aaa58455b8b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 9 May 2023 08:58:29 +0200
Subject: [PATCH 21/38] Update to 0.0.19

---
 .gitignore                   | 1 +
 sensible-utils.spec          | 5 ++++-
 sensible-utils_gettext.patch | 6 +++---
 sources                      | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 29a2f03..2957feb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /sensible-utils_0.0.16.tar.xz
 /sensible-utils_0.0.17.tar.xz
 /sensible-utils_0.0.18.tar.xz
+/sensible-utils_0.0.19.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index f7bf9c5..4590d3b 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,5 +1,5 @@
 Name:           sensible-utils
-Version:        0.0.18
+Version:        0.0.19
 Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
@@ -49,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Tue May 09 2023 Sandro Mani <manisandro@gmail.com> - 0.0.19-1
+- Update to 0.0.19
+
 * Sun Mar 19 2023 Sandro Mani <manisandro@gmail.com> - 0.0.18-1
 - Update to 0.0.18
 
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
index cb54e54..db18c22 100644
--- a/sensible-utils_gettext.patch
+++ b/sensible-utils_gettext.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference sensible-utils/Makefile.am sensible-utils-new/Makefile.am
---- sensible-utils/Makefile.am	2022-08-29 23:06:04.000000000 +0200
-+++ sensible-utils-new/Makefile.am	2023-03-19 12:17:27.569239593 +0100
+diff -rupN --no-dereference sensible-utils-0.0.19/Makefile.am sensible-utils-0.0.19-new/Makefile.am
+--- sensible-utils-0.0.19/Makefile.am	2022-08-29 23:06:04.000000000 +0200
++++ sensible-utils-0.0.19-new/Makefile.am	2023-05-09 08:58:21.001961080 +0200
 @@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
  AM_TESTS_ENVIRONMENT=\
      PATH="$(top_srcdir):$$PATH"; export PATH;
diff --git a/sources b/sources
index b29197a..780f7e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.18.tar.xz) = fe6b2dfcaf7c9ffbfac068e1b266f37cfdda9e1d736ddc69994f2fd9f1a58a7bfb99c7b12170971510831a67a9a831d2c68ae350e28a33c5be9c556f817c4160
+SHA512 (sensible-utils_0.0.19.tar.xz) = f9362346194521eb8a8a8a91c147f108ca7d179f917aaf68b594640caad5eef9bb8304bd3fdf57860d776b00799e781cf589a47a7f02c9df8b032658a0dfddb6

From 5dbd968760b206fec9db35d43409ce279a839dce Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 9 May 2023 09:05:48 +0200
Subject: [PATCH 22/38] Fix source dir name

---
 sensible-utils.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 4590d3b..6d834a7 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -24,7 +24,7 @@ sensibly select and spawn an appropriate browser, editor, or pager.
 
 
 %prep
-%autosetup -p1 -n %{name}
+%autosetup -p1 -n %{name}-%{version}
 
 
 %build

From be680ec056d9c4d9465950c5b159ca350c377229 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Sun, 18 Jun 2023 10:49:24 +0200
Subject: [PATCH 23/38] Update to 0.0.20

---
 .gitignore                   | 1 +
 sensible-utils.spec          | 5 ++++-
 sensible-utils_gettext.patch | 6 +++---
 sources                      | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2957feb..d62ffdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /sensible-utils_0.0.17.tar.xz
 /sensible-utils_0.0.18.tar.xz
 /sensible-utils_0.0.19.tar.xz
+/sensible-utils_0.0.20.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index 6d834a7..da39be7 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,5 +1,5 @@
 Name:           sensible-utils
-Version:        0.0.19
+Version:        0.0.20
 Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
@@ -49,6 +49,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sun Jun 18 2023 Sandro Mani <manisandro@gmail.com> - 0.0.20-1
+- Update to 0.0.20
+
 * Tue May 09 2023 Sandro Mani <manisandro@gmail.com> - 0.0.19-1
 - Update to 0.0.19
 
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
index db18c22..e38ccf6 100644
--- a/sensible-utils_gettext.patch
+++ b/sensible-utils_gettext.patch
@@ -1,6 +1,6 @@
-diff -rupN --no-dereference sensible-utils-0.0.19/Makefile.am sensible-utils-0.0.19-new/Makefile.am
---- sensible-utils-0.0.19/Makefile.am	2022-08-29 23:06:04.000000000 +0200
-+++ sensible-utils-0.0.19-new/Makefile.am	2023-05-09 08:58:21.001961080 +0200
+diff -rupN --no-dereference sensible-utils-0.0.20/Makefile.am sensible-utils-0.0.20-new/Makefile.am
+--- sensible-utils-0.0.20/Makefile.am	2022-08-29 23:06:04.000000000 +0200
++++ sensible-utils-0.0.20-new/Makefile.am	2023-06-18 10:49:18.408550687 +0200
 @@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
  AM_TESTS_ENVIRONMENT=\
      PATH="$(top_srcdir):$$PATH"; export PATH;
diff --git a/sources b/sources
index 780f7e8..2fba8f2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.19.tar.xz) = f9362346194521eb8a8a8a91c147f108ca7d179f917aaf68b594640caad5eef9bb8304bd3fdf57860d776b00799e781cf589a47a7f02c9df8b032658a0dfddb6
+SHA512 (sensible-utils_0.0.20.tar.xz) = 439b783003f9b9361baec01f2888f9638bf7d670b90e7262c50fdff2b724f53f83a776bda385003f61b0bbf37c3213208642e2f1289e93a1ba6b1da2107cb02f

From f8533b120f552b10f78d65c71eeb294c75af83b8 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 6 Jul 2023 13:03:41 +0200
Subject: [PATCH 24/38] Update to 0.0.21

---
 .gitignore                   |  1 +
 sensible-utils.spec          | 14 +++++++++-----
 sensible-utils_gettext.patch | 17 -----------------
 sources                      |  2 +-
 4 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 sensible-utils_gettext.patch

diff --git a/.gitignore b/.gitignore
index d62ffdc..8d10ba7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /sensible-utils_0.0.18.tar.xz
 /sensible-utils_0.0.19.tar.xz
 /sensible-utils_0.0.20.tar.xz
+/sensible-utils_0.0.21.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index da39be7..dc8478f 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,5 +1,5 @@
 Name:           sensible-utils
-Version:        0.0.20
+Version:        0.0.21
 Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
@@ -12,11 +12,12 @@ BuildRequires:  automake autoconf
 BuildRequires:  make
 BuildRequires:  po4a
 
-# Needed by select-editor
-Requires:       gettext-runtime
+# See Patch0
+Requires:       /usr/bin/gettext
+Requires:       /usr/bin/realpath
 
-# Just require gettext instead of installing a wrapper
-Patch0:         sensible-utils_gettext.patch
+# Just require gettext, realpath instead of installing wrappers
+Patch0:         sensible-utils_nowrappers.patch
 
 %description
 This package provides a number of small utilities which are used by programs to
@@ -49,6 +50,9 @@ autoreconf -ifv
 
 
 %changelog
+* Thu Jul 06 2023 Sandro Mani <manisandro@gmail.com> - 0.0.21-1
+- Update to 0.0.21
+
 * Sun Jun 18 2023 Sandro Mani <manisandro@gmail.com> - 0.0.20-1
 - Update to 0.0.20
 
diff --git a/sensible-utils_gettext.patch b/sensible-utils_gettext.patch
deleted file mode 100644
index e38ccf6..0000000
--- a/sensible-utils_gettext.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rupN --no-dereference sensible-utils-0.0.20/Makefile.am sensible-utils-0.0.20-new/Makefile.am
---- sensible-utils-0.0.20/Makefile.am	2022-08-29 23:06:04.000000000 +0200
-+++ sensible-utils-0.0.20-new/Makefile.am	2023-06-18 10:49:18.408550687 +0200
-@@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
- AM_TESTS_ENVIRONMENT=\
-     PATH="$(top_srcdir):$$PATH"; export PATH;
- 
--binpkgdatadir = $(pkgdatadir)/bin
--
- edit = sed \
-              -e 's|@binpkgdatadir[@]|$(binpkgdatadir)|g' \
-              -e 's|@prefix[@]|$(prefix)|g'
-@@ -25,4 +23,3 @@ select-editor: $(srcdir)/select-editor.i
- 
- 
- bin_SCRIPTS = sensible-browser sensible-editor sensible-pager select-editor sensible-terminal
--binpkgdata_SCRIPTS = tools/gettext
diff --git a/sources b/sources
index 2fba8f2..88675fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.20.tar.xz) = 439b783003f9b9361baec01f2888f9638bf7d670b90e7262c50fdff2b724f53f83a776bda385003f61b0bbf37c3213208642e2f1289e93a1ba6b1da2107cb02f
+SHA512 (sensible-utils_0.0.21.tar.xz) = 2cbe686227eca4e76022746aea3925678fc7229e4ee385d359543273266959b5b3411b545ce4bd22152edf75cda2ddd82f26c7b220fa08c080ec6f22946954ce

From adabe8c10dc1894799c87376cdd6a20d1ae53424 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 6 Jul 2023 13:44:59 +0200
Subject: [PATCH 25/38] Add missing patch

---
 sensible-utils_nowrappers.patch | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 sensible-utils_nowrappers.patch

diff --git a/sensible-utils_nowrappers.patch b/sensible-utils_nowrappers.patch
new file mode 100644
index 0000000..d103ca6
--- /dev/null
+++ b/sensible-utils_nowrappers.patch
@@ -0,0 +1,17 @@
+diff -rupN --no-dereference sensible-utils/Makefile.am sensible-utils-new/Makefile.am
+--- sensible-utils/Makefile.am	2023-07-05 01:15:15.000000000 +0200
++++ sensible-utils-new/Makefile.am	2023-07-06 13:02:49.777973601 +0200
+@@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
+ AM_TESTS_ENVIRONMENT=\
+     PATH="$(top_srcdir):$$PATH"; export PATH;
+ 
+-binpkgdatadir = $(pkgdatadir)/bin
+-
+ edit = sed \
+              -e 's|@binpkgdatadir[@]|$(binpkgdatadir)|g' \
+              -e 's|@prefix[@]|$(prefix)|g'
+@@ -62,4 +60,3 @@ sensible-terminal: $(srcdir)/sensible-te
+ 
+ 
+ bin_SCRIPTS = sensible-browser sensible-editor sensible-pager select-editor sensible-terminal
+-binpkgdata_SCRIPTS = tools/gettext tools/realpath

From 497958264052f3c9b2f5083085080da6842ea069 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Thu, 6 Jul 2023 15:27:15 +0200
Subject: [PATCH 26/38] Adapt for tarball change

---
 sensible-utils.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index dc8478f..b57da6c 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -25,7 +25,7 @@ sensibly select and spawn an appropriate browser, editor, or pager.
 
 
 %prep
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1 -n %{name}
 
 
 %build

From 74902309d3042ac0db5e31665ef7bf21972bec68 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 22 Jul 2023 01:24:51 +0000
Subject: [PATCH 27/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index b57da6c..efc3e9b 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.21
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Thu Jul 06 2023 Sandro Mani <manisandro@gmail.com> - 0.0.21-1
 - Update to 0.0.21
 

From de6674c9b9368eed02cc39b74c0ee577e88dce52 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 27 Jan 2024 02:34:48 +0000
Subject: [PATCH 28/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index efc3e9b..23a4104 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

From 185623af4c0f4b8083f5bf6d2497857ca8914e1b Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 6 Feb 2024 11:52:18 +0100
Subject: [PATCH 29/38] Update to 0.0.22

---
 .gitignore                      | 1 +
 sensible-utils.spec             | 7 +++++--
 sensible-utils_nowrappers.patch | 4 ++--
 sources                         | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 8d10ba7..3e6473d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /sensible-utils_0.0.19.tar.xz
 /sensible-utils_0.0.20.tar.xz
 /sensible-utils_0.0.21.tar.xz
+/sensible-utils_0.0.22.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index 23a4104..525d382 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
-Version:        0.0.21
-Release:        3%{?dist}
+Version:        0.0.22
+Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -50,6 +50,9 @@ autoreconf -ifv
 
 
 %changelog
+* Tue Feb 06 2024 Sandro Mani <manisandro@gmail.com> - 0.0.22-1
+- Update to 0.0.22
+
 * Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.21-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sensible-utils_nowrappers.patch b/sensible-utils_nowrappers.patch
index d103ca6..ef58beb 100644
--- a/sensible-utils_nowrappers.patch
+++ b/sensible-utils_nowrappers.patch
@@ -1,6 +1,6 @@
 diff -rupN --no-dereference sensible-utils/Makefile.am sensible-utils-new/Makefile.am
---- sensible-utils/Makefile.am	2023-07-05 01:15:15.000000000 +0200
-+++ sensible-utils-new/Makefile.am	2023-07-06 13:02:49.777973601 +0200
+--- sensible-utils/Makefile.am	2023-07-05 11:34:03.000000000 +0200
++++ sensible-utils-new/Makefile.am	2024-02-06 11:52:10.881511782 +0100
 @@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
  AM_TESTS_ENVIRONMENT=\
      PATH="$(top_srcdir):$$PATH"; export PATH;
diff --git a/sources b/sources
index 88675fc..b1de353 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.21.tar.xz) = 2cbe686227eca4e76022746aea3925678fc7229e4ee385d359543273266959b5b3411b545ce4bd22152edf75cda2ddd82f26c7b220fa08c080ec6f22946954ce
+SHA512 (sensible-utils_0.0.22.tar.xz) = c35ac6f9a27bf21bd496acb5ada2fd2e5eb101d661fe49a505a80dc507eea314b8b29388ae4852c14aff547fef8938f48a14898c49cf951d7ab13ccf48e77ed5

From 7d0bb62a7900452ddc28c6c92b52bc764fa48d04 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 18 Jun 2024 12:52:03 +0200
Subject: [PATCH 30/38] Update to 0.0.23

---
 .gitignore                      |  1 +
 sensible-utils.spec             |  9 +++++----
 sensible-utils_nowrappers.patch | 17 -----------------
 sources                         |  2 +-
 4 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 sensible-utils_nowrappers.patch

diff --git a/.gitignore b/.gitignore
index 3e6473d..e15bc17 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
 /sensible-utils_0.0.20.tar.xz
 /sensible-utils_0.0.21.tar.xz
 /sensible-utils_0.0.22.tar.xz
+/sensible-utils_0.0.23.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index 525d382..1055148 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,5 +1,5 @@
 Name:           sensible-utils
-Version:        0.0.22
+Version:        0.0.23
 Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
@@ -16,8 +16,6 @@ BuildRequires:  po4a
 Requires:       /usr/bin/gettext
 Requires:       /usr/bin/realpath
 
-# Just require gettext, realpath instead of installing wrappers
-Patch0:         sensible-utils_nowrappers.patch
 
 %description
 This package provides a number of small utilities which are used by programs to
@@ -25,7 +23,7 @@ sensibly select and spawn an appropriate browser, editor, or pager.
 
 
 %prep
-%autosetup -p1 -n %{name}
+%autosetup -p1 -n %{name}-%{version}
 
 
 %build
@@ -50,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Tue Jun 18 2024 Sandro Mani <manisandro@gmail.com> - 0.0.23-1
+- Update to 0.0.23
+
 * Tue Feb 06 2024 Sandro Mani <manisandro@gmail.com> - 0.0.22-1
 - Update to 0.0.22
 
diff --git a/sensible-utils_nowrappers.patch b/sensible-utils_nowrappers.patch
deleted file mode 100644
index ef58beb..0000000
--- a/sensible-utils_nowrappers.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -rupN --no-dereference sensible-utils/Makefile.am sensible-utils-new/Makefile.am
---- sensible-utils/Makefile.am	2023-07-05 11:34:03.000000000 +0200
-+++ sensible-utils-new/Makefile.am	2024-02-06 11:52:10.881511782 +0100
-@@ -7,8 +7,6 @@ TESTS = test/ed-as-sensible-editor test/
- AM_TESTS_ENVIRONMENT=\
-     PATH="$(top_srcdir):$$PATH"; export PATH;
- 
--binpkgdatadir = $(pkgdatadir)/bin
--
- edit = sed \
-              -e 's|@binpkgdatadir[@]|$(binpkgdatadir)|g' \
-              -e 's|@prefix[@]|$(prefix)|g'
-@@ -62,4 +60,3 @@ sensible-terminal: $(srcdir)/sensible-te
- 
- 
- bin_SCRIPTS = sensible-browser sensible-editor sensible-pager select-editor sensible-terminal
--binpkgdata_SCRIPTS = tools/gettext tools/realpath
diff --git a/sources b/sources
index b1de353..a807506 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.22.tar.xz) = c35ac6f9a27bf21bd496acb5ada2fd2e5eb101d661fe49a505a80dc507eea314b8b29388ae4852c14aff547fef8938f48a14898c49cf951d7ab13ccf48e77ed5
+SHA512 (sensible-utils_0.0.23.tar.xz) = fe54ec3addeaae3dbe76cd7919a37bbf3a83eb8250acd90133cd60885be30e0a8419aeb86f0a6532ca25a3efc9ceb47aca7de1ccc1e6fcf50b5b6a65b6c340c6

From 4b011fabda88cc6f543c848a402d11e31d2b33c3 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Tue, 25 Jun 2024 08:14:24 +0200
Subject: [PATCH 31/38] Update to 0.0.24

---
 .gitignore          | 1 +
 sensible-utils.spec | 5 ++++-
 sources             | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e15bc17..fc601e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 /sensible-utils_0.0.21.tar.xz
 /sensible-utils_0.0.22.tar.xz
 /sensible-utils_0.0.23.tar.xz
+/sensible-utils_0.0.24.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index 1055148..5ca64cc 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,5 +1,5 @@
 Name:           sensible-utils
-Version:        0.0.23
+Version:        0.0.24
 Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
@@ -48,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Tue Jun 25 2024 Sandro Mani <manisandro@gmail.com> - 0.0.24-1
+- Update to 0.0.24
+
 * Tue Jun 18 2024 Sandro Mani <manisandro@gmail.com> - 0.0.23-1
 - Update to 0.0.23
 
diff --git a/sources b/sources
index a807506..e18ff86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.23.tar.xz) = fe54ec3addeaae3dbe76cd7919a37bbf3a83eb8250acd90133cd60885be30e0a8419aeb86f0a6532ca25a3efc9ceb47aca7de1ccc1e6fcf50b5b6a65b6c340c6
+SHA512 (sensible-utils_0.0.24.tar.xz) = 2db2b14bb4b8e616d0e22ac39c56e4e995ba565da59f624ea5ce8958d3eaf545d69136a518e30bd7183adde411607465d7d07fa8e88cc0d980b5d464f8a3b902

From c1febf8ac1006bd4264e8fbcd6e85260d0736475 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 20 Jul 2024 05:15:11 +0000
Subject: [PATCH 32/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 5ca64cc..20011ea 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.24
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -48,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.24-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Tue Jun 25 2024 Sandro Mani <manisandro@gmail.com> - 0.0.24-1
 - Update to 0.0.24
 

From 0eb64b2b0aef2b8048d8cd632c9fc86d3862a449 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sun, 19 Jan 2025 10:24:53 +0000
Subject: [PATCH 33/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 20011ea..4b6d60f 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.24
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -48,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.24-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.24-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 

From 6ec54d4201977375789ec54f898975f0ae0268a3 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Wed, 23 Apr 2025 09:08:31 +0200
Subject: [PATCH 34/38] Update to 0.0.25

---
 .gitignore          | 1 +
 sensible-utils.spec | 7 +++++--
 sources             | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index fc601e5..1aca71f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
 /sensible-utils_0.0.22.tar.xz
 /sensible-utils_0.0.23.tar.xz
 /sensible-utils_0.0.24.tar.xz
+/sensible-utils_0.0.25.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index 4b6d60f..faddc5d 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
-Version:        0.0.24
-Release:        3%{?dist}
+Version:        0.0.25
+Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -48,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Wed Apr 23 2025 Sandro Mani <manisandro@gmail.com> - 0.0.25-1
+- Update to 0.0.25
+
 * Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.24-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 
diff --git a/sources b/sources
index e18ff86..54426fc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.24.tar.xz) = 2db2b14bb4b8e616d0e22ac39c56e4e995ba565da59f624ea5ce8958d3eaf545d69136a518e30bd7183adde411607465d7d07fa8e88cc0d980b5d464f8a3b902
+SHA512 (sensible-utils_0.0.25.tar.xz) = 42b3536abbbc70f0c8ac69a6b34ed7c3576d7835ec690f9acd8bb4e57cb22386dd7e22ac5a43b33f3a1f5d04ec2bbc4255119a1e45008cbe632baf61c87fb1e9

From bb884e592f6b030287c5d08f17627da5635694aa Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 25 Jul 2025 18:09:00 +0000
Subject: [PATCH 35/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index faddc5d..d01cab8 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.25
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -48,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.25-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 * Wed Apr 23 2025 Sandro Mani <manisandro@gmail.com> - 0.0.25-1
 - Update to 0.0.25
 

From aa904b62816b428f9a3d136dccedcf8876649d90 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Fri, 22 Aug 2025 12:15:47 +0200
Subject: [PATCH 36/38] Update to 0.0.26

---
 .gitignore          | 1 +
 sensible-utils.spec | 7 +++++--
 sources             | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1aca71f..64dc436 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@
 /sensible-utils_0.0.23.tar.xz
 /sensible-utils_0.0.24.tar.xz
 /sensible-utils_0.0.25.tar.xz
+/sensible-utils_0.0.26.tar.xz
diff --git a/sensible-utils.spec b/sensible-utils.spec
index d01cab8..7cdf2c0 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
-Version:        0.0.25
-Release:        2%{?dist}
+Version:        0.0.26
+Release:        1%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -48,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Fri Aug 22 2025 Sandro Mani <manisandro@gmail.com> - 0.0.26-1
+- Update to 0.0.26
+
 * Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.25-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 
diff --git a/sources b/sources
index 54426fc..89e5559 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (sensible-utils_0.0.25.tar.xz) = 42b3536abbbc70f0c8ac69a6b34ed7c3576d7835ec690f9acd8bb4e57cb22386dd7e22ac5a43b33f3a1f5d04ec2bbc4255119a1e45008cbe632baf61c87fb1e9
+SHA512 (sensible-utils_0.0.26.tar.xz) = afc313ac57379987ef61f656386bb9e4ea14746a266584b4e49953449a1d4869d156d79211ab07826b2473c63e4e2903044751f67b905fab61363c6ba3967ec1

From 6c7bcdc7e3af0bb6edb30fab6cd22c8caae19045 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Sat, 17 Jan 2026 17:53:36 +0000
Subject: [PATCH 37/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 7cdf2c0..4e81cb6 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.26
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -48,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.26-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
 * Fri Aug 22 2025 Sandro Mani <manisandro@gmail.com> - 0.0.26-1
 - Update to 0.0.26
 

From 8b22211f4aca8b87962f927af07d037b71b23035 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 17 Jul 2026 06:24:02 +0000
Subject: [PATCH 38/38] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

---
 sensible-utils.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sensible-utils.spec b/sensible-utils.spec
index 4e81cb6..6f65a9f 100644
--- a/sensible-utils.spec
+++ b/sensible-utils.spec
@@ -1,6 +1,6 @@
 Name:           sensible-utils
 Version:        0.0.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Utilities for sensible alternative selection
 
 BuildArch:      noarch
@@ -48,6 +48,9 @@ autoreconf -ifv
 
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.26-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
 * Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.26-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild