diff --git a/stdair.spec b/stdair.spec index abeb133..a943b7a 100644 --- a/stdair.spec +++ b/stdair.spec @@ -1,4 +1,3 @@ -%global mydocs __tmp_docdir Name: stdair Version: 1.00.10 Release: 5%{?dist} @@ -9,10 +8,6 @@ License: LGPLv2+ URL: https://github.com/airsim/%{name} Source0: %{url}/archive/%{name}-%{version}.tar.gz -# For some reason, as of November 2019, it does not compile on ARMv7hl -# See https://koji.fedoraproject.org/koji/taskinfo?taskID=38769808 -#ExcludeArch: armv7hl - BuildRequires: gcc-c++ BuildRequires: cmake BuildRequires: boost-devel @@ -53,8 +48,8 @@ BuildRequires: texlive-epstopdf %description doc This package contains HTML pages, as well as a PDF reference manual, for %{name}. All that documentation is generated thanks to Doxygen -(http://doxygen.org). The content is the same as what can be browsed -online (http://%{name}.org). +(https://doxygen.org). The content is the same as what can be browsed +online (https://%{name}.org). %prep @@ -68,11 +63,10 @@ online (http://%{name}.org). %cmake_install # Fix some permissions -find $RPM_BUILD_ROOT%{_libexecdir}/%{name} -type f -name '*.sh' -exec chmod +x {} \; +find %{buildroot}%{_libexecdir}/%{name} -type f -name '*.sh' -exec chmod +x {} \; -mkdir -p %{mydocs} -mv $RPM_BUILD_ROOT%{_docdir}/%{name}/html %{mydocs} -rm -f %{mydocs}/html/installdox +# Remove the Doxygen installer +rm -f %{buildroot}/%{_docdir}/%{name}/html/installdox # Remove additional documentation files (those files are already available # in the project top directory) @@ -82,7 +76,8 @@ rm -f $RPM_BUILD_ROOT%{_docdir}/%{name}/{NEWS,README.md,AUTHORS} ctest %files -%doc ChangeLog COPYING AUTHORS NEWS README.md +%doc ChangeLog AUTHORS NEWS README.md +%license COPYING %{_bindir}/%{name} %{_libdir}/lib%{name}.so.* %{_libdir}/lib%{name}uicl.so.* @@ -127,8 +122,8 @@ ctest %{_mandir}/man3/%{name}-library.3.* %files doc -%doc %{mydocs}/html -%doc COPYING +%doc %{_docdir}/%{name}/html +%license COPYING %changelog