From 866595ff81cc353348c44a55890de02d59b88268 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Oct 27 2023 14:12:21 +0000 Subject: Update to 7.1.1 - Closes rhbz#2246450 --- diff --git a/.gitignore b/.gitignore index 1142ae3..079a338 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /multitail-*.tgz /7.0.0.tar.gz /multitail-7.0.0.tar.gz +/multitail-7.1.1.tar.gz diff --git a/608bad75a9acf51e2283768996721bd549149991.patch b/608bad75a9acf51e2283768996721bd549149991.patch deleted file mode 100644 index eafb3c9..0000000 --- a/608bad75a9acf51e2283768996721bd549149991.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 608bad75a9acf51e2283768996721bd549149991 Mon Sep 17 00:00:00 2001 -From: Thomas Dorsch -Date: Wed, 21 Sep 2022 16:41:51 +0200 -Subject: [PATCH] Used LICENSE file as license.txt (license.txt is missing), - and also fixed ect-typo - ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 862496c..3492d3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -147,11 +147,11 @@ install(FILES multitail.conf DESTINATION etc RENAME multitail.conf.new) - install(FILES multitail.1 DESTINATION share/man/man1) - # install doc files - install(FILES manual.html DESTINATION share/doc/multitail-${VERSION}) --install(FILES license.txt DESTINATION share/doc/multitail-${VERSION}) -+install(FILES LICENSE DESTINATION share/doc/multitail-${VERSION}) - install(FILES readme.txt DESTINATION share/doc/multitail-${VERSION}) - install(FILES thanks.txt DESTINATION share/doc/multitail-${VERSION}) - # cp conversion-scripts/* etc/multitail/ --install(DIRECTORY conversion-scripts DESTINATION ect/multitail) -+install(DIRECTORY conversion-scripts DESTINATION etc/multitail) - - - if(USE_CPPCHECK) diff --git a/fix-format-strings.diff b/fix-format-strings.diff deleted file mode 100644 index 0dad1ed..0000000 --- a/fix-format-strings.diff +++ /dev/null @@ -1,69 +0,0 @@ -Description: add needed format strings - ---- -Origin: vendor -Bug-Debian: https://bugs.debian.org/997165 -Last-Update: 2021-10-29 - ---- multitail-6.5.0.orig/mt.c -+++ multitail-6.5.0/mt.c -@@ -1743,7 +1743,7 @@ void create_windows(void) - menu_win = mynewwin(max_y, max_x, 0, 0); - werase(menu_win -> win); - -- wprintw(menu_win -> win, version_str); -+ wprintw(menu_win -> win, "%s", version_str); - wprintw(menu_win -> win, "\n\n"); - - wprintw(menu_win -> win, "%s\n", F1); ---- multitail-6.5.0.orig/stripstring.c -+++ multitail-6.5.0/stripstring.c -@@ -154,7 +154,7 @@ int edit_strippers(void) - memset(linebuf, ' ', sizeof(linebuf) - 1); - linebuf[sizeof(linebuf) - 1] = 0x00; - for(loop=4; loop<22; loop++) -- mvwprintw(mywin -> win, loop, 1, linebuf); -+ mvwprintw(mywin -> win, loop, 1, "%s", linebuf); - - /* display them lines */ - for(loop=0; loop n_strip; loop++) ---- multitail-6.5.0.orig/term.c -+++ multitail-6.5.0/term.c -@@ -159,7 +159,7 @@ char * edit_string(NEWWIN *win, int win_ - string[copy_len] = 0x00; - - str_pos = dummy; -- mvwprintw(win -> win, win_y, win_x, &string[dummy]); -+ mvwprintw(win -> win, win_y, win_x, "%s", &string[dummy]); - x = strlen(string) - dummy; - } - else -@@ -608,7 +608,7 @@ void escape_print(NEWWIN *win, int y, in - void win_header(NEWWIN *win, char *str) - { - wattron(win -> win, A_BOLD); -- mvwprintw(win -> win, 1, 2, str); -+ mvwprintw(win -> win, 1, 2, "%s", str); - wattroff(win -> win, A_BOLD); - } - ---- multitail-6.5.0.orig/ui.c -+++ multitail-6.5.0/ui.c -@@ -1085,7 +1085,7 @@ int toggle_colors(void) - - dummy = mystrdup(cur -> filename); - dummy[min(strlen(dummy), 40)] = 0x00; -- mvwprintw(mywin -> win, 3, 1, dummy); -+ mvwprintw(mywin -> win, 3, 1, "%s", dummy); - - col = ask_colors(mywin, 4, cur -> cdef.colorize, &cur -> cdef.field_nr, &cur -> cdef.field_del, &cur -> cdef.color_schemes, &cur -> cdef.attributes, &cur -> cdef.term_emul); - if (col != (char)-1) -@@ -1164,7 +1164,7 @@ int edit_regexp(void) - char dummy[18]; - strncpy(dummy, (cur -> pre)[loop].cmd, min(17, strlen((cur -> pre)[loop].cmd))); - dummy[17]=0x00; -- mvwprintw(mywin -> win, 4 + loop, 42, dummy); -+ mvwprintw(mywin -> win, 4 + loop, 42, "%s", dummy); - wmove(mywin -> win, 4 + loop, 41); - } - if (loop == cur_re) diff --git a/multitail.spec b/multitail.spec index 81b6e74..3ec08bd 100644 --- a/multitail.spec +++ b/multitail.spec @@ -1,13 +1,11 @@ Name: multitail -Version: 7.0.0 +Version: 7.1.1 Release: %autorelease Summary: View one or multiple files like tail but with multiple windows License: Apache-2.0 URL: https://www.vanheusden.com/multitail/ Source0: https://github.com/folkertvanheusden/multitail/archive/%{version}/%{name}-%{version}.tar.gz -Patch1: https://sources.debian.org/data/main/m/multitail/6.5.0-5/debian/patches/fix-format-strings.diff -Patch2: https://github.com/folkertvanheusden/multitail/commit/608bad75a9acf51e2283768996721bd549149991.patch BuildRequires: cmake BuildRequires: gcc @@ -33,8 +31,6 @@ external software, MultiTail can mimic the functionality of tools like %prep %autosetup -# Fix correct version -sed -i 's/6.4.3/7.0.0/' CMakeLists.txt # Let rpm handle the config file sed -i '/multitail.conf.new/d' CMakeLists.txt # Install conversion-scripts manually diff --git a/sources b/sources index dcca306..42cc835 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (multitail-7.0.0.tar.gz) = 325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae +SHA512 (multitail-7.1.1.tar.gz) = e0bb611328799fbb9b56e1b824b1390ebe989c38e4ce6c7fbbd01793d06c3d59dd3d44eca1a219199d0855fb83608bfb54e66894c042ce7276cbe7d1bea240bf