make unversioned commands the Python 3 versions

python-rdflib.spec

@@ -4,7 +4,7 @@
 
 Name:           python-%{pypi_name}
 Version:        4.2.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Python library for working with RDF
 
 License:        BSD
@@ -71,6 +71,9 @@ Summary:        %{summary}
 Requires:       python3-html5lib >= 1:
 Requires:       python3-isodate
 Requires:       python3-pyparsing
+# Unversioned binaries (/usr/bin/csv2rdf etc) moved
+# from python2-rdflib to python3-rdflib in 4.2.1-11.
+Conflicts:      python2-rdflib <= 4.2.1-10
 
 %description -n python3-%{pypi_name}
 RDFLib is a Python library for working with RDF, a simple yet powerful
@@ -110,6 +113,7 @@ popd
 
 
 %install
+%py2_install
 pushd %{py3dir}
 %py3_install
 popd
@@ -117,18 +121,10 @@ popd
 # rename binaries
 for i in csv2rdf rdf2dot rdfgraphisomorphism rdfpipe rdfs2dot; do
     mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python3_version}
+    ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i
     ln -s $i-%{python3_version} %{buildroot}%{_bindir}/$i-3
 done
 
-%py2_install
-
-# rename binaries
-for i in csv2rdf rdf2dot rdfgraphisomorphism rdfpipe rdfs2dot; do
-    mv %{buildroot}%{_bindir}/$i %{buildroot}%{_bindir}/$i-%{python2_version}
-    ln -s $i-%{python2_version} %{buildroot}%{_bindir}/$i-2
-    ln -s $i-2 %{buildroot}%{_bindir}/$i
-done
-
 cp LICENSE %{buildroot}%{python2_sitelib}/rdflib/LICENSE
 cp LICENSE %{buildroot}%{python3_sitelib}/rdflib/LICENSE
 
@@ -194,29 +190,29 @@ popd
 %doc README.md
 %{python2_sitelib}/%{pypi_name}
 %{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info
-%{_bindir}/csv2rdf
-%{_bindir}/csv2rdf-2*
-%{_bindir}/rdf2dot
-%{_bindir}/rdf2dot-2*
-%{_bindir}/rdfgraphisomorphism
-%{_bindir}/rdfgraphisomorphism-2*
-%{_bindir}/rdfpipe
-%{_bindir}/rdfpipe-2*
-%{_bindir}/rdfs2dot
-%{_bindir}/rdfs2dot-2*
 
 %files -n python3-%{pypi_name}
 %license LICENSE
 %doc README.md
 %{python3_sitelib}/%{pypi_name}
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
+%{_bindir}/csv2rdf
 %{_bindir}/csv2rdf-3*
+%{_bindir}/rdf2dot
 %{_bindir}/rdf2dot-3*
+%{_bindir}/rdfgraphisomorphism
 %{_bindir}/rdfgraphisomorphism-3*
+%{_bindir}/rdfpipe
 %{_bindir}/rdfpipe-3*
+%{_bindir}/rdfs2dot
 %{_bindir}/rdfs2dot-3*
 
 %changelog
+* Wed Aug 14 2019 Dan Callaghan <djc@djc.id.au> - 4.2.1-11
+- Commands without suffix (/usr/bin/csv2rdf etc) are now the Python 3 version
+  as per https://fedoraproject.org/wiki/Changes/Python_means_Python3
+- Dropped Python 2 version of commands in preparation for Python 2 removal
+
 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild