From 2280744d20f0fc1d75d4b7e66b83046747296dc9 Mon Sep 17 00:00:00 2001 From: Marcin Krol Date: Sun, 23 Jul 2023 21:42:31 +0200 Subject: [PATCH] - fix string format build errors --- CUnit.spec | 4 +++- format.patch | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 format.patch diff --git a/CUnit.spec b/CUnit.spec index 1e92eda..de58eab 100644 --- a/CUnit.spec +++ b/CUnit.spec @@ -7,7 +7,7 @@ Summary: Automated testing framework for C Summary(pl.UTF-8): Szkielet automatycznych testów dla C Name: CUnit Version: 2.1 -Release: 3 +Release: 4 License: LGPL v2+ Group: Development/Tools Source0: http://downloads.sourceforge.net/cunit/%{name}-%{version}-3.tar.bz2 @@ -15,6 +15,7 @@ Source0: http://downloads.sourceforge.net/cunit/%{name}-%{version}-3.tar.bz2 Patch0: %{name}-curses.patch Patch1: %{name}-libs.patch Patch2: %{name}-FHS.patch +Patch3: format.patch URL: http://cunit.sourceforge.net/ BuildRequires: autoconf BuildRequires: automake @@ -85,6 +86,7 @@ Przykłady do CUnita. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build %{__libtoolize} diff --git a/format.patch b/format.patch new file mode 100644 index 0000000..c5b944b --- /dev/null +++ b/format.patch @@ -0,0 +1,43 @@ +diff -ur CUnit-2.1-3.orig/CUnit/Sources/Curses/Curses.c CUnit-2.1-3/CUnit/Sources/Curses/Curses.c +--- CUnit-2.1-3.orig/CUnit/Sources/Curses/Curses.c 2014-04-24 02:54:45.000000000 +0200 ++++ CUnit-2.1-3/CUnit/Sources/Curses/Curses.c 2023-07-23 21:37:18.730110415 +0200 +@@ -952,11 +952,11 @@ + + snprintf(szTemp, STRING_LENGTH, _("Commands: R - run all tests in suite %s"), + pSuite->pName); +- mvwprintw(details_pad.pPad, 0, 0, szTemp); ++ mvwprintw(details_pad.pPad, 0, 0, "%s", szTemp); + mvwprintw(details_pad.pPad, 1, 0, _(" S - Select and run a test")); + snprintf(szTemp, STRING_LENGTH, _(" L - List all tests registered in suite %s"), + pSuite->pName); +- mvwprintw(details_pad.pPad, 2, 0, szTemp); ++ mvwprintw(details_pad.pPad, 2, 0, "%s", szTemp); + mvwprintw(details_pad.pPad, 3, 0, _(" A - Activate or deactivate a test (toggle)")); + mvwprintw(details_pad.pPad, 4, 0, _(" F - Show failures from last test run")); + mvwprintw(details_pad.pPad, 5, 0, _(" M - Move up to main menu")); +@@ -1068,14 +1068,14 @@ + } + + snprintf(szTemp, STRING_LENGTH, "%s: %s", _("Suite"), pSuite->pName); +- mvwprintw(details_pad.pPad, 0, 0, szTemp); ++ mvwprintw(details_pad.pPad, 0, 0, "%s", szTemp); + + snprintf(szTemp, STRING_LENGTH, + "%*s %-*s%*s", + width[0], _("#"), + width[1], _("Test Name"), + width[2], _("Active?")); +- mvwprintw(details_pad.pPad, 1, 0, szTemp); ++ mvwprintw(details_pad.pPad, 1, 0, "%s", szTemp); + + for (i = 0, pCurTest = pSuite->pTest ; + NULL != pCurTest ; +@@ -1158,7 +1158,7 @@ + + snprintf(szTemp, STRING_LENGTH, _(" 1 - Inactive suites/tests treated as runtime failures %s"), + (CU_FALSE != CU_get_fail_on_inactive()) ? _("Yes") : _("No ")); +- mvwprintw(details_pad.pPad, 2, 0, szTemp); ++ mvwprintw(details_pad.pPad, 2, 0, "%s", szTemp); + refresh_details_window(); + read_input_string(_("Enter number of option to change : "), szTemp, STRING_LENGTH); + option_num = atol(szTemp); -- 2.43.0