#1 Update to 1.1.6
Merged 3 years ago by echevemaster. Opened 3 years ago by salimma.
rpms/ salimma/python-landslide bump-to-116  into  master

file modified
+1 -2
@@ -1,2 +1,1 @@ 

- /landslide-1.1.1-a007840.tar.gz

- /landslide-1.1.3-9a70c0f.tar.gz

+ /landslide-1.1.6.tar.gz

@@ -0,0 +1,19 @@ 

+ --- landslide-1.1.6/setup.py.make_unversioned	2018-11-14 18:43:38.000000000 -0800

+ +++ landslide-1.1.6/setup.py	2020-08-06 15:12:43.940574636 -0700

+ @@ -23,11 +23,11 @@

+          'textile'

+      ],

+      install_requires=[

+ -        'Jinja2==2.10',

+ -        'Markdown==2.6.11',

+ -        'Pygments==2.2.0',

+ -        'docutils==0.14',

+ -        'six==1.11.0'

+ +        'Jinja2>=2.10',

+ +        'Markdown>=2.6.11',

+ +        'Pygments>=2.2.0',

+ +        'docutils>=0.14',

+ +        'six>=1.11.0'

+      ],

+      classifiers=[

+          'Programming Language :: Python',

@@ -0,0 +1,22 @@ 

+ From b28bd7fcb092a1779b7cfbafe60ea6260b56d277 Mon Sep 17 00:00:00 2001

+ From: Hadrien Grasland <grasland@lal.in2p3.fr>

+ Date: Sun, 7 Apr 2019 17:19:54 +0200

+ Subject: [PATCH] Make compatible with Python-Markdown 3+

+ 

+ ---

+  landslide/parser.py | 2 +-

+  1 file changed, 1 insertion(+), 1 deletion(-)

+ 

+ diff --git a/landslide/parser.py b/landslide/parser.py

+ index 97bcd5c..2a1d233 100644

+ --- a/landslide/parser.py

+ +++ b/landslide/parser.py

+ @@ -58,7 +58,7 @@ def parse(self, text):

+              if text.startswith(u'\ufeff'):  # check for unicode BOM

+                  text = text[1:]

+  

+ -            return markdown.markdown(text, self.md_extensions)

+ +            return markdown.markdown(text, extensions=self.md_extensions)

+          elif self.format == 'restructuredtext':

+              try:

+                  from landslide.rst import html_body

file modified
+27 -25
@@ -1,13 +1,15 @@ 

- %global pkgname landslide

- %global commit	9a70c0f4fd00c17cffbfd0da7ffb87da118ff9b0

- %global shortcommit %(c=%{commit}; echo ${c:0:7})

- Name:		python-landslide

- Version:	1.1.3

- Release:	17%{?dist}

+ %global srcname landslide

+ 

+ Name:		python-%{srcname}

+ Version:	1.1.6

+ Release:	1%{?dist}

  Summary:	Lightweight markup language-based html5 slideshow generator

+ 

  License:	ASL 2.0

- URL:		https://pypi.python.org/pypi/landslide

- Source0:	https://github.com/adamzap/%{pkgname}/archive/%{commit}/%{pkgname}-%{version}-%{shortcommit}.tar.gz

+ URL:		https://pypi.python.org/pypi/%{srcname}

+ Source0:	%{pypi_source}

+ Patch0:         %{srcname}-1.1.6-make_unversioned.diff

+ Patch1:         https://github.com/adamzap/landslide/pull/211.patch#/%{srcname}-1.1.6-support_markdown_3.diff

  

  BuildArch:	noarch

  
@@ -16,44 +18,40 @@ 

  Takes your Markdown, ReST, or Textile file(s) and generates 

  fancy HTML5 slideshows.

  

- %package -n python3-%{pkgname}

+ %package -n python3-%{srcname}

  Summary:	%{summary}

  

  BuildRequires:	python3-devel

  BuildRequires:	python3-sphinx

  

- Requires:	python3-jinja2

- Requires:	python3-markdown

- Requires:	python3-pygments

- Requires:	python3-docutils

- Requires:	python3-textile

+ %{?python_provide:%python_provide python3-%{srcname}}

  

- %{?python_provide:%python_provide python3-%{pkgname}}

- 

- %description -n python3-%{pkgname}

+ %description -n python3-%{srcname}

  Takes your Markdown, ReST, or Textile file(s) and generates 

  fancy HTML5 slideshows.

  

+ 

  %prep

- %autosetup -n %{pkgname}-%{commit}

+ %autosetup -p1 -n %{srcname}-%{version}

  # Change shebang to recognized the default interpreter installed 

  # from system-wide

- sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' src/landslide/main.py

+ sed -i '1s=^#!/usr/bin/\(python\|env python\)[23]\?=#!%{__python3}=' \

+   landslide/main.py

  # Remove bundled egg-info

- rm -rf src/landslide.egg-info

+ rm -rf landslide.egg-info

+ 

  

  %build

  %py3_build

  

- PYTHONPATH=$(pwd) make -C docs html

- rm -f docs/_build/html/.buildinfo

  

  %install

  %py3_install

  find %{buildroot} -name 'main.py' | xargs chmod 0755

-  

- %files -n python3-%{pkgname}

- %doc CHANGELOG.md README.md docs/_build/html

+ 

+ 

+ %files -n python3-%{srcname}

+ %doc CHANGELOG.md README.md examples

  %license LICENSE

  %{_bindir}/landslide

  %{python3_sitelib}/landslide
@@ -61,6 +59,10 @@ 

  

  

  %changelog

+ * Thu Aug  6 2020 Michel Alexandre Salim <salimma@fedoraproject.org> - 1.1.6-1

+ - Update to 1.1.6

+ - Patch in support for Markdown 3.x compatibility

+ 

  * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.3-17

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- 0d28b36a6bfc30be59266cc5925c0cc0  landslide-1.1.3-9a70c0f.tar.gz

+ SHA512 (landslide-1.1.6.tar.gz) = 944d958432ac3564bf292aa354d7b4122d060d4bcb49445531a01041407886e24fd80fabacf52d18d8c2915c703e8935c76899182b2cf967b19abf6f505f881e