diff --git a/w3c-markup-validator-prepare-tarball.sh b/w3c-markup-validator-prepare-tarball.sh index 8339fa8..891b790 100755 --- a/w3c-markup-validator-prepare-tarball.sh +++ b/w3c-markup-validator-prepare-tarball.sh @@ -18,7 +18,6 @@ version=$1 tbver=${version//./_} pkg=w3c-markup-validator -# or https://github.com/w3c/markup-validator/archive/refs/tags/validator-1_3-release.tar.gz url1=http://validator.w3.org/dist/validator-$tbver.tar.gz url2=http://validator.w3.org/dist/sgml-lib-$tbver.tar.gz diff --git a/w3c-markup-validator.spec b/w3c-markup-validator.spec index 7bc1394..0a11553 100644 --- a/w3c-markup-validator.spec +++ b/w3c-markup-validator.spec @@ -2,7 +2,7 @@ Name: w3c-markup-validator Version: 1.3 -Release: 31%{?dist} +Release: 21%{?dist} Summary: W3C Markup Validator License: W3C @@ -31,7 +31,7 @@ Requires: %{name}-libs = %{version} # Not autodetected Requires: perl(XML::LibXML) >= 1.70 # Optional -Recommends: perl(HTML::Tidy) +Requires: perl(HTML::Tidy) %description The W3C Markup Validator checks documents like HTML and XHTML for @@ -54,11 +54,11 @@ rm -r htdocs/sgml-lib/REC-html401-19991224 rm -r htdocs/sgml-lib/REC-xhtml1-20020801 rm htdocs/images/markup_validation_service.psd -%patch -P0 -p1 -%patch -P1 -p1 -%patch -P2 -p1 -%patch -P3 -p1 -%patch -P4 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 find . -type f -name "*.orig" -delete # patch backup files @@ -108,7 +108,7 @@ touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat %post -[ $1 -eq 1 ] && systemctl reload httpd || : +[ $1 -eq 1 ] && %{_initrddir}/httpd reload &>/dev/null || : %postun %systemd_postun_with_restart httpd @@ -143,36 +143,6 @@ done %{_datadir}/sgml/%{name}/ %changelog -* Fri Jul 25 2025 Fedora Release Engineering - 1.3-31 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 1.3-30 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Sat Jul 20 2024 Fedora Release Engineering - 1.3-29 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Sat Jan 27 2024 Fedora Release Engineering - 1.3-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jul 22 2023 Fedora Release Engineering - 1.3-27 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Sat Jan 21 2023 Fedora Release Engineering - 1.3-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sat Jul 23 2022 Fedora Release Engineering - 1.3-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Feb 21 2022 Sérgio Basto - 1.3-24 -- Recommends perl(HTML::Tidy) instead Require - -* Sat Jan 22 2022 Fedora Release Engineering - 1.3-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 1.3-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Wed Jan 27 2021 Fedora Release Engineering - 1.3-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild