X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcalc.git;a=blobdiff_plain;f=calc.spec;h=5bbb083a6ee04ea3a15958ef6d3ed142b2e26250;hp=339b18b7f16c6d95d73cf3bb09be80790c6b5711;hb=4093b357ad73f30a0ed9120b4c2411acb270c414;hpb=6d75ff83b66baf56298772cc0f1493a6b97a6bf4

diff --git a/calc.spec b/calc.spec
index 339b18b..5bbb083 100644
--- a/calc.spec
+++ b/calc.spec
@@ -1,18 +1,25 @@
+#
+# TODO: some unpackaged libs, should we pack them as ghosts?
+#
+%bcond_without	tests
 Summary:	Arbitrary precision calculator
 Summary(pl.UTF-8):	Kalkulator operujący na liczbach z dowolną dokładnością
 Name:		calc
-Version:	2.12.1.12
+Version:	2.12.7.2
 Release:	1
-License:	LGPL
+License:	LGPL v2.1+
 Group:		Applications/Math
-Source0:	http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.gz
-# Source0-md5:	e20630279c378770ef2df36c87a931e5
+Source0:	http://www.isthe.com/chongo/src/calc/%{name}-%{version}.tar.bz2
+# Source0-md5:	86ba447318108da52e4d9ab93e00aca9
 Source1:	%{name}.desktop
+Patch0:		%{name}-ppc.patch
 URL:		http://www.isthe.com/chongo/tech/comp/calc/
-BuildRequires:	sed >= 4.0
 BuildRequires:	readline-devel >= 4.2
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		no_install_post_check_so	1
+
 %description
 Calc is arbitrary precision arithmetic system that uses a C-like
 language. Calc is useful as a calculator, an algorithm prototyped and
@@ -30,9 +37,7 @@ matematycznych, programistycznych i funkcji wejścia/wyjścia
 Summary:	Calc header files and static libraries
 Summary(pl.UTF-8):	Pliki nagłówkowe i biblioteki statyczne Calca
 Group:		Development/Libraries
-# only static libraries now
-# to be changed after switching to shared lib
-#Requires:	%{name} = %{version}
+Requires:	%{name} = %{version}-%{release}
 Obsoletes:	calc-static
 
 %description devel
@@ -48,6 +53,7 @@ programach.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__make} -j1 \
@@ -58,20 +64,17 @@ programach.
 	READLINE_INCLUDE=%{_includedir} \
 	SCRIPTDIR=%{_datadir}/calc/cscript
 
+%{?with_tests:%{__make} check}
+
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/calc/{cscript,custom,help} \
-	$RPM_BUILD_ROOT{%{_includedir},%{_mandir}/man1,%{_libdir}} \
-	$RPM_BUILD_ROOT{%{_bindir},%{_desktopdir}}
 
 %{__make} install \
+	LIBDIR=%{_libdir} \
 	T=$RPM_BUILD_ROOT \
 	SCRIPTDIR=%{_datadir}/calc/cscript
 
-mv -f $RPM_BUILD_ROOT%{_datadir}/calc/custom/libcustcalc.a $RPM_BUILD_ROOT%{_libdir}
-mv -f cal/README README.cal
-
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
+install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/calc/README
 
@@ -81,17 +84,23 @@ find $RPM_BUILD_ROOT%{_datadir}/calc -type f | \
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
 # COPYING is not just LGPL text, only some explanations
-%doc BUGS CHANGES COPYING README
-%attr(755,root,root) %{_bindir}/*
+%doc BUGS CHANGES COPYING README.md
+%attr(755,root,root) %{_bindir}/calc
+%attr(755,root,root) %{_libdir}/libcalc.so.*.*.*.*
+%attr(755,root,root) %{_libdir}/libcustcalc.so.*.*.*.*
 %{_datadir}/calc
-%{_mandir}/man*/*
-%{_desktopdir}/*.desktop
+%{_desktopdir}/calc.desktop
+%{_mandir}/man1/calc.1*
 
 %files devel
 %defattr(644,root,root,755)
-%doc LIBRARY sample/README_SAMPLE
-%{_libdir}/lib*.a
+%doc LIBRARY
+%attr(755,root,root) %{_libdir}/libcalc.so
+%attr(755,root,root) %{_libdir}/libcustcalc.so
 %{_includedir}/calc