- updated to 0.11.1 (new library name, API 0.11; ixion 0.9.x with API 0.10 left on...

- removed obsolete mdds-1.0 patch
- added flags patch (avoid unwanted compiler/linker flags)

diff --git a/ixion-flags.patch b/ixion-flags.patch
new file mode 100644 (file)
index 0000000..cd1ad63
--- /dev/null
+++ b/ixion-flags.patch
@@ -0,0 +1,12 @@
+--- libixion-0.11.1/configure.ac.orig  2016-04-05 02:48:42.000000000 +0200
++++ libixion-0.11.1/configure.ac       2016-05-15 21:56:19.338952688 +0200
+@@ -94,8 +94,7 @@
+ AM_CONDITIONAL([BUILD_PYTHON], [test "x$enable_python" != "xno"])
+ AM_CONDITIONAL([OSX], [test "x$_os" = "xDarwin"])
+ 
+-CPPFLAGS="$CPPFLAGS -g -O2 -fvisibility=hidden -I/usr/local/include"
+-LDFLAGS="-L/usr/local/lib"
++CPPFLAGS="$CPPFLAGS -fvisibility=hidden"
+ 
+ BOOST_THREADS
+ BOOST_PROGRAM_OPTIONS

diff --git a/ixion.spec b/ixion.spec
index 6df712c9f6f3cc8460cf8af0c1d7f527f54f0141..af67e00fc5b9426b983416b352705ffd63b4a6a4 100644 (file)
--- a/ixion.spec
+++ b/ixion.spec
@@ -5,24 +5,24 @@
 Summary:       Generic formula compulation library
 Summary(pl.UTF-8):     Ogólna biblioteka do obliczania wzorów
 Name:          ixion
-Version:       0.9.1
-Release:       8
-License:       MIT
+Version:       0.11.1
+Release:       1
+License:       MPL v2.0
 Group:         Libraries
 #Source0Download: https://gitlab.com/ixion/ixion
-Source0:       http://kohei.us/files/ixion/src/lib%{name}-%{version}.tar.xz
-# Source0-md5: d292f6d62847f2305178459390842eac
-Patch0:                mdds-1.0.patch
+Source0:       http://kohei.us/files/ixion/src/libixion-%{version}.tar.xz
+# Source0-md5: 891fac2bb0d0e17382526649ed4ad9ea
+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 >= 1.0
+BuildRequires: mdds-devel >= 1.2.0
 BuildRequires: pkgconfig
-BuildRequires: python >= 1:2.7.0
-BuildRequires: python-modules
+BuildRequires: python3 >= 1:3.2
+BuildRequires: python3-devel >= 1:3.2
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -60,7 +60,7 @@ Group:                Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      boost-devel >= 1.36
 Requires:      libstdc++-devel
-Requires:      mdds-devel >= 0.12.0
+Requires:      mdds-devel >= 1.2.0
 
 %description devel
 This package contains the header files for developing applications
@@ -82,20 +82,22 @@ Static ixion library.
 %description static -l pl.UTF-8
 Statyczna biblioteka ixion.
 
-%package -n python-ixion
-Summary:       Python interface to ixion library
-Summary(pl.UTF-8):     Interfejs Pythona do biblioteki 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}
+# python 2 is no longer supported
+Obsoletes:     python-ixion
 
-%description -n python-ixion
-Python interface to ixion library.
+%description -n python3-ixion
+Python 3 interface to ixion library.
 
-%description -n python-ixion -l pl.UTF-8
-Interfejs Pythona do biblioteki ixion.
+%description -n python3-ixion -l pl.UTF-8
+Interfejs Pythona 3 do biblioteki ixion.
 
 %prep
-%setup -q -n lib%{name}-%{version}
+%setup -q -n libixion-%{version}
 %patch0 -p1
 
 %build
@@ -115,9 +117,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/ixion.la
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/ixion.la
 %if %{with static_libs}
-%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/ixion.a
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/ixion.a
 %endif
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -130,24 +132,24 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING README
+%doc AUTHORS LICENSE README
 %attr(755,root,root) %{_bindir}/ixion-parser
 %attr(755,root,root) %{_bindir}/ixion-sorter
-%attr(755,root,root) %{_libdir}/libixion-0.10.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libixion-0.10.so.0
+%attr(755,root,root) %{_libdir}/libixion-0.11.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libixion-0.11.so.0
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libixion-0.10.so
-%{_includedir}/libixion-0.10
-%{_pkgconfigdir}/libixion-0.10.pc
+%attr(755,root,root) %{_libdir}/libixion-0.11.so
+%{_includedir}/libixion-0.11
+%{_pkgconfigdir}/libixion-0.11.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libixion-0.10.a
+%{_libdir}/libixion-0.11.a
 %endif
 
-%files -n python-ixion
+%files -n python3-ixion
 %defattr(644,root,root,755)
-%attr(755,root,root) %{py_sitedir}/ixion.so
+%attr(755,root,root) %{py3_sitedir}/ixion.so

diff --git a/mdds-1.0.patch b/mdds-1.0.patch
deleted file mode 100644 (file)
index ea41f46..0000000
--- a/mdds-1.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- libixion-0.9.1/configure.ac~       2015-04-05 16:32:05.000000000 +0300
-+++ libixion-0.9.1/configure.ac        2016-05-16 10:39:00.091308725 +0300
-@@ -79,7 +79,7 @@
- fi
- 
- # Check for mdds.
--PKG_CHECK_MODULES([MDDS],[mdds >= 0.12.0])
-+PKG_CHECK_MODULES([MDDS],[mdds-1.0])
- 
- # Check for python.
- PKG_CHECK_MODULES([PYTHON], [python >= 0.27.1])