diff --git a/opentrep.spec b/opentrep.spec index 331c745..60265f1 100644 --- a/opentrep.spec +++ b/opentrep.spec @@ -4,24 +4,17 @@ # Build -pythonN subpackage %bcond_without python3 -# See also http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Private_Libraries -%if %{with python3} -%global _privatelibs libpy%{name}[.]so.* -%global __provides_exclude ^(%{_privatelibs})$ -%global __requires_exclude ^(%{_privatelibs})$ -%endif - # Name: opentrep -Version: 0.07.4 -Release: 7%{?dist} +Version: 0.07.7 +Release: 1%{?dist} Summary: C++ library providing a clean API for parsing travel-focused requests # The entire source code is LGPLv2+ except opentrep/basic/float_utils_google.hpp, # which is BSD License: LGPLv2+ and BSD -URL: http://github.com/trep/%{name} +URL: https://github.com/trep/%{name} Source0: %{url}/archive/%{name}-%{version}.tar.gz # For some reason, as of November 2019, it does not compile on ARMv7hl @@ -35,11 +28,6 @@ BuildRequires: cmake BuildRequires: cmake3 %endif BuildRequires: boost-devel -%if %{with python3} -BuildRequires: python3-setuptools -BuildRequires: python3-devel -BuildRequires: boost-python3-devel -%endif BuildRequires: readline-devel BuildRequires: soci-mysql-devel BuildRequires: soci-sqlite3-devel @@ -58,8 +46,7 @@ It powers the https://transport-search.org Web site. %{name} uses Xapian (https://www.xapian.org) for the Information Retrieval part, on freely available travel-related data (e.g., country names and codes, city names and codes, airline names and codes, etc.), mainly to be found in -the OpenTravelData project (https://github.com/opentraveldata/opentraveldata): -https://github.com/opentraveldata/opentraveldata/tree/master/opentraveldata +the OpenTravelData project (https://github.com/opentraveldata/opentraveldata). The data files are available from https://transport-search.org/data/optd/por/ @@ -83,14 +70,14 @@ share it with others. %{name} makes an extensive use of existing open-source libraries for increased functionality, speed and accuracy. In particular the -Boost (C++ Standard Extensions: http://www.boost.org) and -SOCI (http://soci.sourceforge.net) libraries are used. +Boost (C++ Standard Extensions: https://www.boost.org) and +SOCI (https://github.com/SOCI) libraries are used. Note that %{name} currently only recognizes points of reference (POR), as to be found in the following file: http://bit.ly/1DXIjWE -A good complementary tool is GeoBase (http://opentraveldata.github.io/geobases), -a Python-based software able to access to any travel-related data source. - +A good complementary tool is GeoBase +(https://opentraveldata.github.io/geobases), a Python-based software +able to access to any travel-related data source. %package devel Summary: Header files, libraries and development helper tools for %{name} @@ -108,19 +95,13 @@ programs using %{name}, you will need to install %{name}-devel. Summary: Python bindings for %{name} Group: System Environment/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} +BuildRequires: python3-setuptools +BuildRequires: python3-devel +BuildRequires: boost-python3-devel %description -n python3-%{name} This package contains Python libraries for %{name} -%package -n python3-%{name}-devel -Summary: Shared object symbolic links for OpenTREP Python 3 -Requires: python3-%{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} - -%description -n python3-%{name}-devel - -Shared object symbolic links for Python 3 variant of OpenTREP. - %endif %package doc @@ -128,15 +109,16 @@ Summary: HTML documentation for the %{name} library BuildArch: noarch BuildRequires: tex(latex), tex(sectsty.sty), tex(tocloft.sty), tex(xtab.sty) #BuildRequires: texlive-collection-langcyrillic, texlive-cyrillic +BuildRequires: texlive-epstopdf BuildRequires: doxygen BuildRequires: ghostscript %description doc This package contains HTML pages 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://opentrep.sourceforge.net). +is generated thanks to Doxygen (https://doxygen.org). The content is +the same as what can be browsed online (https://opentrep.sourceforge.net). Note that the PDF form of the reference manual is mainly available online -(http://opentrep.sourceforge.net/refman.pdf), as the one present in that +(https://opentrep.sourceforge.net/refman.pdf), as the one present in that package is usually corrupted: it depends on the building conditions, and it is therefore not reliable. @@ -174,9 +156,6 @@ rm -f %{buildroot}%{_docdir}/%{name}/{NEWS,README.md,AUTHORS} %if %{with python3} # (Pure) Python OpenTREP executable -install -d %{buildroot}%{python3_sitearch}/py%{name} -install -pm 0755 %{buildroot}%{_bindir}/py%{name} %{buildroot}%{python3_sitearch}/py%{name}/ -rm -f %{buildroot}%{_bindir}/py%{name} chmod a-x %{buildroot}%{python3_sitearch}/py%{name}/Travel_pb2.py %endif @@ -240,6 +219,9 @@ rm -f %{_bindir}/py%{name} %endif %changelog +* Mon Jun 01 2020 Denis Arnaud - 0.07.7-1 +- Upstream update + * Sat May 30 2020 Jonathan Wakely - 0.07.4-7 - Rebuilt for Boost 1.73 diff --git a/sources b/sources index 4465409..c6af998 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (opentrep-0.07.4.tar.gz) = 93a13490edd5ea5acd15d0d613491c9fdd2d28b59c8007aa6e98bb9387b6d8e2ad4e82f20627fe0ee0d513855d249fd9f3f96a3ce4d65c9a0eaffc7f100381b8 +SHA512 (opentrep-0.07.7.tar.gz) = 19ddce7992391397d18c16b2ac5d8caa6c7f73c7ac19f49eaf02a00b1ab5289c54de98a01f3652a7be3d47aa76a0227999befb3466fd2d2f152ed42a20d979e4