diff --git a/Replace-Curses-mvprintw-with-va_list-based-equivalen.patch b/Replace-Curses-mvprintw-with-va_list-based-equivalen.patch deleted file mode 100644 index 0283a6b89ed614a31ed7240bd4de14940e54777a..0000000000000000000000000000000000000000 --- a/Replace-Curses-mvprintw-with-va_list-based-equivalen.patch +++ /dev/null @@ -1,40 +0,0 @@ -From e9e8dd148b9454abb5a7704d6f6249f7aa7aeded Mon Sep 17 00:00:00 2001 -From: herengui -Date: Thu, 10 Mar 2022 18:14:43 +0800 -Subject: [PATCH] Replace Curses mvprintw() with va_list-based equivalent - -Instead of allocating a buffer for the formatted string and printing -it with mvprintw() -- which should have a "%s" format argument to guard -against '%' characters in the formatted string, hat tip Andreas Tille --, -use vw_printw() which takes a va_list so can do the formatting itself. - -Signed-off-by: herengui ---- - bam_tview_curses.c | 8 ++------ - 1 file changed, 2 insertions(+), 6 deletions(-) - -diff --git a/bam_tview_curses.c b/bam_tview_curses.c -index 11db0da..37fb033 100644 ---- a/bam_tview_curses.c -+++ b/bam_tview_curses.c -@@ -78,15 +78,11 @@ static void curses_destroy(tview_t* base) { - */ - - static void curses_mvprintw(struct AbstractTview* tv,int y ,int x,const char* fmt,...) { -- unsigned int size=tv->mcol+2; -- char* str=malloc(size); -- if(str==0) exit(EXIT_FAILURE); - va_list argptr; - va_start(argptr, fmt); -- vsnprintf(str,size, fmt, argptr); -+ if (wmove(stdscr, y, x) != ERR) -+ vw_printw(stdscr, fmt, argptr); - va_end(argptr); -- mvprintw(y,x,str); -- free(str); - } - - static void curses_mvaddch(struct AbstractTview* tv,int y,int x,int ch) { --- -2.20.1 - diff --git a/samtools-1.12.tar.bz2 b/samtools-1.17.tar.bz2 similarity index 47% rename from samtools-1.12.tar.bz2 rename to samtools-1.17.tar.bz2 index 74aa35c0e3720174417e77ef9c0095f884492215..49452eac3b47186ca4fcb130e34be6999dc84d94 100644 Binary files a/samtools-1.12.tar.bz2 and b/samtools-1.17.tar.bz2 differ diff --git a/samtools.spec b/samtools.spec index 49108c2b0ecc9e5ff845790ea82ec1d1feb0e330..fc6ac54110040120770bb9e00780b33d9cc86014 100644 --- a/samtools.spec +++ b/samtools.spec @@ -1,13 +1,11 @@ Name: samtools -Version: 1.12 -Release: 5 +Version: 1.17 +Release: 1 Summary: Tools (written in C using htslib) for manipulating next-generation sequencing data License: MIT and BSD URL: http://www.htslib.org Source0: https://github.com/samtools/samtools/archive/%{name}-%{version}.tar.bz2 -Patch0: Replace-Curses-mvprintw-with-va_list-based-equivalen.patch - BuildRequires: gcc autoconf automake make zlib-devel htslib-devel ncurses-devel bzip2-devel xz-devel %description @@ -26,7 +24,7 @@ Requires: %{name} = %{version}-%{release} Header files and libraries for compiling against %{name} %prep -%autosetup -p1 +%autosetup %build autoheader @@ -38,14 +36,6 @@ autoconf -Wno-syntax %make_install install -d -m 0755 %{buildroot}%{_includedir}/bam install -p -m 0644 *.h %{buildroot}%{_includedir}/bam -install -D -p -m 0755 libbam.a %{buildroot}%{_libdir}/libbam.a - -%pre -%preun -%post -%postun - -%check %files %license LICENSE @@ -56,9 +46,11 @@ install -D -p -m 0755 libbam.a %{buildroot}%{_libdir}/libbam.a %files devel %defattr(-,root,root,-) %{_includedir}/bam -%{_libdir}/libbam.a %changelog +* Thu May 25 2023 guoyizhang - 1.17-1 +- update: 1.17 + * Thu Mar 10 2022 herengui - 1.12-5 - fix build error