[packages/python-pyasn1] - updated to 0.4.3 - removed obsolete missing patch

qboosh qboosh at pld-linux.org
Sat May 26 08:00:18 CEST 2018


commit 95b685d3c5dafdd28b64004fb67f3b72839585c4
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat May 26 08:01:11 2018 +0200

    - updated to 0.4.3
    - removed obsolete missing patch

 python-pyasn1-missing.patch | 326 --------------------------------------------
 python-pyasn1.spec          |  16 +--
 2 files changed, 8 insertions(+), 334 deletions(-)
---
diff --git a/python-pyasn1.spec b/python-pyasn1.spec
index af793fd..3c4bd36 100644
--- a/python-pyasn1.spec
+++ b/python-pyasn1.spec
@@ -10,19 +10,19 @@
 Summary:	ASN.1 tools for Python
 Summary(pl.UTF-8):	Narzędzia ASN.1 dla Pythona
 Name:		python-%{module}
-Version:	0.2.3
+Version:	0.4.3
 Release:	1
 License:	BSD-like
 Group:		Libraries/Python
 #Source0Download: https://pypi.python.org/simple/pyasn1/
 Source0:	https://files.pythonhosted.org/packages/source/p/pyasn1/%{module}-%{version}.tar.gz
-# Source0-md5:	79f98135071c8dd5c37b6c923c51be45
-Patch0:		%{name}-missing.patch
+# Source0-md5:	311fff5b2a1303a8cdc334c8867a06f4
 URL:		http://pyasn1.sourceforge.net/
 BuildRequires:	rpmbuild(macros) >= 1.714
 %if %{with python2}
 BuildRequires:	python >= 1:2.5
 BuildRequires:	python-modules >= 1:2.5
+BuildRequires:	python-setuptools
 %if %{with tests}
 %if "%{py_ver}" < "2.7"
 BuildRequires:	python-unittest2
@@ -32,6 +32,7 @@ BuildRequires:	python-unittest2
 %if %{with python3}
 BuildRequires:	python3 >= 1:3.3
 BuildRequires:	python3-modules >= 1:3.3
+BuildRequires:	python3-setuptools
 %endif
 BuildRequires:	rpm-pythonprov
 %if %{with apidocs}
@@ -82,7 +83,6 @@ Dokumentacja do modułu Pythona ASN.1.
 
 %prep
 %setup -q -n %{module}-%{version}
-%patch0 -p1
 
 %build
 %if %{with python2}
@@ -94,7 +94,7 @@ Dokumentacja do modułu Pythona ASN.1.
 
 %if %{with apidocs}
 PYTHONPATH=$(pwd)/build-py3/lib \
-%{__make} -C doc html
+%{__make} -C docs html
 %endif
 
 %install
@@ -116,7 +116,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python2}
 %files
 %defattr(644,root,root,755)
-%doc CHANGES.rst LICENSE.rst README.md THANKS.txt TODO.rst
+%doc CHANGES.rst LICENSE.rst README.md TODO.rst
 %{py_sitescriptdir}/%{module}
 %{py_sitescriptdir}/pyasn1-%{version}-py*.egg-info
 %endif
@@ -124,7 +124,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%doc CHANGES.rst LICENSE.rst README.md THANKS.txt TODO.rst
+%doc CHANGES.rst LICENSE.rst README.md TODO.rst
 %{py3_sitescriptdir}/%{module}
 %{py3_sitescriptdir}/pyasn1-%{version}-py*.egg-info
 %endif
@@ -132,5 +132,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%doc doc/build/html/{_static,docs,*.html,*.js}
+%doc docs/build/html/{_static,pyasn1,*.html,*.js}
 %endif
diff --git a/python-pyasn1-missing.patch b/python-pyasn1-missing.patch
deleted file mode 100644
index 8dd97d1..0000000
--- a/python-pyasn1-missing.patch
+++ /dev/null
@@ -1,326 +0,0 @@
---- pyasn1-0.2.3/doc/source/conf.py.orig	1970-01-01 01:00:00.000000000 +0100
-+++ pyasn1-0.2.3/doc/source/conf.py	2017-03-03 20:10:48.711197580 +0100
-@@ -0,0 +1,323 @@
-+# -*- coding: utf-8 -*-
-+#
-+# PyASN1 documentation build configuration file, created by
-+# sphinx-quickstart on Sat Jun 27 23:15:54 2015.
-+#
-+# This file is execfile()d with the current directory set to its
-+# containing dir.
-+#
-+# Note that not all possible configuration values are present in this
-+# autogenerated file.
-+#
-+# All configuration values have a default; values that are commented out
-+# serve to show the default.
-+
-+import sys
-+import os
-+import shlex
-+
-+# If extensions (or modules to document with autodoc) are in another directory,
-+# add these directories to sys.path here. If the directory is relative to the
-+# documentation root, use os.path.abspath to make it absolute, like shown here.
-+# sys.path.insert(0, os.path.abspath('.'))
-+
-+# -- General configuration ------------------------------------------------
-+
-+# If your documentation needs a minimal Sphinx version, state it here.
-+# needs_sphinx = '1.0'
-+
-+# Add any Sphinx extension module names here, as strings. They can be
-+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
-+# ones.
-+extensions = [
-+    'sphinx.ext.autodoc',
-+    'sphinx.ext.napoleon',
-+    'sphinx.ext.doctest',
-+    'sphinx.ext.intersphinx',
-+    'sphinx.ext.todo'
-+]
-+
-+# Add any paths that contain templates here, relative to this directory.
-+templates_path = ['.templates']
-+
-+# The suffix(es) of source filenames.
-+# You can specify multiple suffix as a list of string:
-+# source_suffix = ['.rst', '.md']
-+source_suffix = '.rst'
-+
-+# The encoding of source files.
-+# source_encoding = 'utf-8-sig'
-+
-+# The master toctree document.
-+master_doc = 'contents'
-+
-+# General information about the project.
-+project = u'PyASN1'
-+# noinspection PyShadowingBuiltins
-+copyright = u'2005-2017, Ilya Etingof <etingof at gmail.com>'
-+author = u'Ilya Etingof <etingof at gmail.com>'
-+
-+# The version info for the project you're documenting, acts as replacement for
-+# |version| and |release|, also used in various other places throughout the
-+# built documents.
-+#
-+# The short X.Y version.
-+version = '0.1'
-+# The full version, including alpha/beta/rc tags.
-+release = '0.1.10'
-+
-+# The language for content autogenerated by Sphinx. Refer to documentation
-+# for a list of supported languages.
-+#
-+# This is also used if you do content translation via gettext catalogs.
-+# Usually you set "language" from the command line for these cases.
-+language = None
-+
-+# There are two options for replacing |today|: either, you set today to some
-+# non-false value, then it is used:
-+# today = ''
-+# Else, today_fmt is used as the format for a strftime call.
-+# today_fmt = '%B %d, %Y'
-+
-+# List of patterns, relative to source directory, that match files and
-+# directories to ignore when looking for source files.
-+exclude_patterns = []
-+
-+# The reST default role (used for this markup: `text`) to use for all
-+# documents.
-+# default_role = None
-+
-+# If true, '()' will be appended to :func: etc. cross-reference text.
-+# add_function_parentheses = True
-+
-+# If true, the current module name will be prepended to all description
-+# unit titles (such as .. function::).
-+# add_module_names = True
-+
-+# If true, sectionauthor and moduleauthor directives will be shown in the
-+# output. They are ignored by default.
-+# show_authors = False
-+
-+# The name of the Pygments (syntax highlighting) style to use.
-+pygments_style = 'sphinx'
-+
-+# A list of ignored prefixes for module index sorting.
-+# modindex_common_prefix = []
-+
-+# If true, keep warnings as "system message" paragraphs in the built documents.
-+# keep_warnings = False
-+
-+# If true, `todo` and `todoList` produce output, else they produce nothing.
-+todo_include_todos = True
-+
-+# -- Options for HTML output ----------------------------------------------
-+
-+# The theme to use for HTML and HTML Help pages.  See the documentation for
-+# a list of builtin themes.
-+# html_theme = 'alabaster'
-+html_theme = 'sphinx_rtd_theme'
-+
-+# Theme options are theme-specific and customize the look and feel of a theme
-+# further.  For a list of options available for each theme, see the
-+# documentation.
-+# html_theme_options = {}
-+
-+# Add any paths that contain custom themes here, relative to this directory.
-+# html_theme_path = []
-+
-+# The name for this set of Sphinx documents.  If None, it defaults to
-+# "<project> v<release> documentation".
-+# html_title = None
-+html_title = "PyASN1"
-+
-+# A shorter title for the navigation bar.  Default is the same as html_title.
-+# html_short_title = None
-+
-+# The name of an image file (relative to this directory) to place at the top
-+# of the sidebar.
-+# html_logo = ""
-+
-+# The name of an image file (within the static path) to use as favicon of the
-+# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-+# pixels large.
-+# html_favicon = None
-+
-+# Add any paths that contain custom static files (such as style sheets) here,
-+# relative to this directory. They are copied after the builtin static files,
-+# so a file named "default.css" will overwrite the builtin "default.css".
-+if 'PYASN1DEV' in os.environ:
-+    html_static_path = ['.static']
-+
-+# Custom CSS theme
-+if 'PYASN1DEV' in os.environ:
-+    html_style = 'css/rtdimproved.css'
-+
-+# Add any extra paths that contain custom files (such as robots.txt or
-+# .htaccess) here, relative to this directory. These files are copied
-+# directly to the root of the documentation.
-+# html_extra_path = []
-+
-+# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-+# using the given strftime format.
-+# html_last_updated_fmt = '%b %d, %Y'
-+
-+# If true, SmartyPants will be used to convert quotes and dashes to
-+# typographically correct entities.
-+# html_use_smartypants = True
-+
-+# Custom sidebar templates, maps document names to template names.
-+# html_sidebars = {}
-+
-+# Additional templates that should be rendered to pages, maps page names to
-+# template names.
-+# html_additional_pages = {}
-+
-+# If false, no module index is generated.
-+# html_domain_indices = True
-+
-+# If false, no index is generated.
-+# html_use_index = True
-+
-+# If true, the index is split into individual pages for each letter.
-+# html_split_index = False
-+
-+# If true, links to the reST sources are added to the pages.
-+html_show_sourcelink = False
-+
-+# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-+html_show_sphinx = False
-+
-+# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-+# html_show_copyright = True
-+
-+# If true, an OpenSearch description file will be output, and all pages will
-+# contain a <link> tag referring to it.  The value of this option must be the
-+# base URL from which the finished HTML is served.
-+# html_use_opensearch = ''
-+
-+# This is the file name suffix for HTML files (e.g. ".xhtml").
-+# html_file_suffix = None
-+
-+# Language to be used for generating the HTML full-text search index.
-+# Sphinx supports the following languages:
-+#   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
-+#   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr'
-+# html_search_language = 'en'
-+
-+# A dictionary with options for the search language support, empty by default.
-+# Now only 'ja' uses this config value
-+# html_search_options = {'type': 'default'}
-+
-+# The name of a javascript file (relative to the configuration directory) that
-+# implements a search results scorer. If empty, the default will be used.
-+# html_search_scorer = 'scorer.js'
-+
-+# Output file base name for HTML help builder.
-+htmlhelp_basename = 'pyasn1doc'
-+
-+html_context = {
-+    'include_analytics': 'PYASN1DEV' in os.environ
-+}
-+
-+# -- Options for LaTeX output ---------------------------------------------
-+
-+latex_elements = {
-+    # The paper size ('letterpaper' or 'a4paper').
-+    # 'papersize': 'letterpaper',
-+
-+    # The font size ('10pt', '11pt' or '12pt').
-+    # 'pointsize': '10pt',
-+
-+    # Additional stuff for the LaTeX preamble.
-+    # 'preamble': '',
-+
-+    # Latex figure (float) alignment
-+    # 'figure_align': 'htbp',
-+}
-+
-+# Grouping the document tree into LaTeX files. List of tuples
-+# (source start file, target name, title,
-+#  author, documentclass [howto, manual, or own class]).
-+latex_documents = [
-+    (master_doc, 'PyASN1.tex', u'PyASN1 Documentation',
-+     u'Ilya Etingof \\textless{}etingof at gmail.com\\textgreater{}', 'manual'),
-+]
-+
-+# The name of an image file (relative to this directory) to place at the top of
-+# the title page.
-+# latex_logo = None
-+
-+# For "manual" documents, if this is true, then toplevel headings are parts,
-+# not chapters.
-+# latex_use_parts = False
-+
-+# If true, show page references after internal links.
-+# latex_show_pagerefs = False
-+
-+# If true, show URL addresses after external links.
-+# latex_show_urls = False
-+
-+# Documents to append as an appendix to all manuals.
-+# latex_appendices = []
-+
-+# If false, no module index is generated.
-+# latex_domain_indices = True
-+
-+
-+# -- Options for manual page output ---------------------------------------
-+
-+# One entry per manual page. List of tuples
-+# (source start file, name, description, authors, manual section).
-+man_pages = [
-+    (master_doc, 'pyasn1', u'PyASN1 Documentation',
-+     [author], 1)
-+]
-+
-+# If true, show URL addresses after external links.
-+# man_show_urls = False
-+
-+
-+# -- Options for Texinfo output -------------------------------------------
-+
-+# Grouping the document tree into Texinfo files. List of tuples
-+# (source start file, target name, title, author,
-+#  dir menu entry, description, category)
-+texinfo_documents = [
-+    (master_doc, 'PyASN1', u'PyASN1 Documentation',
-+     author, 'PyASN1', 'One line description of project.',
-+     'Miscellaneous'),
-+]
-+
-+# Documents to append as an appendix to all manuals.
-+# texinfo_appendices = []
-+
-+# If false, no module index is generated.
-+# texinfo_domain_indices = True
-+
-+# How to display URL addresses: 'footnote', 'no', or 'inline'.
-+# texinfo_show_urls = 'footnote'
-+
-+# If true, do not generate a @detailmenu in the "Top" node's menu.
-+# texinfo_no_detailmenu = False
-+
-+
-+# Example configuration for intersphinx: refer to the Python standard library.
-+intersphinx_mapping = {'python': ('https://docs.python.org/3.4/', None)}
-+
-+# this merges constructor docstring with class docstring
-+autoclass_content = 'both'
-+# Sort members by type
-+autodoc_member_order = 'bysource'
-+# autodoc_member_order = 'groupwise'
-+
-+# Napoleon settings
-+napoleon_google_docstring = False
-+napoleon_numpy_docstring = True
-+napoleon_include_private_with_doc = False
-+napoleon_include_special_with_doc = True
-+napoleon_use_admonition_for_examples = False
-+napoleon_use_admonition_for_notes = False
-+napoleon_use_admonition_for_references = False
-+napoleon_use_ivar = False
-+napoleon_use_param = False
-+napoleon_use_rtype = False
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pyasn1.git/commitdiff/95b685d3c5dafdd28b64004fb67f3b72839585c4



More information about the pld-cvs-commit mailing list