[calc] Long-neglected update to 2.12.4.4
Matthew Miller
mattdm at fedoraproject.org
Wed Aug 10 23:27:55 UTC 2011
commit e73c6cdc7b9a786f377bba90a39f7e170f7d838b
Author: Matthew Miller <mattdm at mattdm.org>
Date: Wed Aug 10 19:27:15 2011 -0400
Long-neglected update to 2.12.4.4
.gitignore | 1 +
calc-2.12.2.1-entangled-readline.patch | 27 ------
calc-2.12.2.1-no-custom-means-no-custom.patch | 110 -------------------------
calc.spec | 57 ++++++++++---
sources | 2 +-
5 files changed, 46 insertions(+), 151 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ac05ff..fb3d0f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
calc-2.12.2.1.tar.gz
clog
+/calc-2.12.4.4.tar.bz2
diff --git a/calc.spec b/calc.spec
index e4a4aa5..015a098 100644
--- a/calc.spec
+++ b/calc.spec
@@ -15,23 +15,24 @@ License: LGPLv2
%endif
Name: calc
-Version: 2.12.2.1
-Release: 15%{?dist}
+Version: 2.12.4.4
+Release: 1%{?dist}
Summary: Arbitrary precision arithmetic system and calculator
Group: Applications/Engineering
URL: http://isthe.com/chongo/tech/comp/calc/
-Source0: http://www.isthe.com/chongo/src/calc/calc-%{version}.tar.gz
+Source0: http://www.isthe.com/chongo/src/calc/calc-%{version}.tar.bz2
Source1: calc-converted-to-gpl.txt
Source2: calc-COPYING-GPL
-Patch0: calc-2.12.2.1-entangled-readline.patch
-Patch1: calc-2.12.2.1-no-custom-means-no-custom.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: sed, util-linux
%if %{with_readline}
-BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 4.2
+# If readline-devel < 5.2-3, READLINE_EXTRAS must be set to
+# "-lhistory -lncurses" or some variant (e.g. -ltinfo).
+# If readline-devel < 4.2, something else goes horribly wrong.
+BuildRequires: ncurses-devel >= 5.2-26, readline-devel >= 5.2-3
%endif
Requires: less >= 358
@@ -82,9 +83,6 @@ useful in themselves.
%prep
%setup -q
-%patch0 -p1 -b .link
-%patch1 -p1 -b .nomeansno
-
%if %{with_readline}
for f in help.c version.c calc.man cal/* $( ls help/*|grep '^help/credit$' ) ; do
sed -i -e's/version 2.1 \(.*GNU\)/version 2 \1/;s/COPYING.LGPL/COPYING-GPL/;s/copying.lgpl/copying-gpl/;s/GNU LGPL/GNU GPL/;s/GNU Lesser General/GNU General/' $f
@@ -106,7 +104,7 @@ make DEBUG="%{optflags}" \
%if %{with_readline}
USE_READLINE="-DUSE_READLINE" \
READLINE_LIB="-lreadline" \
- READLINE_EXTRAS="-lhistory -lncurses" \
+ READLINE_EXTRAS="" \
%else
USE_READLINE="" \
%endif
@@ -126,6 +124,11 @@ make DEBUG="%{optflags}" \
rm -rf %{buildroot}
make T=%{buildroot} \
+%if %{with_custom_interface}
+ ALLOW_CUSTOM="-DCUSTOM" \
+%else
+ ALLOW_CUSTOM="" \
+%endif
BINDIR=%{_bindir} \
LIBDIR=%{_libdir} \
CALC_SHAREDIR=%{_datadir}/%{name} \
@@ -142,10 +145,8 @@ make T=%{buildroot} \
%endif
%if ! %{with_custom_interface}
- # if we don't enable the custom interface, don't ship it.
+ # if we don't enable the custom interface, don't ship symlinks to it
rm -f %{buildroot}/%{_libdir}/libcustcalc.so*
- rm -f %{buildroot}/%{_datadir}/%{name}/custom/*
- rmdir %{buildroot}/%{_datadir}/%{name}/custom/
%endif
# Changing permissions of executables to 755 to shut up rpmlint.
@@ -179,8 +180,10 @@ rm -rf %{buildroot}
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/help
%{_datadir}/%{name}/help/*
+%if %{with_custom_interface}
%dir %{_datadir}/%{name}/custhelp
%{_datadir}/%{name}/custhelp/*
+%endif
%if ! %{with_readline}
%{_datadir}/%{name}/bindings
%endif
@@ -217,6 +220,11 @@ rm -rf %{buildroot}
%changelog
+* Wed Aug 10 2011 Matthew Miller <mattdm at mattdm.org> - 2.14.4.4-1
+- update to 2.14.4.4 (latest unstable, but differences from stable
+ are small bugfixes)
+- vsnprintf bug fix is accepted upstream, so remove patch
+
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.2.1-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
@@ -226,6 +234,29 @@ rm -rf %{buildroot}
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.12.2.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+* Mon Nov 3 2008 Matthew Miller <mattdm at mattdm.org> - 2.12.4.0-3
+- fixed extra vsnprintf crash bug
+
+* Mon Oct 27 2008 Matthew Miller <mattdm at mattdm.org> - 2.12.4.0-2
+- entangled readline patch is made obsolete by linking changes in
+ readline itself. (readline is still too entangled, but
+ that's an upstream problem.)
+
+* Mon Oct 27 2008 Matthew Miller <mattdm at mattdm.org> - 2.12.4.0-1
+- update to 2.12.4.0
+- upstream has switched to bz2 at my request :)
+- some of the entangled-readline-fix stuff is upstream, but for a
+ complete fix some coding is needed. (Also, adding libedit as an option
+ would be good -- talk to me for details.)
+- patch to disable the custom lib completely is upstream. cool.
+- add ALLOW_CUSTOM definition to make install section -- changes to upstream
+ makefile mean that if that's missing it now tries to build the custom lib
+ at that point.
+- upstream now doesn't create the custom dir if ALLOW_CUSTOM is off, so we
+ no longer need to clean it up. And same with custhelp. There's still an
+ upstream bug where libcustomcalc dangling symlinks are created, though.
+
+
* Wed Feb 20 2008 Matthew Miller <mattdm at mattdm.org> - 2.12.2.1-12
- add util-linux as a build prereq
diff --git a/sources b/sources
index 747f536..537208e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c399c7b7d71d756c5eaef77e414a732b calc-2.12.2.1.tar.gz
+1ad16a9304df7137cd8626a1f50b6aae calc-2.12.4.4.tar.bz2
More information about the scm-commits
mailing list