From bf84c5716e17d6a32cb00ee5d5445f99c5bb1fcd Mon Sep 17 00:00:00 2001 From: W. Michael Petullo Date: Aug 16 2017 00:15:41 +0000 Subject: Update to 9.3.1 --- diff --git a/.gitignore b/.gitignore index 9ba3f4a..16da634 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ LinkChecker-5.2.tar.gz /LinkChecker-9.1.tar.gz /LinkChecker-9.2.tar.gz /LinkChecker-9.3.tar.gz +/v9.3.1.tar.gz diff --git a/fix-requests-version-bug.patch b/fix-requests-version-bug.patch deleted file mode 100644 index 651155d..0000000 --- a/fix-requests-version-bug.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 22dc3d0c49c9340866ce930b2f7861d2671cc965 Mon Sep 17 00:00:00 2001 -From: Charalampos Stratakis -Date: Tue, 19 Jul 2016 14:38:14 +0200 -Subject: [PATCH] Fix requests version bug - ---- - linkcheck/__init__.py | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/linkcheck/__init__.py b/linkcheck/__init__.py -index 5624855..231a7c4 100644 ---- a/linkcheck/__init__.py -+++ b/linkcheck/__init__.py -@@ -24,10 +24,10 @@ import sys - # Needs Python >= 2.7.2 which fixed http://bugs.python.org/issue11467 - if not (hasattr(sys, 'version_info') or - sys.version_info < (2, 7, 2, 'final', 0)): -- raise SystemExit("This program requires Python 2.7.2 or later.") -+ import platform -+ version = platform.python_version() -+ raise SystemExit("This program requires Python 2.7.2 or later instead of %s." % version) - import requests --if requests.__version__ <= '2.2.0': -- raise SystemExit("This program requires Python requests 2.2.0 or later.") - - import os - # add the custom linkcheck_dns directory to sys.path --- -2.7.4 - diff --git a/linkchecker-fix-non-standard-deskop-file.patch b/linkchecker-fix-non-standard-deskop-file.patch deleted file mode 100644 index dfe9c31..0000000 --- a/linkchecker-fix-non-standard-deskop-file.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c25bdb3f55a791bfa087fb5a3d8e3d5d62991745 Mon Sep 17 00:00:00 2001 -From: Christopher Meng -Date: Fri, 10 Jan 2014 19:57:47 +0800 -Subject: [PATCH] Fix non-standard deskop file - -desktop-file-validate /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop /home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop -/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker-gui.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character -/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "True" for boolean key "Terminal" in group "Desktop Entry" contains invalid characters, boolean values must be "false" or "true" -/home/rpmaker/rpmbuild/BUILDROOT/linkchecker-8.6-1.fc21.i386/usr/share/applications/linkchecker.desktop: error: value "Network;WebDevelopment" for string list key "Categories" in group "Desktop Entry" does not have a semicolon (';') as trailing character ---- - doc/linkchecker-gui.desktop | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/doc/linkchecker-gui.desktop b/doc/linkchecker-gui.desktop -index 7e06b6e..09bd997 100644 ---- a/doc/linkchecker-gui.desktop -+++ b/doc/linkchecker-gui.desktop -@@ -1,10 +1,10 @@ - [Desktop Entry] --Name=LinkChecker Gui -+Name=LinkChecker GUI - GenericName=URL validator - GenericName[de]=URL Validator - Version=1.0 - Type=Application - Exec=linkchecker-gui - Terminal=false --Categories=Network;WebDevelopment --Icon=logo48x48 -+Categories=Network;WebDevelopment; -+Icon=linkchecker --- -1.8.5.1 - diff --git a/linkchecker.spec b/linkchecker.spec index b26a650..7786da8 100644 --- a/linkchecker.spec +++ b/linkchecker.spec @@ -1,10 +1,10 @@ Name: linkchecker -Version: 9.3 -Release: 10%{?dist} +Version: 9.3.1 +Release: 1%{?dist} Summary: Check HTML documents for broken links License: GPLv2 URL: https://linkcheck.github.io/linkchecker/ -Source0: https://pypi.python.org/packages/source/L/LinkChecker/LinkChecker-%{version}.tar.gz +Source0: https://github.com/linkcheck/linkchecker/archive/v%{version}.tar.gz # qt4-devel is for qcollectiongenerator (HTML documentation) BuildRequires: desktop-file-utils BuildRequires: gettext @@ -15,7 +15,6 @@ Requires: python-requests # Should be fixed upstream in next release; see: # https://github.com/wummel/linkchecker/commit/c2ce810c3fb00b895a841a7be6b2e78c64e7b042 -Patch0: fix-requests-version-bug.patch %description LinkChecker is a website validator. LinkChecker checks links in web documents or full websites. @@ -47,9 +46,7 @@ Requires: qscintilla-python This package contains a GUI program for %{name}. %prep -%setup -qn LinkChecker-%{version} - -%patch0 -p1 +%setup -qn linkchecker-%{version} %build make -C doc/html/ @@ -60,7 +57,8 @@ CFLAGS="%{optflags}" %{__python2} setup.py build install -pDm644 doc/html/logo64x64.png %{buildroot}%{_datadir}/pixmaps/linkchecker.png # No need to import this package. -rm -frv %{buildroot}%{python2_sitearch}/LinkChecker-%{version}-py%{python2_version}.egg-info +# Asterisk here was %{version}, but 9.3.1 uses 9.3; not yet sure if this will continue. +rm -frv %{buildroot}%{python2_sitearch}/LinkChecker-*-py%{python2_version}.egg-info # We don't need to let a terminal app have such file. rm %{buildroot}%{_datadir}/applications/linkchecker.desktop diff --git a/sources b/sources index 5568d9a..cd4d234 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d7ba7ff04715022af5574b4e6cccbd27 LinkChecker-9.3.tar.gz +SHA512 (v9.3.1.tar.gz) = 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305