diff --git a/.gitignore b/.gitignore index ad84f13..f23a165 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/slang-2.3.0.tar.bz2 +/slang-2.3.1.tar.bz2 diff --git a/slang-dupdeclaration.patch b/slang-dupdeclaration.patch deleted file mode 100644 index e7d27b5..0000000 --- a/slang-dupdeclaration.patch +++ /dev/null @@ -1,18 +0,0 @@ -commit e3130695cec1e0fb3144e2f44040a254bebc08e4 -Author: John E. Davis -Date: Mon Feb 2 10:22:43 2015 -0500 - - pre2.3.1-17: remove duplicate prototype for SLrline_get_update_client_data from slang.h - -diff --git a/src/slang.h b/src/slang.h -index 7df1552..0356370 100644 ---- a/src/slang.h -+++ b/src/slang.h -@@ -1624,7 +1624,6 @@ SL_EXTERN int SLrline_set_update_hook (SLrline_Type *, - VOID_STAR client_data); - /* free update_hook client_data */ - SL_EXTERN void SLrline_set_free_update_cb (SLrline_Type *, void (*)(SLrline_Type *, VOID_STAR)); --SL_EXTERN int SLrline_get_update_client_data (SLrline_Type *, VOID_STAR *); - - /* These functions are passed a pointer to the update_hook client_data */ - SL_EXTERN void SLrline_set_update_clear_cb(SLrline_Type *, void (*)(SLrline_Type *, VOID_STAR)); diff --git a/slang.spec b/slang.spec index 6631f48..a3f874d 100644 --- a/slang.spec +++ b/slang.spec @@ -7,7 +7,7 @@ Summary: The shared library for the S-Lang extension language Name: slang -Version: 2.3.0 +Version: 2.3.1 Release: 7%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -16,8 +16,6 @@ Source: http://www.jedsoft.org/releases/%{name}/%{name}-%{version}.tar.bz2 Patch1: slang-2.2.4-perms.patch # disable test that fails with SIGHUP ignored (e.g. in koji) Patch2: slang-sighuptest.patch -# remove duplicate declaration in slang.h -Patch3: slang-dupdeclaration.patch URL: http://www.jedsoft.org/slang/ BuildRequires: libpng-devel pcre-devel zlib-devel %{?with_oniguruma:BuildRequires: oniguruma-devel} @@ -70,7 +68,6 @@ language. %setup -q %patch1 -p1 -b .perms %patch2 -p1 -b .sighuptest -%patch3 -p1 -b .dupdeclaration head -n -1800 < changes.txt > changes.txt_ && tail -n 1800 < changes.txt | \ iconv -f iso8859-1 -t utf8 >> changes.txt_ && \ diff --git a/sources b/sources index f6f177d..f965e76 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3bcc790460d52db1316c20395b7ac2f1 slang-2.3.0.tar.bz2 +bd46d1dc17a50c72004ad842829d7b1f slang-2.3.1.tar.bz2