[w3c-markup-validator] new upstream release

Tue Jun 26 21:03:59 UTC 2012

commit d53d5d7838a4c6a13c43537aed12ba99e9c27845
Author: Nathanael D. Noblet <nathanael at gnat.ca>
Date:   Tue Jun 26 15:03:55 2012 -0600

    new upstream release

 .gitignore                                         |    1 +
 sources                                            |    2 +-
 w3c-markup-validator-0.8.6-iso-html.patch          |   14 --------------
 w3c-markup-validator-1.3-iso-html.patch            |   13 +++++++++++++
 ...atch => w3c-markup-validator-1.3-syspaths.patch |   19 +++++++++----------
 w3c-markup-validator.spec                          |   17 +++++++++--------
 6 files changed, 33 insertions(+), 33 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index cac84bb..639068d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /w3c-markup-validator-1.2.tar.xz
+/w3c-markup-validator-1.3.tar.xz
diff --git a/sources b/sources
index 2e475a0..497b16e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97f6c375114d8eefdb35b5af4355f6ca  w3c-markup-validator-1.2.tar.xz
+04611f5b7f70f02ff5ceeb57f510080c  w3c-markup-validator-1.3.tar.xz
diff --git a/w3c-markup-validator-1.3-iso-html.patch b/w3c-markup-validator-1.3-iso-html.patch
new file mode 100644
index 0000000..9485fdf
--- /dev/null
+++ b/w3c-markup-validator-1.3-iso-html.patch
@@ -0,0 +1,13 @@
+--- validator-1.3/htdocs/sgml-lib/sgml.soc.org	2012-06-26 14:33:23.772552955 -0600
++++ validator-1.3/htdocs/sgml-lib/sgml.soc	2012-06-26 14:33:49.265139524 -0600
+@@ -192,10 +192,6 @@
+ 
+ -- ISO-HTML --
+ 
+-PUBLIC "ISO/IEC 15445:2000//DTD HyperText Markup Language//EN"
+-       "ISO-HTML/15445.dtd"
+-PUBLIC "ISO/IEC 15445:2000//DTD HTML//EN"
+-       "ISO-HTML/15445.dtd"
+ SYSTEM "http://www.cs.tcd.ie/15445.dtd"
+        "ISO-HTML/15445.dtd"
+ SYSTEM "http://www.scss.tcd.ie/misc/15445/15445.dtd"
diff --git a/w3c-markup-validator-1.1-syspaths.patch b/w3c-markup-validator-1.3-syspaths.patch
similarity index 54%
rename from w3c-markup-validator-1.1-syspaths.patch
rename to w3c-markup-validator-1.3-syspaths.patch
index 0919f0d..29ddcd5 100644
--- a/w3c-markup-validator-1.1-syspaths.patch
+++ b/w3c-markup-validator-1.3-syspaths.patch
@@ -1,16 +1,15 @@
-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.
+--- validator-1.3/httpd/cgi-bin/check.org	2012-06-26 14:53:05.874512528 -0600
++++ validator-1.3/httpd/cgi-bin/check	2012-06-26 14:54:51.971907555 -0600
+@@ -222,7 +222,7 @@
+     # Note that setting XML_CATALOG_FILES here does not seem to work with
+     # mod_perl (it doesn't end up being used by XML::LibXML), therefore we do
+     # it in the mod_perl/startup.pl startup file for it too.
 -    local $ENV{XML_CATALOG_FILES} =
 +    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
-@@ -1213,7 +1213,8 @@ sub dtd_validate (\$)
+     XML::LibXML->VERSION(1.73);    # Need 1.73 for rt.cpan.org #66642
+@@ -1239,7 +1239,8 @@
  
      #
      # Parser configuration
@@ -20,7 +19,7 @@ diff -up validator-1.1/httpd/cgi-bin/check~ validator-1.1/httpd/cgi-bin/check
      $opensp->catalogs($catalog);
      $opensp->show_error_numbers(1);
      $opensp->warnings(@spopt);
-@@ -2072,6 +2073,7 @@ sub xml_jail_match
+@@ -2080,6 +2081,7 @@
  
      # 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 47a605a..7540bf5 100644
--- a/w3c-markup-validator.spec
+++ b/w3c-markup-validator.spec
@@ -1,8 +1,8 @@
 %global __requires_exclude perl\\(W3C::Validator::EventHandler\\)
 
 Name:           w3c-markup-validator
-Version:        1.2
-Release:        5%{?dist}
+Version:        1.3
+Release:        1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -14,16 +14,14 @@ Source99:       %{name}-prepare-tarball.sh
 # Not upstreamable
 Patch0:         %{name}-1.2-config.patch
 # Not upstreamable
-Patch1:         %{name}-1.1-syspaths.patch
+Patch1:         %{name}-1.3-syspaths.patch
 # Not upstreamable,
 # https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00015.html
 Patch2:         %{name}-1.0-valid-icons.patch
 # Not upstreamable,
 # https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00020.html
-Patch3:         %{name}-0.8.6-iso-html.patch
+Patch3:         %{name}-1.3-iso-html.patch
 
-# From upstream post-1.2 hg (commit 3214)
-Patch5:         %{name}-1.2-perl512-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -62,7 +60,6 @@ rm htdocs/images/markup_validation_service.psd
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch5 -p1
 find . -type f -name "*.orig" -delete # patch backup files
 
 mv htdocs/sgml-lib .
@@ -137,7 +134,6 @@ done
 %dir %{_sysconfdir}/w3c/
 %config(noreplace) %{_sysconfdir}/w3c/charset.cfg
 %config(noreplace) %{_sysconfdir}/w3c/tidy.conf
-%config(noreplace) %{_sysconfdir}/w3c/tips.cfg
 # These are incompatible to some extent between releases, check noreplace
 %config %{_sysconfdir}/w3c/types.conf
 %config(noreplace) %{_sysconfdir}/w3c/validator.conf
@@ -150,6 +146,11 @@ done
 
 
 %changelog
+* Tue Jun 26 2012 Nathanael Noblet <nathanael at gnat.ca> - 1.3-1
+- New upstream release
+- fixed syspath and iso-html patch for new release
+- remove upstreamed perl warnings patch 
+
 * Mon Jun 25 2012 Nathanael Noblet <nathanael at gnat.ca> - 1.2-5
 - Removed non-needed hans patch as it has been packaged
 
