diff --git a/w3m.spec b/w3m.spec index 42f08c4..67ee7c8 100644 --- a/w3m.spec +++ b/w3m.spec @@ -8,12 +8,18 @@ Name: w3m Version: 0.5.3 -Release: 69.git%{gitdate}%{?dist} -# Unicode-DFS-2015 is added for EastAsianWidth.txt source -License: MIT AND Unicode-DFS-2015 +Release: 64.git%{gitdate}%{?dist} +# UCD is added for EastAsianWidth.txt source +License: MIT and UCD URL: http://w3m.sourceforge.net/ BuildRequires: ncurses-devel +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: openssl-devel +%else +BuildRequires: openssl11-devel +# -Wnull-dereference requires GCC >= 6 +BuildRequires: devtoolset-8-toolchain +%endif BuildRequires: perl-generators BuildRequires: pkgconfig BuildRequires: gettext-devel @@ -53,7 +59,9 @@ w3m-img package as well. %package img Summary: Helper program to display the inline images for w3m BuildRequires: gtk2-devel +%if 0%{?fedora} || 0%{?rhel} > 7 BuildRequires: gdk-pixbuf2-xlib-devel +%endif Requires: ImageMagick Requires: %{name}%{?_isa} = %{version}-%{release} @@ -66,7 +74,12 @@ linux framebuffer. %autosetup -n %{name}-%{version}-git%{gitdate} -p1 %build -export CFLAGS="$CFLAGS -std=gnu17" +%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 + %configure %{build_options} %make_build @@ -98,21 +111,6 @@ rm -f doc*/w3m.1 %{_libexecdir}/w3m/w3mimgdisplay %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.5.3-69.git20230121 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Sat Jun 13 2026 Yaakov Selkowitz - 0.5.3-68.git20230121 -- Rebuilt for openssl 4.0 - -* Sat Jan 17 2026 Fedora Release Engineering - 0.5.3-67.git20230121 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Fri Jul 25 2025 Fedora Release Engineering - 0.5.3-66.git20230121 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 0.5.3-65.git20230121 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Sat Jul 20 2024 Fedora Release Engineering - 0.5.3-64.git20230121 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild