From: Jakub Bogusz Date: Fri, 15 Feb 2013 16:01:15 +0000 (+0100) Subject: - updated to 0.3.0 X-Git-Tag: auto/th/ixion-0.5.0-1~1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=b8fb894e8cd5af35da045b48fde19ae903a3610c;p=packages%2Fixion.git - updated to 0.3.0 - added am patch (fixes build with automake 1.13) --- diff --git a/ixion-am.patch b/ixion-am.patch new file mode 100644 index 0000000..127591b --- /dev/null +++ b/ixion-am.patch @@ -0,0 +1,8 @@ +--- libixion_0.3.0/src/Makefile.am.orig 2011-11-01 23:48:02.000000000 +0100 ++++ libixion_0.3.0/src/Makefile.am 2013-02-14 20:51:19.911837432 +0100 +@@ -24,4 +24,4 @@ + ixion_test_LDADD = libixion/libixion-@IXION_API_VERSION@.la + ixion_test_CPPFLAGS = -I$(top_builddir)/lib/libixion/libixion.la + +-TESTS = $(top_srcdir)/test/ixion-parser-test.sh ixion-test ++TESTS = ../test/ixion-parser-test.sh ixion-test diff --git a/ixion.spec b/ixion.spec index 25b0406..fda27db 100644 --- a/ixion.spec +++ b/ixion.spec @@ -5,15 +5,19 @@ Summary: Generic formula compulation library Summary(pl.UTF-8): Ogólna biblioteka do obliczania wzorów Name: ixion -Version: 0.2.0 +Version: 0.3.0 Release: 1 License: MIT Group: Libraries -Source0: http://dev-www.libreoffice.org/src/%{name}-%{version}.tar.gz -# Source0-md5: 0f63ee487fda8f21fafa767b3c447ac9 -URL: http://kohei.us/2010/06/21/ixion-threaded-formula-calculation-library/ +Source0: http://kohei.us/files/ixion/src/libixion_%{version}.tar.bz2 +# Source0-md5: 96a36a0016f968a5a7c4b167eeb1643b +Patch0: %{name}-am.patch +URL: http://gitorious.org/ixion/pages/Home +BuildRequires: autoconf >= 2.63 +BuildRequires: automake BuildRequires: boost-devel >= 1.36 BuildRequires: libstdc++-devel +BuildRequires: libtool BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -71,10 +75,17 @@ Static ixion library. Statyczna biblioteka ixion. %prep -%setup -q +%setup -q -n libixion_%{version} +%patch0 -p1 %build +%{__libtoolize} +%{__aclocal} -I m4 +%{__autoconf} +%{__automake} %configure \ + boost_cv_lib_thread=yes \ + boost_cv_lib_thread_LIBS="-lboost_thread -lboost_system" \ %{!?with_static_libs:--disable-static} %{__make} @@ -96,20 +107,20 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) -%doc AUTHORS COPYING ChangeLog README +%doc AUTHORS COPYING README %attr(755,root,root) %{_bindir}/ixion-parser %attr(755,root,root) %{_bindir}/ixion-sorter -%attr(755,root,root) %{_libdir}/libixion-0.2.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libixion-0.2.so.0 +%attr(755,root,root) %{_libdir}/libixion-0.4.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libixion-0.4.so.0 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libixion-0.2.so -%{_includedir}/libixion-0.2 -%{_pkgconfigdir}/ixion-0.2.pc +%attr(755,root,root) %{_libdir}/libixion-0.4.so +%{_includedir}/libixion-0.4 +%{_pkgconfigdir}/libixion-0.4.pc %if %{with static_libs} %files static %defattr(644,root,root,755) -%{_libdir}/libixion-0.2.a +%{_libdir}/libixion-0.4.a %endif