X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcalc.git;a=blobdiff_plain;f=calc.spec;h=5913d38e130346cbb5d364256d1add47512aa5fc;hp=42573aa897f407abd15e64009dc57874ddd3ebbf;hb=HEAD;hpb=27db0f52a1a0794a9a4f029b069985770a2505aa

diff --git a/calc.spec b/calc.spec
index 42573aa..f8f43e6 100644
--- a/calc.spec
+++ b/calc.spec
@@ -1,16 +1,16 @@
 #
-# TODO: some unpackaged libs, should we pack them as ghosts?
-#
-%bcond_without	tests
+# Conditional build:
+%bcond_without	tests	# unit tests
+
 Summary:	Arbitrary precision calculator
 Summary(pl.UTF-8):	Kalkulator operujący na liczbach z dowolną dokładnością
 Name:		calc
-Version:	2.12.6.8
+Version:	2.15.0.2
 Release:	1
 License:	LGPL v2.1+
 Group:		Applications/Math
 Source0:	http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
-# Source0-md5:	9e1e23212a0f4983d62c0998758810fa
+# Source0-md5:	232590e366c3f51de993d99252d9ad34
 Source1:	%{name}.desktop
 Patch0:		%{name}-ppc.patch
 URL:		http://www.isthe.com/chongo/tech/comp/calc/
@@ -18,6 +18,7 @@ BuildRequires:	readline-devel >= 4.2
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# libraries have circular dependencies
 %define		no_install_post_check_so	1
 
 %description
@@ -38,7 +39,7 @@ Summary:	Calc header files and static libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe i biblioteki statyczne Calca
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Obsoletes:	calc-static
+Obsoletes:	calc-static < 2.11.8
 
 %description devel
 These header files and static libraries are neccessary to build
@@ -76,11 +77,14 @@ rm -rf $RPM_BUILD_ROOT
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/calc/README
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/calc/README
 
 find $RPM_BUILD_ROOT%{_datadir}/calc -type f | \
        xargs %{__sed} -i -e 's|#!/usr/local/bin/calc|#!%{_bindir}/calc|g'
 
+# redundant symlinks
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.so.%(echo %{version} | cut -d. -f1-3)
+
 %clean
 rm -rf $RPM_BUILD_ROOT