Notification time stamped 2020-07-31 22:56:41 UTC
From bb8f2415ea563678aeb0eb4ce4ad824c9bf7efc6 Mon Sep 17 00:00:00 2001
From: Denis Arnaud <denis.arnaud_fedora(a)m4x.org>
Date: Jul 31 2020 22:56:34 +0000
Subject: Upstream update to 0.07.7
---
diff --git a/opentrep.spec b/opentrep.spec
index 6f9e33b..9be8e24 100644
--- a/opentrep.spec
+++ b/opentrep.spec
@@ -1,19 +1,13 @@
#
%global mydocs __tmp_docdir
+%global python3_sitearch /usr/lib64/python3.8/site-packages
-# Build -python subpackage
-%bcond_without python
-
-# See also http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Pr…
-%if %{with python}
-%global _privatelibs libpy%{name}[.]so.*
-%global __provides_exclude ^(%{_privatelibs})$
-%global __requires_exclude ^(%{_privatelibs})$
-%endif
+# Build -pythonN subpackage
+%bcond_without python3
#
Name: opentrep
-Version: 0.07.4
+Version: 0.07.7
Release: 1%{?dist}
Summary: C++ library providing a clean API for parsing travel-focused requests
@@ -21,14 +15,12 @@ Summary: C++ library providing a clean API for parsing travel-focused req
# 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
BuildRequires: gcc-c++
-BuildRequires: cmake
-BuildRequires: python3-devel
+BuildRequires: cmake3
BuildRequires: boost-devel
-BuildRequires: boost-python3-devel
BuildRequires: readline-devel
BuildRequires: soci-mysql-devel
BuildRequires: soci-sqlite3-devel
@@ -47,8 +39,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/
@@ -72,13 +63,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
@@ -91,47 +83,56 @@ 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 python3}
+
+%package -n python3-%{name}
+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}
+%endif
+
+
%package doc
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.
-%if %{with python}
-%package -n python3-%{name}
-Summary: Python bindings for %{name}
-Requires: %{name}%{?_isa} = %{version}-%{release}
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-Requires: python3-protobuf
-%{?python_provide:%python_provide python3-%{name}}
-
-%description -n python3-%{name}
-This package contains Python libraries for %{name}
-%endif
-
%prep
%setup -q -n %{name}-%{name}-%{version}
%build
-%cmake .
-%make_build
+mkdir tmpbuild
+pushd tmpbuild
+%cmake3 ..
+%make_build
+popd
+
%install
+pushd tmpbuild
%make_install
+popd
# From rpm version > 4.9.1, it may no longer be necessary to move the
# documentation out of the docdir path, as the %%doc macro no longer
@@ -144,11 +145,8 @@ rm -f %{mydocs}/html/installdox
# in the project top directory)
rm -f %{buildroot}%{_docdir}/%{name}/{NEWS,README.md,AUTHORS}
-%if %{with python}
+%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
@@ -156,7 +154,7 @@ chmod a-x %{buildroot}%{python3_sitearch}/py%{name}/Travel_pb2.py
#check
#ctest
-%if %{with python}
+%if %{with python3}
%post -n python3-%{name}
ln -s -f %{python3_sitearch}/py%{name}/py%{name} %{_bindir}/py%{name}
@@ -199,15 +197,17 @@ rm -f %{_bindir}/py%{name}
%doc %{mydocs}/html
%license COPYING
-%if %{with python}
+%if %{with python3}
%files -n python3-%{name}
-#%%{_bindir}/py%%{name}
%{python3_sitearch}/py%{name}/
%{_mandir}/man1/py%{name}.1.*
%endif
%changelog
+* Fri Jul 31 2020 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 0.07.7-1
+- Upstream update to 0.07.7
+
* Mon Nov 11 2019 Denis Arnaud <denis.arnaud_fedora(a)m4x.org> - 0.07.4-1
- Upstream update to 0.07.4
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
https://src.fedoraproject.org/rpms/opentrep/c/bb8f2415ea563678aeb0eb4ce4ad8…