diff --git a/.gitignore b/.gitignore index 110f191..64dc436 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,14 @@ /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 +/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 +/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 +/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 73a9729..6f65a9f 100644 --- a/sensible-utils.spec +++ b/sensible-utils.spec @@ -1,10 +1,10 @@ Name: sensible-utils -Version: 0.0.14 -Release: 2%{?dist} +Version: 0.0.26 +Release: 3%{?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 @@ -12,15 +12,10 @@ BuildRequires: automake autoconf BuildRequires: make BuildRequires: po4a -# Needed by select-editor -Requires: gettext +# See Patch0 +Requires: /usr/bin/gettext +Requires: /usr/bin/realpath -# 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 @@ -28,11 +23,11 @@ sensibly select and spawn an appropriate browser, editor, or pager. %prep -%autosetup -p1 -n %{name}.git +%autosetup -p1 -n %{name}-%{version} %build -# Needed for Patch2 +# Needed for Patch0 autoreconf -ifv %configure @@ -53,6 +48,75 @@ autoreconf -ifv %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 0.0.26-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Sat Jan 17 2026 Fedora Release Engineering - 0.0.26-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Aug 22 2025 Sandro Mani - 0.0.26-1 +- Update to 0.0.26 + +* Fri Jul 25 2025 Fedora Release Engineering - 0.0.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Wed Apr 23 2025 Sandro Mani - 0.0.25-1 +- Update to 0.0.25 + +* Sun Jan 19 2025 Fedora Release Engineering - 0.0.24-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Sat Jul 20 2024 Fedora Release Engineering - 0.0.24-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jun 25 2024 Sandro Mani - 0.0.24-1 +- Update to 0.0.24 + +* Tue Jun 18 2024 Sandro Mani - 0.0.23-1 +- Update to 0.0.23 + +* Tue Feb 06 2024 Sandro Mani - 0.0.22-1 +- Update to 0.0.22 + +* Sat Jan 27 2024 Fedora Release Engineering - 0.0.21-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 0.0.21-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jul 06 2023 Sandro Mani - 0.0.21-1 +- Update to 0.0.21 + +* Sun Jun 18 2023 Sandro Mani - 0.0.20-1 +- Update to 0.0.20 + +* Tue May 09 2023 Sandro Mani - 0.0.19-1 +- Update to 0.0.19 + +* Sun Mar 19 2023 Sandro Mani - 0.0.18-1 +- Update to 0.0.18 + +* Sat Jan 21 2023 Fedora Release Engineering - 0.0.17-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Aug 30 2022 Sandro Mani - 0.0.17-4 +- Require gettext-runtime + +* Sat Jul 23 2022 Fedora Release Engineering - 0.0.17-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.0.17-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Aug 30 2021 Sandro Mani - 0.0.17-1 +- Update to 0.0.17 + +* Fri Aug 27 2021 Sandro Mani - 0.0.16-1 +- Update to 0.0.16 + +* Fri Jul 23 2021 Fedora Release Engineering - 0.0.14-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 0.0.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 deleted file mode 100644 index 43df02a..0000000 --- a/sensible-utils_gettext.patch +++ /dev/null @@ -1,17 +0,0 @@ -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; - --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 --binpkgdata_SCRIPTS = tools/gettext 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..89e5559 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sensible-utils_0.0.14.tar.xz) = 15ba996f811ab3a9c1f5726f35766d74aafdf925c5c2392b33c6643d6c439796a742f9d0f4625c79de640e6b5e4a6a032b768eb1bc4ac31b448f9767b0ceed44 +SHA512 (sensible-utils_0.0.26.tar.xz) = afc313ac57379987ef61f656386bb9e4ea14746a266584b4e49953449a1d4869d156d79211ab07826b2473c63e4e2903044751f67b905fab61363c6ba3967ec1