- updated to 2.3.4 (includes security fixes); license is 2-clause BSD; fixed dirs...

diff --git a/muparser.spec b/muparser.spec
index 14673248ecd5a85956ac0d2e5d935b30a208262c..c8d6846ade7015e62915b4c934f4f557b0f8c22c 100644 (file)
--- a/muparser.spec
+++ b/muparser.spec
@@ -6,18 +6,19 @@
 Summary:       A fast math parser library
 Summary(pl.UTF-8):     Biblioteka szybkiego analizatora matematycznego
 Name:          muparser
-Version:       2.3.2
+Version:       2.3.4
 Release:       1
-License:       MIT
+License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/beltoforion/muparser/releases
 Source0:       https://github.com/beltoforion/muparser/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: cbc1b284e03abc7081b3c30997959893
+# Source0-md5: b92180a648be88238008ea01a597ccb9
 URL:           https://github.com/beltoforion/muparser
 BuildRequires: cmake >= 3.1.0
 %{?with_apidocs:BuildRequires: doxygen}
 %{?with_openmp:BuildRequires:  libgomp-devel}
 BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: rpm-build >= 4.6
 BuildRequires: rpmbuild(macros) >= 1.752
 BuildRequires: sed >= 4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -71,6 +72,8 @@ Dokumentacja API biblioteki muParser.
 install -d build
 cd build
 %cmake .. \
+       -DCMAKE_INSTALL_INCLUDEDIR=include \
+       -DCMAKE_INSTALL_LIBDIR=%{_lib} \
        %{!?with_openmp:-DENABLE_OPENMP=OFF} \
        -DENABLE_SAMPLES=OFF
 
@@ -95,7 +98,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Changes.txt License.txt README.rst docs/muparser_doc.html
+%doc CHANGELOG LICENSE README.rst docs/muparser_doc.html
 %attr(755,root,root) %{_libdir}/libmuparser.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libmuparser.so.2
 
@@ -104,9 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/libmuparser.so
 %{_includedir}/muParser*.h
 %{_pkgconfigdir}/muparser.pc
+%{_libdir}/cmake/muparser
 
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc docs/html/*
+%doc docs/html/classdocu/{d?,search,*.css,*.html,*.jpg,*.js,*.png}
 %endif