rpms/w3c-markup-validator/devel w3c-markup-validator-0.8.4-override.patch, NONE, 1.1 w3c-markup-validator-0.8.4-xhtml1.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 w3c-markup-validator.spec, 1.21, 1.22 w3c-markup-validator-0.8.2-xhtml1.patch, 1.1, NONE w3c-markup-validator-0.8.3-errlog-trash.patch, 1.1, NONE w3c-markup-validator-0.8.3-htmli18n.patch, 1.1, NONE

Sat Nov 22 07:27:48 UTC 2008

Author: scop

Update of /cvs/pkgs/rpms/w3c-markup-validator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7137

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.8.4-override.patch 
	w3c-markup-validator-0.8.4-xhtml1.patch 
Removed Files:
	w3c-markup-validator-0.8.2-xhtml1.patch 
	w3c-markup-validator-0.8.3-errlog-trash.patch 
	w3c-markup-validator-0.8.3-htmli18n.patch 
Log Message:
* Sat Nov 22 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.8.4-1
- 0.8.4 + upstream doctype override fix.
- types.conf and error log trash patches applied upstream.


w3c-markup-validator-0.8.4-override.patch:

--- NEW FILE w3c-markup-validator-0.8.4-override.patch ---
Index: httpd/cgi-bin/check
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/check,v
retrieving revision 1.606
retrieving revision 1.607
diff -u -r1.606 -r1.607
--- httpd/cgi-bin/check	14 Nov 2008 16:22:51 -0000	1.606
+++ httpd/cgi-bin/check	22 Nov 2008 07:01:23 -0000	1.607
@@ -1766,7 +1766,7 @@
   my $name  = $dt->{Name};
   local $dtd;
   
-  if (($pubid ne "") and ($sysid ne "")) {
+  if ($pubid ne "") {
     $dtd = qq(<!DOCTYPE $name PUBLIC "$pubid");
     $dtd .= qq( "$sysid") if $sysid; # We don't have one for all types.
     $dtd .= '>';

w3c-markup-validator-0.8.4-xhtml1.patch:

--- NEW FILE w3c-markup-validator-0.8.4-xhtml1.patch ---
diff -up validator-0.8.4/htdocs/sgml-lib/xml.soc.orig validator-0.8.4/htdocs/sgml-lib/xml.soc
--- validator-0.8.4/htdocs/sgml-lib/xml.soc.orig	2008-08-27 23:30:26.000000000 +0300
+++ validator-0.8.4/htdocs/sgml-lib/xml.soc	2008-11-22 08:41:37.000000000 +0200
@@ -44,17 +44,17 @@ PUBLIC "-//W3C//ENTITIES XHTML 1.1 Docum
        "WD-xhtml11-20070216/xhtml11-model-1.mod"
 
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "REC-xhtml1-20020801/xhtml1-strict.dtd"
+       "/usr/share/xml/xhtml/1.0/xhtml1-strict.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "REC-xhtml1-20020801/xhtml1-transitional.dtd"
+       "/usr/share/xml/xhtml/1.0/xhtml1-transitional.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-       "REC-xhtml1-20020801/xhtml1-frameset.dtd"
+       "/usr/share/xml/xhtml/1.0/xhtml1-frameset.dtd"
 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-lat1.ent"
+       "/usr/share/xml/xhtml/1.0/xhtml-lat1.ent"
 PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-symbol.ent"
+       "/usr/share/xml/xhtml/1.0/xhtml-symbol.ent"
 PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-special.ent"
+       "/usr/share/xml/xhtml/1.0/xhtml-special.ent"
 
 PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
        "REC-xhtml-basic-20001219/xhtml-basic10.dtd"


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Aug 2008 06:32:45 -0000	1.11
+++ .cvsignore	22 Nov 2008 07:27:16 -0000	1.12
@@ -1,2 +1,2 @@
-sgml-lib-0_8_3.tar.gz
-validator-0_8_3.tar.gz
+sgml-lib-0_8_4.tar.gz
+validator-0_8_4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Aug 2008 06:32:45 -0000	1.11
+++ sources	22 Nov 2008 07:27:16 -0000	1.12
@@ -1,2 +1,2 @@
-a3877dd86783318475cc2d94e1fc818b  sgml-lib-0_8_3.tar.gz
-f0597c09ecff7e3b5caff727538e5b8d  validator-0_8_3.tar.gz
+e333381c7c70db99437a320a9bb2b074  sgml-lib-0_8_4.tar.gz
+9444b3b0a8531bcb9841cfb6b07503d1  validator-0_8_4.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- w3c-markup-validator.spec	11 Sep 2008 18:51:13 -0000	1.21
+++ w3c-markup-validator.spec	22 Nov 2008 07:27:17 -0000	1.22
@@ -1,8 +1,8 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.8.3
-Release:        2
+Version:        0.8.4
+Release:        1
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -10,13 +10,18 @@
 URL:            http://validator.w3.org/
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
+# Not upstreamable
 Patch0:         %{name}-0.7.2-config.patch
+# Not upstreamable
 Patch1:         %{name}-0.8.0b1-syspaths.patch
+# Not upstreamable
 Patch2:         %{name}-0.7.3-html401.patch
-Patch3:         %{name}-0.8.2-xhtml1.patch
+# Not upstreamable
+Patch3:         %{name}-0.8.4-xhtml1.patch
+# Not upstreamable, kept until Encode::HanExtra and Encode::JIS2K are packaged
 Patch4:         %{name}-0.8.1-extra-encoders.patch
-Patch5:         %{name}-0.8.3-htmli18n.patch
-Patch6:         %{name}-0.8.3-errlog-trash.patch
+# In upstream post 0.8.4 CVS
+Patch5:         %{name}-0.8.4-override.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -44,7 +49,6 @@
 %setup -q -b 1 -n validator-%{version}
 rm -r htdocs/sgml-lib/REC-html401-19991224
 rm -r htdocs/sgml-lib/REC-xhtml1-20020801
-rm -r htdocs/sgml-lib/CR-xhtml-basic-20070713 # superseded, unused
 mv htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
@@ -52,7 +56,6 @@
 %patch3 -p2
 %patch4 -p1
 %patch5 -p0
-%patch6 -p0
 find . -name "*.orig" -print0 | xargs -0 rm
 
 # Localize configs.
@@ -136,6 +139,10 @@
 
 
 %changelog
+* Sat Nov 22 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.8.4-1
+- 0.8.4 + upstream doctype override fix.
+- types.conf and error log trash patches applied upstream.
+
 * Thu Sep 11 2008 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 0.8.3-2
 - Upstream fix for server error log trashing.
 


--- w3c-markup-validator-0.8.2-xhtml1.patch DELETED ---


--- w3c-markup-validator-0.8.3-errlog-trash.patch DELETED ---


--- w3c-markup-validator-0.8.3-htmli18n.patch DELETED ---


