commit 0528ee8d2a586e691b69b805a9e51fe88fb55b05
Author: Ville Skyttà <ville.skytta@xxxxxx>
Date: Sun Nov 28 11:55:07 2010 +0200
- Fix XML::LibXML catalog files setup (#657636).
...atch => w3c-markup-validator-1.1-syspaths.patch | 14 +++++++-------
w3c-markup-validator.spec | 7 +++++--
2 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/w3c-markup-validator-1.0-syspaths.patch b/w3c-markup-validator-1.1-syspaths.patch
similarity index 73%
rename from w3c-markup-validator-1.0-syspaths.patch
rename to w3c-markup-validator-1.1-syspaths.patch
index 33350a1..0919f0d 100644
--- a/w3c-markup-validator-1.0-syspaths.patch
+++ b/w3c-markup-validator-1.1-syspaths.patch
@@ -1,16 +1,16 @@
-diff -up validator-1.0/httpd/cgi-bin/check~ validator-1.0/httpd/cgi-bin/check
---- validator-1.0/httpd/cgi-bin/check~ 2010-06-15 01:11:55.000000000 +0300
-+++ validator-1.0/httpd/cgi-bin/check 2010-06-18 00:58:25.646846413 +0300
-@@ -219,7 +219,7 @@ EOF
+diff -up validator-1.1/httpd/cgi-bin/check~ validator-1.1/httpd/cgi-bin/check
+--- validator-1.1/httpd/cgi-bin/check~ 2010-07-12 20:37:06.000000000 +0300
++++ validator-1.1/httpd/cgi-bin/check 2010-11-28 11:45:07.219577192 +0200
+@@ -215,7 +215,7 @@ EOF
# SGML open catalogs but they don't seem to work (again as of 1.70 and
# 2.7.7); if we use xml.soc here, no entities seem to end up being resolved
# from it - so we use a (redundant) XML catalog which works.
- local $ENV{XML_CATALOG_FILES} =
-+ local $ENV{XML_CATALOG_FILES} = "/etc/xml/catalog:" .
++ local $ENV{XML_CATALOG_FILES} = "/etc/xml/catalog " .
catfile($CFG->{Paths}->{SGML}->{Library}, 'catalog.xml');
require XML::LibXML;
XML::LibXML->VERSION(1.70); # Need 1.70 for (working) structured errors
-@@ -1386,7 +1386,8 @@ sub dtd_validate (\$)
+@@ -1213,7 +1213,8 @@ sub dtd_validate (\$)
#
# Parser configuration
@@ -20,7 +20,7 @@ diff -up validator-1.0/httpd/cgi-bin/check~ validator-1.0/httpd/cgi-bin/check
$opensp->catalogs($catalog);
$opensp->show_error_numbers(1);
$opensp->warnings(@spopt);
-@@ -2048,6 +2049,7 @@ sub xml_jail_match
+@@ -2072,6 +2073,7 @@ sub xml_jail_match
# Do not trap file URIs within our jail.
for my $dir ($CFG->{Paths}->{SGML}->{Library},
diff --git a/w3c-markup-validator.spec b/w3c-markup-validator.spec
index 4aefd1d..5e8cf8c 100644
--- a/w3c-markup-validator.spec
+++ b/w3c-markup-validator.spec
@@ -1,6 +1,6 @@
Name: w3c-markup-validator
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: W3C Markup Validator
Group: Applications/Internet
@@ -12,7 +12,7 @@ Source99: %{name}-prepare-tarball.sh
# Not upstreamable
Patch0: %{name}-1.0-config.patch
# Not upstreamable
-Patch1: %{name}-1.0-syspaths.patch
+Patch1: %{name}-1.1-syspaths.patch
# Not upstreamable,
# https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00015.html
Patch2: %{name}-1.0-valid-icons.patch
@@ -146,6 +146,9 @@ done
%changelog
+* Sun Nov 28 2010 Ville Skyttà <ville.skytta@xxxxxx> - 1.1-2
+- Fix XML::LibXML catalog files setup (#657636).
+
* Tue Jul 13 2010 Ville Skyttà <ville.skytta@xxxxxx> - 1.1-1
- Update to 1.1.
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
