Merge branch 'epel9' into epel8

.gitignore

@@ -4,7 +4,7 @@ opentrep-*.src.rpm
 .gitignore
 clog
 .build-*
-opentrep-opentrep-?.??.?/
+opentrep-opentrep-?.??.??/
 /noarch
 /x86_64
 /tarballs/

opentrep.spec

@@ -1,19 +1,12 @@
-#
-%global mydocs __tmp_docdir
+# Python library directory
+%global _pylibdir %{_libdir}/python3.9
 
-# Build -python subpackage
-%bcond_without python
-
-# See also http://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Private_Libraries
-%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.11
 Release:        1%{?dist}
 
 Summary:        C++ library providing a clean API for parsing travel-focused requests
@@ -21,14 +14,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:  boost-devel
-BuildRequires:  boost-python3-devel
 BuildRequires:  readline-devel
 BuildRequires:  soci-mysql-devel
 BuildRequires:  soci-sqlite3-devel
@@ -47,8 +38,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 +62,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.
+as to be found in the following file: https://bit.ly/3fQaddv
+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,72 +82,68 @@ 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        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:  doxygen
-BuildRequires:  ghostscript
+%if %{with python3}
 
-%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).
-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
-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}}
+%package    -n python3-%{name}
+Summary:    Python bindings for %{name}
+Group:      System Environment/Libraries
+Requires:   %{name}%{?_isa} = %{version}-%{release}
+BuildRequires:  python39-setuptools, python39-setuptools-wheel
+BuildRequires:  python39-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-epstopdf
+BuildRequires:  doxygen
+BuildRequires:  ghostscript
+
+%description    doc
+This package contains HTML pages for %{name}. All that documentation
+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
+(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.
+
+
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
-
 %build
-%cmake .
-%make_build
+%cmake
+
+%cmake_build
 
 %install
-%make_install
+%cmake_install
 
-# 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
-# deletes the full directory before installing files into it.
-mkdir -p %{mydocs}
-mv %{buildroot}%{_docdir}/%{name}/html %{mydocs}
-rm -f %{mydocs}/html/installdox
+# Remove the Doxygen installer
+rm -f %{buildroot}%{_docdir}/%{name}/html/installdox
 
 # Remove additional documentation files (those files are already available
 # 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
+chmod a-x %{buildroot}%{_pylibdir}/site-packages/py%{name}/Travel_pb2.py
+#chmod a-x %%{buildroot}%%{python3_sitearch}/py%%{name}/Travel_pb2.py
 %endif
 
 
 #check
 #ctest
 
-%if %{with python}
+%if %{with python3}
 %post -n python3-%{name}
 ln -s -f %{python3_sitearch}/py%{name}/py%{name} %{_bindir}/py%{name}
 
@@ -165,8 +152,8 @@ rm -f %{_bindir}/py%{name}
 %endif
 
 %files
-%license COPYING
 %doc AUTHORS ChangeLog NEWS README.md
+%license COPYING
 %{_bindir}/%{name}-indexer
 %{_bindir}/%{name}-searcher
 %{_bindir}/%{name}-dbmgr
@@ -196,18 +183,27 @@ rm -f %{_bindir}/py%{name}
 %{_mandir}/man3/%{name}-library.3.*
 
 %files doc
-%doc %{mydocs}/html
+%doc %{_docdir}/%{name}/html
 %license COPYING
 
-%if %{with python}
+%if %{with python3}
 %files -n python3-%{name}
-#%%{_bindir}/py%%{name}
-%{python3_sitearch}/py%{name}/
+%{_pylibdir}/site-packages/py%{name}/
+#%%{python3_sitearch}/py%%{name}/
 %{_mandir}/man1/py%{name}.1.*
 %endif
 
 
 %changelog
+* Thu Jul 14 2022 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.07.11-1
+- Upstream upgrade
+
+* Sun Nov 14 2021 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.07.7-2
+- Support for Python 3.9
+
+* Sat Sep 19 2020 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.07.7-1
+- Upstream update to 0.07.7
+
 * Mon Nov 11 2019 Denis Arnaud <denis.arnaud_fedora@m4x.org> - 0.07.4-1
 - Upstream update to 0.07.4
 

package.cfg

@@ -1,2 +0,0 @@
-[koji]
-targets = epel8 epel8-playground

sources

@@ -1 +1 @@
-SHA512 (opentrep-0.07.4.tar.gz) = 93a13490edd5ea5acd15d0d613491c9fdd2d28b59c8007aa6e98bb9387b6d8e2ad4e82f20627fe0ee0d513855d249fd9f3f96a3ce4d65c9a0eaffc7f100381b8
+SHA512 (opentrep-0.07.11.tar.gz) = ed5f343928c2614e78cf677b7699b610cb2a70384b69de1918ce880e8a989389500846dcdcb62d687bdd07769e83399e261588815259bc153810bcd42d4a42bd