From 2e61eddd557e4f03ca434cad388b81c33f9f7f3a Mon Sep 17 00:00:00 2001
From: Robert Scheck <robert@fedoraproject.org>
Date: Apr 30 2022 23:27:35 +0000
Subject: Merge remote-tracking branch 'origin/main' into epel7


---

diff --git a/.gitignore b/.gitignore
index 7e8c9d4..1e0e1ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,5 @@
-gc6.2.tar.gz
-w3m-0.5.1.tar.gz
-gc6.3.tar.gz
-*.gz
-*.bz2
-*.rpm
-gc6.8.tar.gz
-w3m-0.5.2.tar.gz
+/gc6.?.tar.gz
+/w3m-*.tar.gz
+/*.gz
+/*.bz2
+/*.rpm
diff --git a/sources b/sources
index 0fd829b..d23e11e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (v0.5.3+git20210102.tar.gz) = 357eeecf0f63bfd5174c9670533882323879657bdecefd0758d853ca645e368331bfdf91e99c0917f19829e184ce892ecdc99bd865851707d93baccfb4b97632
+SHA512 (w3m-0.5.3+git20220429.tar.gz) = 0f29d6a1f311c3f417ca041fe3788c94946d238b618eca923cd62a6e5e598aefd898fb8a54999876179011bf37d492a989872e38375ea96ac59914b244f1517e
diff --git a/w3m.spec b/w3m.spec
index a0ec127..c54b505 100644
--- a/w3m.spec
+++ b/w3m.spec
@@ -1,14 +1,14 @@
 # These are the build option passed to ./configure command
 %global build_options  --enable-m17n --enable-unicode --enable-nls --with-editor=/bin/vi --with-mailer="gnome-open mailto:%s" --with-browser=gnome-open --with-charset=UTF-8 --with-gc --with-termlib=ncurses --enable-nntp --enable-gopher --enable-image=x11,fb --with-imagelib=gtk2 --enable-keymap=w3m
 
-%global gitdate 20210102
+%global gitdate 20220429
 
 %{?perl_default_filter}
 %global __requires_exclude perl\\(w3mhelp-
 
 Name:     w3m
 Version:  0.5.3
-Release:  50.git%{gitdate}%{?dist}
+Release:  55.git%{gitdate}%{?dist}
 # UCD is added for EastAsianWidth.txt source
 License:  MIT and UCD
 URL:      http://w3m.sourceforge.net/
@@ -17,6 +17,8 @@ BuildRequires:  ncurses-devel
 BuildRequires:  openssl-devel
 %else
 BuildRequires:  openssl11-devel
+# -Wnull-dereference requires GCC >= 6
+BuildRequires:  devtoolset-8-toolchain
 %endif
 BuildRequires:  perl-generators
 BuildRequires:  pkgconfig
@@ -34,7 +36,7 @@ BuildRequires:  make
 Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: perl(NKF)
 
-Source0: https://github.com/tats/%{name}/archive/v%{version}+git%{gitdate}.tar.gz
+Source0: https://github.com/tats/%{name}/archive/v%{version}+git%{gitdate}/%{name}-%{version}+git%{gitdate}.tar.gz
 Source1: w3mconfig
 
 Summary:  Pager with Web browsing abilities
@@ -72,6 +74,7 @@ linux framebuffer.
 
 %build
 %if 0%{?rhel} == 7
+. /opt/rh/devtoolset-8/enable
 export SSL_CFLAGS="$(pkg-config --cflags-only-I openssl11)"
 export SSL_LIBS="$(pkg-config --libs-only-L openssl11)"
 %endif
@@ -107,6 +110,21 @@ rm -f doc*/w3m.1
 %{_libexecdir}/w3m/w3mimgdisplay
 
 %changelog
+* Sun May 01 2022 Robert Scheck <robert@fedoraproject.org> - 0.5.3-55.git20220429
+- Rebase to latest upstream gitrev 20220429 (#2080136)
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-54.git20210102
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Sep 14 2021 Sahana Prasad <sahana@redhat.com> - 0.5.3-53.git20210102
+- Rebuilt with OpenSSL 3.0.0
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-52.git20210102
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 0.5.3-51.git20210102
+- Perl 5.34 rebuild
+
 * Wed Mar 03 2021 Robert Scheck <robert@fedoraproject.org> - 0.5.3-50.git20210102
 - Rebase to latest upstream gitrev 20210102