From f773f668e6db8a2ad0fe48a76d8adc7ed0a9365218b07b41947470108bd2d0d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 17 Sep 2012 12:01:06 +0000 Subject: [PATCH] - Add BuildRequires on makeinfo to fix Factory build OBS-URL: https://build.opensuse.org/package/show/Base:System/bc?expand=0&rev=8 --- bc-1.06-dc_ibase.patch | 58 ---------------------------------- bc-1.06.95-matlib.patch | 20 ------------ bc-1.06.95-memleak.patch | 26 --------------- bc-1.06.95-sigintmasking.patch | 27 ---------------- bc-1.06.95.tar.bz2 | 3 -- bc.changes | 5 +++ bc.spec | 3 ++ 7 files changed, 8 insertions(+), 134 deletions(-) delete mode 100644 bc-1.06-dc_ibase.patch delete mode 100644 bc-1.06.95-matlib.patch delete mode 100644 bc-1.06.95-memleak.patch delete mode 100644 bc-1.06.95-sigintmasking.patch delete mode 100644 bc-1.06.95.tar.bz2 diff --git a/bc-1.06-dc_ibase.patch b/bc-1.06-dc_ibase.patch deleted file mode 100644 index 7750721..0000000 --- a/bc-1.06-dc_ibase.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- bc-1.06/dc/numeric.c.dc_ibase 2007-08-22 08:37:57.000000000 +0200 -+++ bc-1.06/dc/numeric.c 2007-08-22 08:37:40.000000000 +0200 -@@ -285,6 +285,8 @@ dc_getnum DC_DECLARG((input, ibase, read - int digit; - int decimal; - int c; -+ int c_buff = 0; -+ int multi = 0; - - bc_init_num(&tmp); - bc_init_num(&build); -@@ -302,6 +304,9 @@ dc_getnum DC_DECLARG((input, ibase, read - } - while (isspace(c)) - c = (*input)(); -+ c_buff = (*input)(); -+ if (isdigit(c_buff) || ('A' <= c_buff && c_buff <= 'F') || c_buff == '.') -+ multi = 1; - for (;;){ - if (isdigit(c)) - digit = c - '0'; -@@ -309,10 +314,15 @@ dc_getnum DC_DECLARG((input, ibase, read - digit = 10 + c - 'A'; - else - break; -- c = (*input)(); -+ digit = multi ? (digit >= ibase ? ibase -1 : digit) : digit; - bc_int2num(&tmp, digit); - bc_multiply(result, base, &result, 0); - bc_add(result, tmp, &result, 0); -+ if (c_buff) { -+ c = c_buff; -+ c_buff = 0; -+ } else -+ c = (*input)(); - } - if (c == '.'){ - bc_free_num(&build); -@@ -321,13 +331,18 @@ dc_getnum DC_DECLARG((input, ibase, read - build = bc_copy_num(_zero_); - decimal = 0; - for (;;){ -- c = (*input)(); -+ if (c_buff) { -+ c = c_buff; -+ c_buff = 0; -+ } else -+ c = (*input)(); - if (isdigit(c)) - digit = c - '0'; - else if ('A' <= c && c <= 'F') - digit = 10 + c - 'A'; - else - break; -+ digit = digit >= ibase ? ibase -1 : digit; - bc_int2num(&tmp, digit); - bc_multiply(build, base, &build, 0); - bc_add(build, tmp, &build, 0); diff --git a/bc-1.06.95-matlib.patch b/bc-1.06.95-matlib.patch deleted file mode 100644 index 2b3939d..0000000 --- a/bc-1.06.95-matlib.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urNp bc-1.06.95-orig/bc/storage.c bc-1.06.95/bc/storage.c ---- bc-1.06.95-orig/bc/storage.c 2006-09-05 04:39:31.000000000 +0200 -+++ bc-1.06.95/bc/storage.c 2010-12-22 10:26:43.805250912 +0100 -@@ -99,6 +99,7 @@ more_functions (VOID) - { - f = &functions[indx]; - f->f_defined = FALSE; -+ f->f_void = FALSE; - f->f_body = (char *) bc_malloc (BC_START_SIZE); - f->f_body_size = BC_START_SIZE; - f->f_code_size = 0; -@@ -179,7 +180,7 @@ more_arrays () - - - /* Initialize the new elements. */ -- for (; indx < v_count; indx++) -+ for (; indx < a_count; indx++) - arrays[indx] = NULL; - - /* Free the old elements. */ diff --git a/bc-1.06.95-memleak.patch b/bc-1.06.95-memleak.patch deleted file mode 100644 index 8e50604..0000000 --- a/bc-1.06.95-memleak.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/bc/bc.y b/bc/bc.y -index 14dc4be..bd91c38 100644 ---- a/bc/bc.y -+++ b/bc/bc.y -@@ -569,6 +569,7 @@ expression : named_expression ASSIGN_OP - generate (">"); - break; - } -+ free($2); - } - | expression '+' expression - { -diff --git a/bc/util.c b/bc/util.c -index 30beaf9..26e2e85 100644 ---- a/bc/util.c -+++ b/bc/util.c -@@ -602,8 +602,7 @@ lookup (name, namekind) - case FUNCTDEF: - if (id->f_name != 0) - { -- if (namekind != FUNCT) -- free(name); -+ free(name); - /* Check to see if we are redefining a math lib function. */ - if (use_math && namekind == FUNCTDEF && id->f_name <= 6) - id->f_name = next_func++; diff --git a/bc-1.06.95-sigintmasking.patch b/bc-1.06.95-sigintmasking.patch deleted file mode 100644 index 362f808..0000000 --- a/bc-1.06.95-sigintmasking.patch +++ /dev/null @@ -1,27 +0,0 @@ -Binary files bc-1.06.95-orig/dc/.dc.c.swp and bc-1.06.95/dc/.dc.c.swp differ -diff -urNp bc-1.06.95-orig/dc/eval.c bc-1.06.95/dc/eval.c ---- bc-1.06.95-orig/dc/eval.c 2006-06-04 13:04:40.000000000 +0200 -+++ bc-1.06.95/dc/eval.c 2011-09-08 15:11:48.815060585 +0200 -@@ -661,7 +661,9 @@ dc_evalfile DC_DECLARG((fp)) - int next_negcmp = 0; - dc_data datum; - -- signal(SIGINT, dc_trap_interrupt); -+ /* Do not mask SIGINT when running from stdin */ -+ if (fp != stdin) -+ signal(SIGINT, dc_trap_interrupt); - stdin_lookahead = EOF; - for (c=getc(fp); c!=EOF; c=peekc){ - peekc = getc(fp); -diff -urNp bc-1.06.95-orig/doc/dc.texi bc-1.06.95/doc/dc.texi ---- bc-1.06.95-orig/doc/dc.texi 2006-06-11 10:15:54.000000000 +0200 -+++ bc-1.06.95/doc/dc.texi 2011-09-08 15:09:37.032059798 +0200 -@@ -126,6 +126,8 @@ To exit, use @samp{q}. - (or whatever other keystroke your system uses to generate a @code{SIGINT}) - does not exit; - it is used to abort macros that are looping, etc. -+This is not true if running on stdin to prevent accidental user confusion -+about @kbd{C-c} unfunctionality. - - A reverse-polish calculator stores numbers on a stack. - Entering a number pushes it on the stack. diff --git a/bc-1.06.95.tar.bz2 b/bc-1.06.95.tar.bz2 deleted file mode 100644 index d64e9e5..0000000 --- a/bc-1.06.95.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc -size 290069 diff --git a/bc.changes b/bc.changes index c731579..aadd228 100644 --- a/bc.changes +++ b/bc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Sep 17 12:00:40 UTC 2012 - idonmez@suse.com + +- Add BuildRequires on makeinfo to fix Factory build + ------------------------------------------------------------------- Thu May 31 12:56:27 UTC 2012 - sweet_f_a@gmx.de diff --git a/bc.spec b/bc.spec index a687f95..d3519c2 100644 --- a/bc.spec +++ b/bc.spec @@ -20,6 +20,9 @@ Name: bc BuildRequires: bison BuildRequires: ed BuildRequires: flex +%if 0%{?suse_version} > 1220 +BuildRequires: makeinfo +%endif BuildRequires: readline-devel Url: ftp://ftp.gnu.org/pub/gnu/bc PreReq: %{install_info_prereq}