Hello community, here is the log from the commit of package python-hotdoc for openSUSE:Factory checked in at 2020-10-27 18:58:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-hotdoc (Old) and /work/SRC/openSUSE:Factory/.python-hotdoc.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-hotdoc" Tue Oct 27 18:58:13 2020 rev:2 rq:843410 version:0.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/python-hotdoc/python-hotdoc.changes 2020-09-21 17:23:54.343951139 +0200 +++ /work/SRC/openSUSE:Factory/.python-hotdoc.new.3463/python-hotdoc.changes 2020-10-27 18:58:18.230715252 +0100 @@ -1,0 +2,13 @@ +Thu Oct 22 11:06:19 UTC 2020 - Antonio Larrosa <alarr...@suse.com> + +- Add Requires: python-setuptools + +------------------------------------------------------------------- +Fri Oct 16 12:16:37 UTC 2020 - Antonio Larrosa <alarr...@suse.com> + +- Add patch to remove dependency on python-xdg and use python-pyxdg + instead since both are not coinstallable and pyxdg is a + freedesktop project and used by openSUSE-release-tools: + * remove-dependency-on-python-xdg.patch + +------------------------------------------------------------------- New: ---- remove-dependency-on-python-xdg.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-hotdoc.spec ++++++ --- /var/tmp/diff_new_pack.peqUL8/_old 2020-10-27 18:58:19.498716175 +0100 +++ /var/tmp/diff_new_pack.peqUL8/_new 2020-10-27 18:58:19.502716178 +0100 @@ -26,6 +26,7 @@ Group: Development/Tools/Doc Generators URL: https://github.com/hotdoc/hotdoc Source: https://files.pythonhosted.org/packages/source/h/hotdoc/hotdoc-%{version}.tar.gz +Patch0: remove-dependency-on-python-xdg.patch BuildRequires: %{python_module PyYAML} BuildRequires: %{python_module devel} BuildRequires: %{python_module lxml} @@ -41,7 +42,8 @@ BuildRequires: libyaml-devel BuildRequires: llvm-devel BuildRequires: python-rpm-macros -# The c extension needs llvm-config +# The c extension needs libclang.so and llvm-config +Requires: clang-devel Requires: llvm-devel Requires: python-PyYAML >= 5.1 Requires: python-appdirs @@ -50,10 +52,11 @@ Requires: python-lxml Requires: python-networkx >= 1.11 Requires: python-pkgconfig >= 1.1.0 +Requires: python-pyxdg Requires: python-schema +Requires: python-setuptools Requires: python-toposort >= 1.4 Requires: python-wheezy.template >= 0.1.167 -Requires: python-xdg >= 4.0.0 %python_subpackages %description @@ -81,13 +84,13 @@ %prep %setup -q -n hotdoc-%{version} +%patch0 -p1 sed -i -e "s/wheezy.template==/wheezy.template>=/" setup.py sed -i -e "s/pkgconfig==/pkgconfig>=/" setup.py sed -i -e "s/networkx==/networkx>=/" setup.py sed -i -e '1s,#! /usr/bin/env sh,#!/usr/bin/sh,' ./hotdoc/extensions/gi/transition_scripts/translate_sections.sh - %build %python_build @@ -95,7 +98,6 @@ %python_install %python_expand %fdupes %{buildroot}%{$python_sitearch} - %files %{python_files} %license COPYING %{python_sitearch}/hotdoc* ++++++ remove-dependency-on-python-xdg.patch ++++++ Index: hotdoc-0.12.2/hotdoc.egg-info/requires.txt =================================================================== --- hotdoc-0.12.2.orig/hotdoc.egg-info/requires.txt +++ hotdoc-0.12.2/hotdoc.egg-info/requires.txt @@ -4,7 +4,7 @@ schema appdirs wheezy.template==0.1.167 toposort>=1.4 -xdg>=4.0.0 +pyxdg dbus-deviation>=0.4.0 pkgconfig==1.1.0 cchardet Index: hotdoc-0.12.2/hotdoc/parsers/gtk_doc.py =================================================================== --- hotdoc-0.12.2.orig/hotdoc/parsers/gtk_doc.py +++ hotdoc-0.12.2/hotdoc/parsers/gtk_doc.py @@ -27,7 +27,8 @@ import re import cgi from collections import OrderedDict from itertools import zip_longest -from xdg import XDG_DATA_HOME, XDG_DATA_DIRS +from xdg import BaseDirectory +import pathlib from lxml import etree import yaml @@ -52,6 +53,10 @@ GTKDOC_HREFS = {} GATHERED_GTKDOC_LINKS = False +XDG_DATA_HOME = pathlib.Path(BaseDirectory.xdg_data_home) +XDG_DATA_DIRS = [pathlib.Path(dir) for dir in BaseDirectory.xdg_data_dirs] + + # http://stackoverflow.com/questions/434287/what-is-the-most-pythonic-way-to-iterate-over-a-list-in-chunks def _grouper(iterable, n_args, fillvalue=None): """ Index: hotdoc-0.12.2/setup.py =================================================================== --- hotdoc-0.12.2.orig/setup.py +++ hotdoc-0.12.2/setup.py @@ -317,7 +317,7 @@ INSTALL_REQUIRES = [ 'appdirs', 'wheezy.template==0.1.167', 'toposort>=1.4', - 'xdg>=4.0.0', + 'pyxdg', ] # dbus-deviation requires sphinx, which requires python 3.5
