diff --git a/gnuplot-5.4.4-grep.patch b/gnuplot-5.4.4-grep.patch new file mode 100644 index 0000000..77c9106 --- /dev/null +++ b/gnuplot-5.4.4-grep.patch @@ -0,0 +1,51 @@ +From 7f7eb181d5be89425d1a9baae0eb49d9f5420590 Mon Sep 17 00:00:00 2001 +From: Andreas Stieger +Date: Tue, 27 Sep 2022 20:25:34 +0200 +Subject: [PATCH] Convert all calls of egrep/fgrep to grep -E / grep -F, + respectively +References: https://bugzilla.opensuse.org/show_bug.cgi?id=1203093 https://sourceforge.net/p/gnuplot/gnuplot-main/merge-requests/22/ + +Avoids warnings with GNU grep 3.8 and prepares for ultimate removal +--- + config/makefile.cyg | 2 +- + docs/Makefile.am | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/config/makefile.cyg b/config/makefile.cyg +index e6e3bc59f..eb6b5bcad 100644 +--- a/config/makefile.cyg ++++ b/config/makefile.cyg +@@ -357,7 +357,7 @@ ifdef SORT_TERMINALS + # sort alphabetically all terminals (note: req. GNU sort, not from MS) + allterm.h: $(CORETERM) + @echo "Building allterm.h" +- @for e in `egrep "^[ ]*START_HELP" $(CORETERM) |\ ++ @for e in `grep -E "^[ ]*START_HELP" $(CORETERM) |\ + $(GNUSORT) -f -t':' -k2` ; do \ + f=`echo $$e |cut -d\: -f1` ; s=`echo $$e | cut -d\: -f2` ;\ + sed -n "/^[ ]*$$s/,/^[ ]*END_HELP/p" $$f ; \ +diff --git a/docs/Makefile.am b/docs/Makefile.am +index f94eea28b..2e867d0db 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -135,7 +135,7 @@ LUA_HELP = + endif + + allterm.h: $(CORETERM) $(LUA_HELP) +- $(AM_V_GEN) for e in `egrep "^[ ]*START_HELP" $(CORETERM) |\ ++ $(AM_V_GEN) for e in `grep -E "^[ ]*START_HELP" $(CORETERM) |\ + LC_ALL=C sort -f -t':' -k2` ; do \ + f=`echo $$e |cut -d\: -f1` ; s=`echo $$e | cut -d\: -f2` ;\ + sed -n "/^[ ]*$$s/,/^[ ]*END_HELP/p" $$f ; \ +@@ -386,7 +386,7 @@ install-info: gnuplot.info + $(AM_V_at) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) + $(AM_V_at) $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info + $(AM_V_at) if (install-info --version && \ +- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \ ++ install-info --version | grep -F -i -v debian) >/dev/null 2>&1; then \ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || : ;\ + else : ; fi + +-- +2.37.3 + diff --git a/gnuplot-doc.changes b/gnuplot-doc.changes index e8cace1..799b888 100644 --- a/gnuplot-doc.changes +++ b/gnuplot-doc.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 27 18:34:50 UTC 2022 - Andreas Stieger + +- remove warnings with GNU grep 3.8 and fix build with egrep/fgrep + removed boo#1203092 - add gnuplot-5.4.4-grep.patch + ------------------------------------------------------------------- Tue Jul 19 08:15:29 UTC 2022 - Dr. Werner Fink @@ -29,6 +35,7 @@ Tue Jul 19 08:15:29 UTC 2022 - Dr. Werner Fink * gnuplot-4.6.0-fonts.diff * gnuplot-4.6.0.dif * gnuplot-gd.patch +- Refresh Gnuplot_5_4.pdf ------------------------------------------------------------------- Sun Jun 19 17:31:46 UTC 2022 - Stefan BrĂ¼ns diff --git a/gnuplot.changes b/gnuplot.changes index 2ba38f6..799b888 100644 --- a/gnuplot.changes +++ b/gnuplot.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Sep 27 18:34:50 UTC 2022 - Andreas Stieger + +- remove warnings with GNU grep 3.8 and fix build with egrep/fgrep + removed boo#1203092 - add gnuplot-5.4.4-grep.patch + ------------------------------------------------------------------- Tue Jul 19 08:15:29 UTC 2022 - Dr. Werner Fink diff --git a/gnuplot.spec b/gnuplot.spec index 86a4235..3225ab9 100644 --- a/gnuplot.spec +++ b/gnuplot.spec @@ -107,6 +107,7 @@ Patch5: gnuplot-wx3.diff Patch6: gnuplot-QtCore-PIC.dif Patch7: gnuplot-gd.patch Patch8: gnuplot-PIE.patch +Patch9: gnuplot-5.4.4-grep.patch %define _x11lib %{_libdir} %define _x11data %{_datadir}/X11 %define _libx11 %{_exec_prefix}/lib/X11 @@ -142,6 +143,7 @@ cp %{_sourcedir}/picins.sty docs %patch6 -p0 -b .pic %patch7 -p1 -b .gd %patch8 -p1 -b .pie +%patch9 -p1 -b .grep %build autoreconf -fi