- updated to 2.15.0.7

[packages/calc.git] / calc.spec

diff --git a/calc.spec b/calc.spec
index 5bbb083a6ee04ea3a15958ef6d3ed142b2e26250..07a416df010c4f8e53146b263ad2d31d59b12bf2 100644 (file)
--- a/calc.spec
+++ b/calc.spec
@@ -1,23 +1,23 @@
 #
 #

-# 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
 Summary:       Arbitrary precision calculator
 Summary(pl.UTF-8):     Kalkulator operujący na liczbach z dowolną dokładnością
 Name:          calc

-Version:       2.12.7.2
+Version:       2.15.0.7

 Release:       1
 License:       LGPL v2.1+
 Group:         Applications/Math
 Source0:       http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
 Release:       1
 License:       LGPL v2.1+
 Group:         Applications/Math
 Source0:       http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2

-# Source0-md5: 86ba447318108da52e4d9ab93e00aca9
+# Source0-md5: af55da3b29128f1f8d4ce4412cbf09fd

 Source1:       %{name}.desktop
 Source1:       %{name}.desktop

-Patch0:                %{name}-ppc.patch

 URL:           http://www.isthe.com/chongo/tech/comp/calc/
 BuildRequires: readline-devel >= 4.2
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 URL:           http://www.isthe.com/chongo/tech/comp/calc/
 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
 %define                no_install_post_check_so        1
 
 %description


@@ -38,7 +38,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}
 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
 
 %description devel
 These header files and static libraries are neccessary to build


@@ -53,7 +53,6 @@ programach.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p1

 
 %build
 %{__make} -j1 \
 
 %build
 %{__make} -j1 \


@@ -76,11 +75,14 @@ rm -rf $RPM_BUILD_ROOT
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 
 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'
 
 
 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
 
 %clean
 rm -rf $RPM_BUILD_ROOT