Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ding for openSUSE:Factory checked in at 2022-09-19 16:04:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ding (Old) and /work/SRC/openSUSE:Factory/.ding.new.2083 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ding" Mon Sep 19 16:04:08 2022 rev:25 rq:1004664 version:1.9 Changes: -------- --- /work/SRC/openSUSE:Factory/ding/ding.changes 2021-05-13 22:18:35.343578097 +0200 +++ /work/SRC/openSUSE:Factory/.ding.new.2083/ding.changes 2022-09-19 16:04:20.490311405 +0200 @@ -1,0 +2,11 @@ +Sun Sep 18 11:58:12 UTC 2022 - Martin Hauke <mar...@gmx.de> + +- Add patch: + * use-grep-instead-of-egrep.patch + This prevents the egrep obsolescent warning message introduced + with grep 3.8: + "egrep: warning: egrep is obsolescent; using grep -E" +- Install man-page +- Use https instead of http/ftp for Source/URL + +------------------------------------------------------------------- New: ---- use-grep-instead-of-egrep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ding.spec ++++++ --- /var/tmp/diff_new_pack.MdooAV/_old 2022-09-19 16:04:21.034312858 +0200 +++ /var/tmp/diff_new_pack.MdooAV/_new 2022-09-19 16:04:21.042312879 +0200 @@ -1,7 +1,7 @@ # # spec file for package ding # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,11 +22,12 @@ Summary: An X Window System Dictionary Tool License: GPL-2.0-or-later Group: Productivity/Office/Dictionary -URL: http://www-user.tu-chemnitz.de/~fri/ding/ -Source: ftp://ftp.tu-chemnitz.de/pub/Local/urz/%{name}/%{name}-%{version}.tar.gz +URL: https://www-user.tu-chemnitz.de/~fri/ding/ +Source: https://ftp.tu-chemnitz.de/pub/Local/urz/%{name}/%{name}-%{version}.tar.gz Source1: ding.desktop Patch0: ding-install.diff Patch1: ding-tk-version.diff +Patch2: use-grep-instead-of-egrep.patch BuildRequires: tk BuildRequires: update-desktop-files Requires: ding-dict-de_en @@ -37,7 +38,6 @@ Recommends: ispell-american Recommends: ispell-ngerman Suggests: fortune -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -58,6 +58,7 @@ %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build @@ -70,16 +71,17 @@ y EOF install -m 644 %{SOURCE1} "%{buildroot}/%{_datadir}/applications/%{name}.desktop" +install -D -m 0644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %suse_update_desktop_file %{name} Office Dictionary %files -%defattr(-,root,root) -%doc COPYING README.md CHANGES +%license COPYING +%doc README.md CHANGES %{_bindir}/ding %{_datadir}/applications/%{name}.desktop +%{_mandir}/man1/ding.1%{?ext_man} %files -n ding-dict-de_en -%defattr(-,root,root) %{_datadir}/dict/de-en.txt %changelog ++++++ use-grep-instead-of-egrep.patch ++++++ diff --git a/ding b/ding index d282eaa..47b876b 100755 --- a/ding +++ b/ding @@ -84,7 +84,7 @@ set param(noticefile) [expr {$param(isunix) == 1 ? "$env(HOME)/.dingnotice.txt" # The default search methods # The provided German-English dictionary: set default_searchmeth(0,name) {Dictionary} -set default_searchmeth(0,grepcmds) {tre-agrep agrep egrep internal_search} +set default_searchmeth(0,grepcmds) {tre-agrep grep agrep internal_search} set default_searchmeth(0,dictfile) [expr {$param(isunix) ? "/usr/share/dict/de-en.txt" : "[file dirname argv0]/de-en.txt"}] set default_searchmeth(0,separator) { :: } set default_searchmeth(0,language1) {Deutsch} @@ -119,7 +119,7 @@ set default_searchmeth(4,minlength) 0 # check for these search commands set default_grepcmds(tre-agrep) "-h" set default_grepcmds(agrep) "-h" -set default_grepcmds(egrep) "-h -a" +set default_grepcmds(grep) "-E -a" set default_grepcmds(dict) "" set default_grepcmds(hunspell) "-B -S -a" set default_grepcmds(ispell) "-B -S -a" @@ -2923,7 +2923,7 @@ proc dictsearch {query args} { } else { # prepare simple pattern for other grep cmd: * -> .* regsub -all {\*} $squery ".*" squery - set squery [umlautquery $squery "egrep"] + set squery [umlautquery $squery "grep"] } # q is for priority sorting regsub -all {[[\*+)(]} $query "" q @@ -3893,7 +3893,7 @@ Zur Funktionsweise: } bfont .help.text insert end "\n * " .help.text insert end "Hilfe zu Abk?rzungen" abblink .help.text insert end " - * Unix-Manuals zu agrep, egrep, ispell, dict\n\n" + * Unix-Manuals zu agrep, grep, ispell, dict\n\n" } else { # english .help.text insert end {Start search:} bfont @@ -3983,7 +3983,7 @@ How it works: } bfont .help.text insert end "\n * " .help.text insert end "Help on abbreviations" abblink .help.text insert end " - * Unix manual pages for agrep, egrep, ispell, dict \n\n" + * Unix manual pages for agrep, grep, ispell, dict \n\n" } .help.text configure -state disabled }