diff --git a/rmol.spec b/rmol.spec index ed84517..5f91936 100644 --- a/rmol.spec +++ b/rmol.spec @@ -6,7 +6,7 @@ # See also http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Private_Libraries %if %{with python} -%global _privatelibs libpy%{name}[.]so.* +%global _privatelibs py%{name}[.]so.* %global __provides_exclude ^(%{_privatelibs})$ %global __requires_exclude ^(%{_privatelibs})$ %endif @@ -14,7 +14,7 @@ # Name: rmol Version: 1.00.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: C++ library of Revenue Management and Optimisation classes and functions @@ -95,10 +95,10 @@ This package contains Python libraries for %{name} %build %cmake . -make %{?_smp_mflags} +%make_build %install -make install DESTDIR=%{buildroot} +%make_install mkdir -p %{mydocs} mv %{buildroot}%{_docdir}/%{name}/html %{mydocs} @@ -111,14 +111,22 @@ rm -f %{buildroot}%{_docdir}/%{name}/{NEWS,README,AUTHORS} %if %{with python} # (Pure) Python RMOL executable install -d %{buildroot}%{python3_sitearch}/py%{name} -#install -pm 0755 %%{buildroot}%%{_bindir}/py%%{name} %%{buildroot}%%{python3_sitearch}/py%%{name}/ +install -pm 0755 %{buildroot}%{_bindir}/py%{name} %{buildroot}%{python3_sitearch}/py%{name}/ install -pm 0755 %{buildroot}%{_bindir}/%{name}_drawBPC %{buildroot}%{python3_sitearch}/py%{name}/ -rm -f %{buildroot}%{_bindir}/%{name}_drawBPC # %%{buildroot}%%{_bindir}/py%%{name} +rm -f %{buildroot}%{_bindir}/%{name}_drawBPC %{buildroot}%{_bindir}/py%{name} %endif %check ctest +%if %{with python} +%post -n python3-%{name} +ln -s -f %{python3_sitearch}/py%{name}/py%{name} %{_bindir}/py%{name} + +%postun -n python3-%{name} +rm -f %{_bindir}/py%{name} +%endif + %files %doc AUTHORS ChangeLog COPYING NEWS README.md @@ -146,11 +154,14 @@ ctest %if %{with python} %files -n python3-%{name} %{python3_sitearch}/py%{name}/ -#%%{_mandir}/man1/py%%{name}.1.* +%{_mandir}/man1/py%{name}.1.* %{_mandir}/man1/%{name}_drawBPC.1.* %endif %changelog +* Thu Jan 17 2019 Denis Arnaud - 1.00.2-2 +- Added the delivery of pyrmol + * Wed Jan 16 2019 Denis Arnaud - 1.00.2-1 - Upstream update diff --git a/sources b/sources index 5519219..00dc0dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rmol-1.00.2.tar.gz) = cee0605f2728b62d9e39ed2d7cdfc524d343051610ad6b0f6ef46ce468011bfca2052a94c6052141ad4c59d2a2a5f9e7a8c229c005fac2227a8e56db61325009 +SHA512 (rmol-1.00.2.tar.gz) = 06277e9a60e0d40785ea37a04da149c3c8d52a5625299b7f3a0f31904e08cffe9af7b4047e3d48ad60cfb072cf70aa34ae42aa0524c42715b462c53ac213f2aa