Merge branch 'master' into f31

opentrep.spec

@@ -24,7 +24,10 @@ License:        LGPLv2+ and BSD
 URL:            http://github.com/trep/%{name}
 Source0:        %{url}/archive/%{name}-%{version}.tar.gz
 
-Requires:       %{name}-data = %{version}-%{release}
+# For some reason, SOCI (https://src.fedoraproject.org/rpms/soci)
+# does not build on ARMv7hl. Since SOCI is required,
+# OpenTREP cannot build on ARMv7hl either
+ExcludeArch:    armv7hl
 
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
@@ -44,13 +47,15 @@ BuildRequires:  protobuf-compiler
 %description
 %{name} aims at providing a clean API, and the corresponding C++
 implementation, for parsing travel-focused requests.
-It powers the http://search-travel.org Web site.
+It powers the https://transport-search.org Web site.
 
-%{name} uses Xapian (http://www.xapian.org) for the Information Retrieval part,
+%{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 (http://github.com/opentraveldata/opentraveldata):
+the OpenTravelData project (https://github.com/opentraveldata/opentraveldata):
-http://github.com/opentraveldata/opentraveldata/tree/trunk/opentraveldata
+https://github.com/opentraveldata/opentraveldata/tree/master/opentraveldata
+
+The data files are available from https://transport-search.org/data/optd/por/
 
 %{name} exposes a simple, clean and object-oriented, API. For instance,
 the OPENTREP::interpretTravelRequest() method takes, as input, a string
@@ -91,19 +96,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.
 
-%package        data
-Summary:        Referential data for the %{name} library
-License:        CC-BY-SA
-BuildArch:      noarch
-
-%description    data
-OpenTREP uses Xapian (http://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 (http://github.com/opentraveldata/opentraveldata):
-http://github.com/opentraveldata/opentraveldata/tree/trunk/opentraveldata
-
-
 %package        doc
 Summary:        HTML documentation for the %{name} library
 BuildArch:      noarch
@@ -190,10 +182,10 @@ rm -f %{_bindir}/py%{name}
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/data
 %dir %{_datadir}/%{name}/data/por
+%{_datadir}/%{name}/data/por/README.md
 %{_datadir}/%{name}/data/por/create_trep_user_and_db.sql
 %{_datadir}/%{name}/data/por/create_trep_tables_sqlite3.sql
 %{_datadir}/%{name}/data/por/create_trep_tables_mysql.sql
-%{_datadir}/%{name}/data/por/optd_por_public_4_test.csv
 %{_datadir}/%{name}/data/por/test_optd_por_public.csv
 %{_datadir}/%{name}/data/por/test_optd_por_public_schema.sql
 %{_datadir}/%{name}/data/por/test_world_schedule.csv
@@ -208,10 +200,6 @@ rm -f %{_bindir}/py%{name}
 %{_mandir}/man1/%{name}-config.1.*
 %{_mandir}/man3/%{name}-library.3.*
 
-%files data
-%doc %{_datadir}/%{name}/data/por/README.md
-%{_datadir}/%{name}/data/por/optd_por_public.csv
-
 %files doc
 %doc %{mydocs}/html
 %license COPYING
@@ -225,7 +213,7 @@ rm -f %{_bindir}/py%{name}
 
 
 %changelog
-* Mon Nov 11 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> 0.07.4-1
+* Mon Nov 11 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.07.4-1
 - Upstream update to 0.07.4
 
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.07.1-3