From a1261af792a7fc700527d25a18d0bfa6fd025511 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: May 08 2017 13:02:54 +0000 Subject: Review fixes --- diff --git a/openvdb.spec b/openvdb.spec index 7e49a0c..2045a20 100644 --- a/openvdb.spec +++ b/openvdb.spec @@ -4,7 +4,7 @@ Name: openvdb Version: 4.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library for sparse volumetric data discretized on three-dimensional grids License: MPLv2.0 URL: http://www.openvdb.org/ @@ -22,7 +22,6 @@ BuildRequires: glfw-devel >= 2.7 BuildRequires: ilmbase-devel BuildRequires: libXi-devel BuildRequires: log4cplus-devel >= 1.0 -BuildRequires: make >= 4.1 BuildRequires: OpenEXR-devel BuildRequires: python BuildRequires: python2-numpy @@ -70,9 +69,20 @@ applications typically encountered in feature film production. This package contains the Python module. +%package doc +Summary: Documentation for %{name} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation for developing applications that +use %{name}. + %prep %setup -q +iconv -f iso8859-1 -t utf-8 %{name}/CHANGES > %{name}/CHANGES.conv && \ + mv -f %{name}/CHANGES.conv %{name}/CHANGES + # Hardcoded paths for installation, as described in the INSTALL file sed -i -e 's@lib@%{_lib}@g' %{name}/CMakeLists.txt @@ -81,6 +91,7 @@ sed -i -e 's@lib@%{_lib}@g' %{name}/CMakeLists.txt cp %{name}/Makefile %{name}/Makefile.docbuild %build +export CXXFLAGS="%{optflags} -Wl,--as-needed" %cmake \ -DBLOSC_LOCATION=%{_prefix} \ -DCPPUNIT_LOCATION=%{_prefix} \ @@ -113,7 +124,7 @@ make test %make_install # Remove CMakeFiles from includes -rm -fr %{buildroot}/%{_includedir}/CMakeFiles +rm -fr %{buildroot}/%{_includedir}/%{name}/CMakeFiles # Let RPM pick up HTML documents in the files section rm -fr %{buildroot}/%{_datadir}/doc @@ -138,11 +149,16 @@ find %{buildroot} -name '*.a' -delete %{_libdir}/python%{python_version}/py%{name}.so %files devel -%doc %{name}/doc/html %{_includedir}/* %{_libdir}/*.so +%files doc +%doc %{name}/doc/html + %changelog +* Sat May 06 2017 Simone Caronni - 4.0.1-2 +- Review fixes. + * Sat Apr 22 2017 Simone Caronni - 4.0.1-1 - Update to 4.0.1. - Perform tests, build HTML documentation.