- updated to 1.07.1

- updated info patch
- removed obsolete readline,flex,save_adr patches

diff --git a/bc-flex.patch b/bc-flex.patch
deleted file mode 100644 (file)
index 38a6e66..0000000
--- a/bc-flex.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in-orig  Thu Jul 10 13:07:11 2003
-+++ configure.in       Thu Jul 10 13:07:14 2003
-@@ -68,7 +68,7 @@
- ])
- 
- if test "$LEX" = "flex" ; then
-- LEX="flex -I8"
-+ LEX="flex -I"
- else
-  if test "$bcrl" = "y" ; then
-   AC_MSG_WARN(readline works only with flex.)

diff --git a/bc-info.patch b/bc-info.patch
index ed574c1807cb13c2269169a7ccc6680f6ddc0531..0522f6c27e5c8e654c6cd9711d5bbf6a447f57ab 100644 (file)
--- a/bc-info.patch
+++ b/bc-info.patch
@@ -1,29 +1,26 @@
-diff -Nur bc-1.06.orig/doc/dc.texi bc-1.06/doc/dc.texi
---- bc-1.06.orig/doc/dc.texi   Thu Aug 31 17:57:43 2000
-+++ bc-1.06/doc/dc.texi        Sat Aug  4 14:02:58 2001
-@@ -21,8 +21,9 @@
+--- bc-1.07.1/doc/dc.texi.orig 2017-06-08 19:14:57.069763192 +0200
++++ bc-1.07.1/doc/dc.texi      2017-06-08 19:21:18.129758838 +0200
+@@ -18,8 +18,9 @@
+ @syncodeindex pg fn

  @syncodeindex tp fn
  
  @syncodeindex tp fn
  

- @ifinfo

 +@dircategory Miscellaneous:
  @direntry
 +@dircategory Miscellaneous:
  @direntry

--* dc: (dc).                   Arbritrary precision RPN ``Desktop Calculator''.
-+* dc: (dc).                           Arbritrary precision RPN ``Desktop Calculator''
+-* dc: (dc).                   Arbitrary precision RPN ``Desktop Calculator''.
++* dc: (dc).                           Arbitrary precision RPN ``Desktop Calculator''

  @end direntry
  @end direntry

- This file documents @sc{dc}, an arbitrary precision calculator.

  
  

-@@ -88,6 +89,14 @@
- @page
+ @copying
+--- bc-1.07.1/doc/bc.texi.orig 2017-04-07 23:55:49.000000000 +0200
++++ bc-1.07.1/doc/bc.texi      2017-06-08 19:22:03.059758327 +0200
+@@ -16,8 +16,9 @@
+ @c end tex

  
  

- @node Top, Introduction, (dir), (dir)
-+@top dc
-+
-+DC is a reverse-polish desk calculator which supports unlimited
-+precision arithmetic.  It also allows you to define and call macros.
-+Normally DC reads from the standard input; if any command arguments are
-+given to it, they are filenames, and DC reads and executes the contents
-+of the files instead of reading from standard input.  All normal output
-+is to standard output; all error messages are written to standard error.
+ @ifinfo
++@dircategory Miscellaneous:
+ @direntry
+-* bc: (bc).                    An arbitrary precision calculator language.
++* bc: (bc).                           An arbitrary precision calculator language
+ @end direntry
+ @end ifinfo

  
  

- @menu
- * Introduction::                Introduction

diff --git a/bc-readline.patch b/bc-readline.patch
deleted file mode 100644 (file)
index 5d71bfc..0000000
--- a/bc-readline.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- bc-1.06/bc/scan.l.wiget    Fri Apr 13 18:49:49 2001
-+++ bc-1.06/bc/scan.l  Fri Apr 13 18:50:58 2001
-@@ -143,7 +143,6 @@
- 
- /* Definitions for readline access. */
- extern FILE *rl_instream;
--_PROTOTYPE(char *readline, (char *));
- 
- /* rl_input puts upto MAX characters into BUF with the number put in
-    BUF placed in *RESULT.  If the yy input file is the same as

diff --git a/bc-save_adr.patch b/bc-save_adr.patch
deleted file mode 100644 (file)
index 2ead293..0000000
--- a/bc-save_adr.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- bc-1.06/bc/load.c.s390     Wed Sep 13 20:22:38 2000
-+++ bc-1.06/bc/load.c  Wed Sep  5 16:10:18 2001
-@@ -156,7 +156,10 @@
-   long  label_no;
-   long  vaf_name;     /* variable, array or function number. */
-   long  func;
--  program_counter save_adr;
-+  /* Make save_adr static. Otherwise the whole address save stuff doesn't make
-+     any sense at all and break e.g. on S390.
-+     09/05/01 Phil Knirsch <pknirsch@redhat.de> */
-+  static program_counter save_adr;
- 
-   /* Initialize. */
-   str = code;

diff --git a/bc.spec b/bc.spec
index bce4eea98d702c94e6e445cd8a6b8d67fd2cef74..6b54337fecca87ad201800e9df242d8fef504042 100644 (file)
--- a/bc.spec
+++ b/bc.spec
@@ -8,23 +8,20 @@ Summary(ru.UTF-8):    GNU bc (язык обработки чисел) и dc (кал
 Summary(tr.UTF-8):     GNU hesap makinası
 Summary(uk.UTF-8):     GNU bc (мова обробки чисел) та dc (калькулятор)
 Name:          bc
 Summary(tr.UTF-8):     GNU hesap makinası
 Summary(uk.UTF-8):     GNU bc (мова обробки чисел) та dc (калькулятор)
 Name:          bc

-Version:       1.06
-Release:       24
+Version:       1.07.1
+Release:       1

 License:       GPL v2+
 Group:         Applications/Math
 Source0:       http://ftp.gnu.org/gnu/bc/%{name}-%{version}.tar.gz
 License:       GPL v2+
 Group:         Applications/Math
 Source0:       http://ftp.gnu.org/gnu/bc/%{name}-%{version}.tar.gz

-# Source0-md5: d44b5dddebd8a7a7309aea6c36fda117
+# Source0-md5: cda93857418655ea43590736fc3ca9fc

 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: ae2cf58a4382d6a0bfeaab3a6a11bd30
 Source2:       bc.desktop
 Source3:       dc.desktop
 Source4:       bc.png
 Patch0:                %{name}-info.patch
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: ae2cf58a4382d6a0bfeaab3a6a11bd30
 Source2:       bc.desktop
 Source3:       dc.desktop
 Source4:       bc.png
 Patch0:                %{name}-info.patch

-Patch1:                %{name}-readline.patch
-Patch2:                %{name}-flex.patch
-Patch3:                %{name}-save_adr.patch

 URL:           http://www.gnu.org/software/bc/
 URL:           http://www.gnu.org/software/bc/

-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50

 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: automake
 BuildRequires: bison
 BuildRequires: flex


@@ -82,13 +79,11 @@ ileri yetenekleri vardır.
 %prep
 %setup -q
 %patch0 -p1
 %prep
 %setup -q
 %patch0 -p1

-%patch1 -p1
-%patch2 -p0
-%patch3 -p1

 
 %build
 %{__aclocal}
 %{__autoconf}
 
 %build
 %{__aclocal}
 %{__autoconf}

+%{__autoheader}

 %{__automake}
 %configure \
        --with-readline
 %{__automake}
 %configure \
        --with-readline