* Fixed a few typos in Python dependencies
This commit is contained in:
Denis Arnaud
parent
11322acc16
commit
0ab855f5fd
|
|
@ -2,11 +2,10 @@
|
|||
%global mydocs __tmp_docdir
|
||||
|
||||
# Build -pythonN subpackage
|
||||
%bcond_with python2
|
||||
%bcond_without python3
|
||||
|
||||
# See also http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Private_Libraries
|
||||
%if %{with python2} || %{with python3}
|
||||
%if %{with python3}
|
||||
%global _privatelibs libpy%{name}[.]so.*
|
||||
%global __provides_exclude ^(%{_privatelibs})$
|
||||
%global __requires_exclude ^(%{_privatelibs})$
|
||||
|
|
@ -15,7 +14,7 @@
|
|||
#
|
||||
Name: opentrep
|
||||
Version: 0.07.4
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
Summary: C++ library providing a clean API for parsing travel-focused requests
|
||||
|
||||
|
|
@ -26,17 +25,16 @@ URL: http://github.com/trep/%{name}
|
|||
Source0: %{url}/archive/%{name}-%{version}.tar.gz
|
||||
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: cmake, cmake3
|
||||
BuildRequires: boost-devel
|
||||
%if %{with python2}
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: boost-python-devel
|
||||
%if 0%{?fedora} || 0%{?rhel} > 7
|
||||
BuildRequires: cmake
|
||||
%else
|
||||
BuildRequires: cmake3
|
||||
%endif
|
||||
BuildRequires: boost-devel
|
||||
%if %{with python3}
|
||||
BuildRequires: python34-setuptools
|
||||
BuildRequires: python34-devel
|
||||
BuildRequires: boost-python34-devel
|
||||
BuildRequires: python-setuptools
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: boost-python3-devel
|
||||
%endif
|
||||
BuildRequires: readline-devel
|
||||
BuildRequires: soci-mysql-devel
|
||||
|
|
@ -100,29 +98,6 @@ This package contains the header files, shared libraries and
|
|||
development helper tools for %{name}. If you would like to develop
|
||||
programs using %{name}, you will need to install %{name}-devel.
|
||||
|
||||
%if %{with python2}
|
||||
|
||||
%package -n python2-%{name}
|
||||
Summary: Python bindings for %{name}
|
||||
Group: System Environment/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: protobuf-python
|
||||
%{?python_provide:%python_provide python2-%{name}}
|
||||
|
||||
%description -n python2-%{name}
|
||||
This package contains Python libraries for %{name}
|
||||
|
||||
%package -n python2-%{name}-devel
|
||||
Summary: Shared object symbolic links for OpenTREP Python 2
|
||||
Requires: %{name}-python2%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n python2-%{name}-devel
|
||||
|
||||
Shared object symbolic links for Python 2 variant of OpenTREP.
|
||||
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
|
||||
%package -n python3-%{name}
|
||||
|
|
@ -135,7 +110,7 @@ This package contains Python libraries for %{name}
|
|||
|
||||
%package -n python3-%{name}-devel
|
||||
Summary: Shared object symbolic links for OpenTREP Python 3
|
||||
Requires: %{name}-python3%{?_isa} = %{version}-%{release}
|
||||
Requires: python3-%{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description -n python3-%{name}-devel
|
||||
|
|
@ -193,14 +168,6 @@ rm -f %{mydocs}/html/installdox
|
|||
# in the project top directory)
|
||||
rm -f %{buildroot}%{_docdir}/%{name}/{NEWS,README.md,AUTHORS}
|
||||
|
||||
%if %{with python2}
|
||||
# (Pure) Python OpenTREP executable
|
||||
install -d %{buildroot}%{python2_sitearch}/py%{name}
|
||||
install -pm 0755 %{buildroot}%{_bindir}/py%{name} %{buildroot}%{python2_sitearch}/py%{name}/
|
||||
rm -f %{buildroot}%{_bindir}/py%{name}
|
||||
chmod a-x %{buildroot}%{python2_sitearch}/py%{name}/Travel_pb2.py
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
# (Pure) Python OpenTREP executable
|
||||
install -d %{buildroot}%{python3_sitearch}/py%{name}
|
||||
|
|
@ -213,15 +180,7 @@ chmod a-x %{buildroot}%{python3_sitearch}/py%{name}/Travel_pb2.py
|
|||
#check
|
||||
#ctest
|
||||
|
||||
%if %{with python2}
|
||||
%post -n python2-%{name}
|
||||
ln -s -f %{python2_sitearch}/py%{name}/py%{name} %{_bindir}/py%{name}
|
||||
|
||||
%postun -n python2-%{name}
|
||||
rm -f %{_bindir}/py%{name}
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
%if 0%{?rhel} <= 7
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
|
@ -270,12 +229,6 @@ rm -f %{_bindir}/py%{name}
|
|||
%doc %{mydocs}/html
|
||||
%license COPYING
|
||||
|
||||
%if %{with python2}
|
||||
%files -n python2-%{name}
|
||||
%{python2_sitearch}/py%{name}/
|
||||
%{_mandir}/man1/py%{name}.1.*
|
||||
%endif
|
||||
|
||||
%if %{with python3}
|
||||
%files -n python3-%{name}
|
||||
%{python3_sitearch}/py%{name}/
|
||||
|
|
@ -283,6 +236,9 @@ rm -f %{_bindir}/py%{name}
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Sun Nov 24 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.07.4-2
|
||||
* Fixed a few typos in Python dependencies
|
||||
|
||||
* Sun Nov 24 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.07.4-1
|
||||
- Upstream update to 0.07.4
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue