X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=vmmlib.spec;h=ccec8b7547d810bcd5d7524e2ed9c2a656fbb60e;hb=HEAD;hp=7f0fd904cbd9681391e250d02dc417c484fb64f7;hpb=f76dc8648b4cf4b0d9562dfd03db77ae812585dd;p=packages%2Fvmmlib.git

diff --git a/vmmlib.spec b/vmmlib.spec
index 7f0fd90..ccec8b7 100644
--- a/vmmlib.spec
+++ b/vmmlib.spec
@@ -1,27 +1,22 @@
 #
 # Conditional build:
 %bcond_without	apidocs		# do not build and package API docs
-#
+
 Summary:	Vector and Matrix Math Library for C++
 Summary(pl.UTF-8):	Vector and Matrix Math Library - biblioteka matematyczna wektorów i macierzy w C++
 Name:		vmmlib
-Version:	1.8.0
+Version:	1.14.0
 Release:	1
 License:	BSD
 Group:		Libraries
-# latest is 1.6.2 here
-#Source0:	https://github.com/VMML/vmmlib/archive/release-%{version}/%{name}-%{version}.tar.gz
-# use Eyescale version for now
+#Source0Download: https://github.com/Eyescale/vmmlib/releases
 Source0:	https://github.com/Eyescale/vmmlib/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5:	66fcb200c33a1bc95eb7db1de4933655
-Source1:	https://github.com/Eyescale/CMake/archive/139ce7d/Eyescale-CMake-139ce7d.tar.gz
-# Source1-md5:	4a6abcd9e0fc417528a8ca68a97e65eb
+# Source0-md5:	f25e57bfc1e4699447963f5dbafd22f2
 URL:		http://vmml.github.io/vmmlib/
-BuildRequires:	blas-devel
+BuildRequires:	Eyescale-CMake >= 2018.02
 BuildRequires:	boost-devel
-BuildRequires:	cmake >= 2.8
+BuildRequires:	cmake >= 3.1
 %{?with_apidocs:BuildRequires:	doxygen}
-BuildRequires:	lapack-devel
 BuildRequires:	libstdc++-devel
 Requires:	boost-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -36,6 +31,7 @@ Biblioteka matematyczna wektorów i macierzy oparta na szablonach C++.
 Summary:	vmmlib API documentation
 Summary(pl.UTF-8):	Dokumentacja API biblioteki vmmlib
 Group:		Documentation
+BuildArch:	noarch
 
 %description apidocs
 API documentation for vmmlib library.
@@ -44,16 +40,15 @@ API documentation for vmmlib library.
 Dokumentacja API biblioteki vmmlib.
 
 %prep
-%setup -q -a1
+%setup -q
 
-%{__mv} CMake-* CMake/common
-%{__rm} .gitexternals
+rmdir CMake/common
+ln -s %{_datadir}/Eyescale-CMake CMake/common
 
 %build
 install -d build
 cd build
-%cmake .. \
-	-DBUILDYARD_DISABLED=ON
+%cmake ..
 %{__make}
 
 %if %{with apidocs}
@@ -66,7 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/vmmlib/{ACKNOWLEDGEMENTS,AUTHORS,LICENSE.txt,README.md}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/vmmlib/{ACKNOWLEDGEMENTS,LICENSE.txt,README.md}
 %{__rm} -r $RPM_BUILD_ROOT%{_datadir}/vmmlib/tests
 
 %clean
@@ -74,9 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc ACKNOWLEDGEMENTS AUTHORS CHANGES LICENSE.txt README.md doc/RELNOTES.md
+%doc ACKNOWLEDGEMENTS LICENSE.txt README.md doc/Changelog.md
 %{_includedir}/vmmlib
-%{_pkgconfigdir}/vmmlib.pc
 %dir %{_datadir}/vmmlib
 %{_datadir}/vmmlib/CMake