diff --git a/.gitignore b/.gitignore index 64dc436..3b2abdd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1 @@ /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 -/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 6f65a9f..9eb9d24 100644 --- a/sensible-utils.spec +++ b/sensible-utils.spec @@ -1,20 +1,17 @@ Name: sensible-utils -Version: 0.0.26 -Release: 3%{?dist} +Version: 0.0.9 +Release: 8%{?dist} Summary: Utilities for sensible alternative selection BuildArch: noarch -License: GPL-2.0-or-later +License: GPLv2+ URL: https://packages.debian.org/unstable/admin/%{name} -Source0: http://ftp.de.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.tar.xz +Source0: http://ftp.de.debian.org/debian/pool/main/s/%{name}/%{name}_%{version}.tar.gz -BuildRequires: automake autoconf -BuildRequires: make -BuildRequires: po4a - -# 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 %description @@ -23,13 +20,15 @@ sensibly select and spawn an appropriate browser, editor, or pager. %prep -%autosetup -p1 -n %{name}-%{version} +%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 %build -# Needed for Patch0 -autoreconf -ifv - %configure %make_build @@ -48,108 +47,6 @@ 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 - -* Fri Jan 15 2021 Sandro Mani - 0.0.14-1 -- Update to 0.0.14 - -* Wed Jul 29 2020 Fedora Release Engineering - 0.0.12-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Jan 30 2020 Fedora Release Engineering - 0.0.12-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Jul 26 2019 Fedora Release Engineering - 0.0.12-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 0.0.12-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 0.0.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Mar 13 2018 Sandro Mani - 0.0.12-1 -- Update to 0.0.12 - -* Fri Feb 09 2018 Fedora Release Engineering - 0.0.11-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Dec 13 2017 Sandro Mani - 0.0.11-1 -- Update to 0.0.11 - -* Tue Oct 31 2017 Sandro Mani - 0.0.10-1 -- Update to 0.0.10 - * Wed Sep 06 2017 Sandro Mani - 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 new file mode 100644 index 0000000..ca52715 --- /dev/null +++ b/sensible-utils_editors.patch @@ -0,0 +1,18 @@ +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 + touch $HOME/.selected_editor || exit 1 + +-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= diff --git a/sensible-utils_stderr.patch b/sensible-utils_stderr.patch new file mode 100644 index 0000000..a530ea9 --- /dev/null +++ b/sensible-utils_stderr.patch @@ -0,0 +1,16 @@ +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 +@@ -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= + + if [ -n "$VISUAL" ]; then + ${VISUAL} "$@" diff --git a/sources b/sources index 89e5559..ab9a1ff 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (sensible-utils_0.0.26.tar.xz) = afc313ac57379987ef61f656386bb9e4ea14746a266584b4e49953449a1d4869d156d79211ab07826b2473c63e4e2903044751f67b905fab61363c6ba3967ec1 +559012932ffa95a7bbd8f8423869b652 sensible-utils_0.0.9.tar.gz