rpms/w3c-markup-validator/FC-6 w3c-markup-validator-0.7.3-html401.patch, NONE, 1.1 w3c-markup-validator-0.7.3-syspaths.patch, NONE, 1.1 w3c-markup-validator-0.7.3-xhtml1.patch, NONE, 1.1 w3c-markup-validator.spec, 1.11, 1.12 w3c-markup-validator-0.7.2-html401.patch, 1.1, NONE w3c-markup-validator-0.7.2-syspaths.patch, 1.1, NONE

Ville Skytta (scop) fedora-extras-commits at redhat.com
Tue Oct 31 19:37:11 UTC 2006


Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17341/FC-6

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.3-html401.patch 
	w3c-markup-validator-0.7.3-syspaths.patch 
	w3c-markup-validator-0.7.3-xhtml1.patch 
Removed Files:
	w3c-markup-validator-0.7.2-html401.patch 
	w3c-markup-validator-0.7.2-syspaths.patch 
Log Message:
* Tue Oct 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-2
- Reference HTML 4.01 DTDs directly instead of making all system catalogs
  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
- Use system XHTML 1.0 DTDs.


w3c-markup-validator-0.7.3-html401.patch:

--- NEW FILE w3c-markup-validator-0.7.3-html401.patch ---
--- validator-0.7.3/htdocs/sgml-lib/sgml.soc~	2005-07-26 06:22:32.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/sgml.soc	2006-10-31 01:16:21.000000000 +0200
@@ -41,19 +41,19 @@
 PUBLIC "-//W3C//DTD HTML 4.0 Frameset//EN"	REC-html40-19980424/frameset.dtd
 
 	-- HTML 4.01 --
-PUBLIC "-//W3C//DTD HTML 4.01//EN"		REC-html401-19991224/strict.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	REC-html401-19991224/loose.dtd
-PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	REC-html401-19991224/frameset.dtd
-PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	REC-html401-19991224/HTMLspecial.ent
-PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//DTD HTML 4.01//EN"		/usr/share/sgml/html/4.01/strict.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"	/usr/share/sgml/html/4.01/loose.dtd
+PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"	/usr/share/sgml/html/4.01/frameset.dtd
+PUBLIC "-//W3C//ENTITIES Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Latin1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Special//EN//HTML"	/usr/share/sgml/html/4.01/HTMLspecial.ent
+PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 	-- 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
-PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	REC-html401-19991224/HTMLlat1.ent
-PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	REC-html401-19991224/HTMLsymbol.ent
+PUBLIC "-//W3C//ENTITIES Full Latin 1//EN//HTML"	/usr/share/sgml/html/4.01/HTMLlat1.ent
+PUBLIC "-//W3C//ENTITIES Symbolic//EN//HTML"	/usr/share/sgml/html/4.01/HTMLsymbol.ent
 
 
         -- Do not prefer document type name over a SYSTEM Identifier. --

w3c-markup-validator-0.7.3-syspaths.patch:

--- NEW FILE w3c-markup-validator-0.7.3-syspaths.patch ---
--- validator-0.7.3/httpd/cgi-bin/check~	2006-10-23 09:01:01.000000000 +0300
+++ validator-0.7.3/httpd/cgi-bin/check	2006-10-31 01:35:06.000000000 +0200
@@ -658,6 +658,7 @@
   #
   # Tell onsgmls about the SGML Library.
   $ENV{SGML_SEARCH_PATH} = $CFG->{Paths}->{SGML}->{Library};
+  $ENV{SGML_SEARCH_PATH} .= ":/usr/share/xml:/usr/share/sgml";
 
   #
   # Set the command to execute.

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

--- NEW FILE w3c-markup-validator-0.7.3-xhtml1.patch ---
--- validator-0.7.3/htdocs/sgml-lib/xml.soc~	2006-10-11 09:30:52.000000000 +0300
+++ validator-0.7.3/htdocs/sgml-lib/xml.soc	2006-10-31 01:30:03.000000000 +0200
@@ -36,17 +36,17 @@
        "REC-xhtml11-20010531/xhtml11-model-1.mod"
 
 PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-       "REC-xhtml1-20020801/xhtml1-strict.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-strict.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "REC-xhtml1-20020801/xhtml1-transitional.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-transitional.dtd"
 PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-       "REC-xhtml1-20020801/xhtml1-frameset.dtd"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml1-frameset.dtd"
 PUBLIC "-//W3C//ENTITIES Latin 1 for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-lat1.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-lat1.ent"
 PUBLIC "-//W3C//ENTITIES Symbols for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-symbol.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-symbol.ent"
 PUBLIC "-//W3C//ENTITIES Special for XHTML//EN"
-       "REC-xhtml1-20020801/xhtml-special.ent"
+       "/usr/share/sgml/xhtml1/xhtml1-20020801/DTD/xhtml-special.ent"
 
 PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
        "REC-xhtml-basic-20001219/xhtml-basic10.dtd"


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-6/w3c-markup-validator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- w3c-markup-validator.spec	23 Oct 2006 21:13:25 -0000	1.11
+++ w3c-markup-validator.spec	31 Oct 2006 19:36:40 -0000	1.12
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -11,8 +11,9 @@
 Source0:        http://validator.w3.org/dist/validator-%{tbver}.tar.gz
 Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
-Patch1:         %{name}-0.7.2-syspaths.patch
-Patch2:         %{name}-0.7.2-html401.patch
+Patch1:         %{name}-0.7.3-syspaths.patch
+Patch2:         %{name}-0.7.3-html401.patch
+Patch3:         %{name}-0.7.3-xhtml1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -29,7 +30,8 @@
 Summary:        SGML and XML DTDs for the W3C Markup Validator
 Group:          Applications/Text
 Requires:       sgml-common
-Requires:       html401-dtds
+Requires:       html401-dtds /usr/share/sgml/html/4.01
+Requires:       xhtml1-dtds /usr/share/sgml/xhtml1/xhtml1-20020801/DTD
 
 %description    libs
 SGML and XML DTDs for the W3C Markup Validator.
@@ -38,10 +40,12 @@
 %prep
 %setup -q -a 1 -n validator-%{version}
 rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
+rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801
 mv validator-%{version}/htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p2
 rm -f htdocs/images/debian.png
 
 # Localize configs.
@@ -117,6 +121,11 @@
 
 
 %changelog
+* Tue Oct 31 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-2
+- Reference HTML 4.01 DTDs directly instead of making all system catalogs
+  available - something in the catalogs breaks at least XHTML 1.0 (#213131).
+- Use system XHTML 1.0 DTDs.
+
 * Mon Oct 23 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-1
 - 0.7.3, feedback and undebian patches applied upstream.
 - Use "W3C License" as the License tag to appease rpmlint.


--- w3c-markup-validator-0.7.2-html401.patch DELETED ---


--- w3c-markup-validator-0.7.2-syspaths.patch DELETED ---




More information about the scm-commits mailing list