[packages/mdds] - updated to 1.2.0 (API 1.2; mdds with API 1.0 left on mdds-1.0 branch) - ensure consistent version
qboosh
qboosh at pld-linux.org
Sun May 15 08:18:45 CEST 2016
commit c8be9e45d58a245bbd28a1dd8b65e9452624b920
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun May 15 08:18:54 2016 +0200
- updated to 1.2.0 (API 1.2; mdds with API 1.0 left on mdds-1.0 branch)
- ensure consistent version of sphinx modules required and used
mdds.spec | 40 +++++++++++++++++++---------------------
1 file changed, 19 insertions(+), 21 deletions(-)
---
diff --git a/mdds.spec b/mdds.spec
index daf58f7..167dffb 100644
--- a/mdds.spec
+++ b/mdds.spec
@@ -5,25 +5,23 @@
Summary: A collection of multi-dimensional data structures and indexing algorithms
Summary(pl.UTF-8): Zbiór struktur danych wielowymiarowych oraz algorytmów indeksujących
Name: mdds
-Version: 1.0.0
-Release: 2
+Version: 1.2.0
+Release: 1
License: MIT
Group: Development/Libraries
#Source0Download: https://gitlab.com/mdds/mdds
-Source0: http://kohei.us/files/mdds/src/%{name}_%{version}.tar.bz2
-# Source0-md5: 74e0a81c5af4137285fe6a52217f71e4
+Source0: http://kohei.us/files/mdds/src/%{name}-%{version}.tar.bz2
+# Source0-md5: 9f3383fb7bae825eab69f3a6ec1d74b2
Patch0: %{name}-doc.patch
URL: https://gitlab.com/mdds/mdds
-BuildRequires: autoconf >= 2.50
BuildRequires: boost-devel >= 1.39
BuildRequires: libstdc++-devel >= 6:4.7
BuildRequires: rpmbuild(macros) >= 1.446
-BuildRequires: sed >= 4.0
%if %{with apidocs}
BuildRequires: doxygen
BuildRequires: python3-sphinx_bootstrap_theme
BuildRequires: python3-breathe
-BuildRequires: sphinx-pdg
+BuildRequires: sphinx-pdg-3
%endif
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -87,18 +85,18 @@ API documentation for MDDS.
Dokumentacja API biblioteki MDDS.
%prep
-%setup -q -n %{name}_%{version}
-%patch0 -p1
-
-# this is only used in tests
-sed -i -e '/^CPPFLAGS=/s/-Os -g /%{rpmcflags} /' configure.ac
+%setup -q
%build
-%{__autoconf}
-%configure
+%configure \
+ SPHINX=/usr/bin/sphinx-build-3 \
+ %{?with_apidocs:--enable-docs}
+
+%{__make}
-%{__make} all %{?with_apidocs:build-doc} \
- CXX="%{__cxx}"
+%if %{with apidocs}
+%{__make} html-local
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -107,17 +105,17 @@ rm -rf $RPM_BUILD_ROOT
DESTDIR=$RPM_BUILD_ROOT
# packaged as %doc
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/mdds-1.0
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/mdds-1.2
%clean
rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
-%doc AUTHORS CHANGELOG LICENSE README.md
-%{_includedir}/mdds-1.0
-%{_npkgconfigdir}/mdds-1.0.pc
+%doc AUTHORS CHANGELOG LICENSE NEWS README.md
+%{_includedir}/mdds-1.2
+%{_npkgconfigdir}/mdds-1.2.pc
%files apidocs
%defattr(644,root,root,755)
-%doc doc/html doc/_build/{_static,*.html,*.js}
+%doc doc/_doxygen/html doc/_build/{_static,*.html,*.js}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mdds.git/commitdiff/c8be9e45d58a245bbd28a1dd8b65e9452624b920
More information about the pld-cvs-commit
mailing list