diff --git a/.cvsignore b/.cvsignore index 1c96287..88848bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -bc-1.06.tar.gz +bc-1.06.tar.bz2 diff --git a/bc-1.06-readline42.patch b/bc-1.06-readline42.patch new file mode 100644 index 0000000..37dfaf5 --- /dev/null +++ b/bc-1.06-readline42.patch @@ -0,0 +1,10 @@ +--- bc-1.06/bc/scan.l.sux Fri May 11 14:27:20 2001 ++++ bc-1.06/bc/scan.l Fri May 11 14:27:32 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.spec b/bc.spec index 5ce6632..0a42a99 100644 --- a/bc.spec +++ b/bc.spec @@ -1,11 +1,12 @@ Summary: GNU's bc (a numeric processing language) and dc (a calculator). Name: bc Version: 1.06 -Release: 2 +Release: 4 Copyright: GPL URL: http://www.gnu.org/software/bc/ Group: Applications/Engineering -Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.gz +Source: ftp://ftp.gnu.org/gnu/bc/bc-%{version}.tar.bz2 +Patch: bc-1.06-readline42.patch Prereq: /sbin/install-info grep Buildroot: %{_tmppath}/%{name}-%{version}-root @@ -20,6 +21,7 @@ if you would like to use its text mode calculator. %prep %setup -q +%patch -p1 -b .rl22 %build autoconf @@ -41,8 +43,9 @@ rm -rf $RPM_BUILD_ROOT # previous versions of bc put an improper entry into %{_infodir}/dir -- remove # it if grep 'dc: (bc)' %{_infodir}/dir > /dev/null; then - grep -v 'The GNU RPN calculator' < %{_infodir}/dir > %{_infodir}/dir.$$ - mv -f %{_infodir}/dir.$$ %{_infodir}/dir + tmpfile=`mktemp ${_infodir}/dir.XXXXXX` + grep -v 'The GNU RPN calculator' < %{_infodir}/dir > $tmpfile + mv -f $tmpfile %{_infodir}/dir fi /sbin/install-info %{_infodir}/dc.info.gz %{_infodir}/dir --entry="* dc: (dc). The GNU RPN calculator." @@ -61,6 +64,13 @@ fi %{_infodir}/* %changelog +* Fri May 11 2001 Preston Brown 1.06-4 +- use mktemp, not the pid shell variable, in rpm scriptlets + +* Fri May 11 2001 Bernhard Rosenkraenzer 1.06-3 +- rebuild with new readline +- Add patch to fix compilation with recent readline versions + * Fri Dec 01 2000 Trond Eivind Glomsrød - Add COPYING, COPYING.LIB, FAQ, AUTHORS, NEWS, README diff --git a/sources b/sources index 259ca3e..4e52724 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d44b5dddebd8a7a7309aea6c36fda117 bc-1.06.tar.gz +8cf9bd2fb29340a34582f15a6c8b13b3 bc-1.06.tar.bz2