X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ixion.spec;h=03ffadfdd565d9a07ebbf0a00ef3b74c324921d0;hb=a1c2609;hp=525fa0041df00240e05b6b499569f9425f3935d8;hpb=0c697d77a88a61883d20df8cf5cf33c52db00ea6;p=packages%2Fixion.git

diff --git a/ixion.spec b/ixion.spec
index 525fa00..03ffadf 100644
--- a/ixion.spec
+++ b/ixion.spec
@@ -1,25 +1,31 @@
 #
 # Conditional build:
 %bcond_without	static_libs	# static library
-#
+
 Summary:	Generic formula compulation library
 Summary(pl.UTF-8):	Ogólna biblioteka do obliczania wzorów
 Name:		ixion
-Version:	0.7.0
-Release:	2
-License:	MIT
+Version:	0.14.1
+Release:	1
+License:	MPL v2.0
 Group:		Libraries
-#Source0Download: http://gitorious.org/ixion/pages/Download
-Source0:	http://kohei.us/files/ixion/src/libixion-%{version}.tar.bz2
-# Source0-md5:	000157117801f9507f34b26ba998c4d1
-Patch0:		%{name}-am.patch
-URL:		http://gitorious.org/ixion/pages/Home
+#Source0Download: https://gitlab.com/ixion/ixion
+Source0:	http://kohei.us/files/ixion/src/libixion-%{version}.tar.xz
+# Source0-md5:	ab6b645987e4f3e2df2e4d5debace7f7
+Patch0:		%{name}-flags.patch
+URL:		https://gitlab.com/ixion/ixion
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	boost-devel >= 1.36
-BuildRequires:	libstdc++-devel
+BuildRequires:	libstdc++-devel >= 6:4.7
 BuildRequires:	libtool >= 2:2
-BuildRequires:	mdds-devel >= 0.7.1
+BuildRequires:	mdds-devel >= 1.4.0
+BuildRequires:	pkgconfig
+BuildRequires:	python3 >= 1:3.4
+BuildRequires:	python3-devel >= 1:3.4
+BuildRequires:	rpmbuild(macros) >= 1.734
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -55,7 +61,7 @@ Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
 Requires:	boost-devel >= 1.36
 Requires:	libstdc++-devel
-Requires:	mdds-devel >= 0.7.1
+Requires:	mdds-devel >= 1.2.0
 
 %description devel
 This package contains the header files for developing applications
@@ -77,6 +83,21 @@ Static ixion library.
 %description static -l pl.UTF-8
 Statyczna biblioteka ixion.
 
+%package -n python3-ixion
+Summary:	Python 3 interface to ixion library
+Summary(pl.UTF-8):	Interfejs Pythona 3 do biblioteki ixion
+Group:		Libraries/Python
+Requires:	%{name} = %{version}-%{release}
+Requires:	python3-libs >= 1:3.4
+# python 2 is no longer supported
+Obsoletes:	python-ixion
+
+%description -n python3-ixion
+Python 3 interface to ixion library.
+
+%description -n python3-ixion -l pl.UTF-8
+Interfejs Pythona 3 do biblioteki ixion.
+
 %prep
 %setup -q -n libixion-%{version}
 %patch0 -p1
@@ -87,8 +108,6 @@ Statyczna biblioteka ixion.
 %{__autoconf}
 %{__automake}
 %configure \
-	boost_cv_lib_thread=yes \
-	boost_cv_lib_thread_LIBS="-lboost_thread -lboost_system" \
 	--disable-silent-rules \
 	%{?with_static_libs:--enable-static}
 
@@ -100,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/ixion.la
+%if %{with static_libs}
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/ixion.a
+%endif
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
@@ -111,20 +134,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING README
+%doc AUTHORS LICENSE
+%attr(755,root,root) %{_bindir}/ixion-formula-tokenizer
 %attr(755,root,root) %{_bindir}/ixion-parser
 %attr(755,root,root) %{_bindir}/ixion-sorter
-%attr(755,root,root) %{_libdir}/libixion-0.8.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libixion-0.8.so.0
+%attr(755,root,root) %{_libdir}/libixion-0.14.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libixion-0.14.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libixion-0.8.so
-%{_includedir}/libixion-0.8
-%{_pkgconfigdir}/libixion-0.8.pc
+%attr(755,root,root) %{_libdir}/libixion-0.14.so
+%{_includedir}/libixion-0.14
+%{_pkgconfigdir}/libixion-0.14.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libixion-0.8.a
+%{_libdir}/libixion-0.14.a
 %endif
+
+%files -n python3-ixion
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/ixion.so