upgrade to calc 2.11.5.8

calc/calc.spec

@@ -32,11 +32,11 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [REL]
 Group:        Algorithm
 License:      GPL
-Version:      2.11.4t2
-Release:      20020206
+Version:      2.11.5.8
+Release:      20020405
 
 #   list of sources
-Source0:      ftp://ftp.gnu.org/gnu/bc/%{name}-%{version}.tar.gz
+Source0:      http://www.isthe.com/chongo/src/calc/calc-%{version}.tar.gz
 
 #   build information
 Prefix:       %{l_prefix}
@@ -64,12 +64,12 @@ AutoReqProv:  no
     chmod -R u+w .
     %{l_shtool} subst -e "s;<malloc.h>;<stdlib.h>;" *.[ch]
     %{l_make} %{l_mflags} \
-        CC="%{l_cc}" \
-        CFLAGS="%{l_cflags -O}" \
+        CC="%{l_cc} %{l_cflags -O}" \
         BINDIR=%{l_prefix}/bin \
-        TOPDIR=%{l_prefix}/lib \
+        LIBDIR=%{l_prefix}/lib/calc \
         INCDIR=%{l_prefix}/include \
-        MANDIR=%{l_prefix}/man/man1
+        MANDIR=%{l_prefix}/man/man1 \
+        CALC_SHAREDIR=%{l_prefix}/share/calc
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -79,10 +79,13 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/man/man1 
     %{l_make} %{l_mflags} install \
         BINDIR=$RPM_BUILD_ROOT%{l_prefix}/bin \
-        TOPDIR=$RPM_BUILD_ROOT%{l_prefix}/lib \
+        LIBDIR=$RPM_BUILD_ROOT%{l_prefix}/lib/calc \
         INCDIR=$RPM_BUILD_ROOT%{l_prefix}/include \
-        MANDIR=$RPM_BUILD_ROOT%{l_prefix}/man/man1
-    rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/calc/test*
+        MANDIR=$RPM_BUILD_ROOT%{l_prefix}/man/man1 \
+        CALC_SHAREDIR=$RPM_BUILD_ROOT%{l_prefix}/share/calc
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/include
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib
+    rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/calc/test*
     rm -rf $RPM_BUILD_ROOT%{l_prefix}/bin/cscript
     strip $RPM_BUILD_ROOT%{l_prefix}/bin/* 2> /dev/null || true
     %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}