rpms/w3c-markup-validator/FC-5 w3c-markup-validator-0.7.2-config.patch, NONE, 1.1 w3c-markup-validator-0.7.2-feedback.patch, NONE, 1.1 w3c-markup-validator-0.7.2-html401.patch, NONE, 1.1 w3c-markup-validator-0.7.2-syspaths.patch, NONE, 1.1 w3c-markup-validator-0.7.2-undebian.patch, NONE, 1.1 w3c-markup-validator.spec, 1.8, 1.9

Ville Skytta (scop) fedora-extras-commits at redhat.com
Fri Sep 15 15:54:08 UTC 2006


Author: scop

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

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.2-config.patch 
	w3c-markup-validator-0.7.2-feedback.patch 
	w3c-markup-validator-0.7.2-html401.patch 
	w3c-markup-validator-0.7.2-syspaths.patch 
	w3c-markup-validator-0.7.2-undebian.patch 
Log Message:
* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-4
- Fix feedback view, remove references to Debian (#206617).

* Sat Aug 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-3
- Patch to allow use of system catalogs and DTDs, use system html401-dtds.
- Make config files noreplace again.
- Drop no longer needed Obsoletes.
- Allow FTP by default.


w3c-markup-validator-0.7.2-config.patch:

--- NEW FILE w3c-markup-validator-0.7.2-config.patch ---
--- validator-0.7.2/htdocs/config/validator.conf~	2005-07-08 11:31:09.000000000 +0300
+++ validator-0.7.2/htdocs/config/validator.conf	2006-08-26 14:13:06.000000000 +0300
@@ -65,16 +65,16 @@
 # Protocols the validator is allowed to use for retrieving documents.
 # The default is to allow http and https.
 <Protocols>
-  Allow = data,http,https
+  Allow = data,http,https,ftp
 </Protocols>
 
 #
 # Email address of the maintainer of this service.
-Maintainer = www-validator at w3.org
+Maintainer = root at localhost
 
 #
 # The "Home Page" for the service.  Make sure this ends with a slash.
-Home Page = http://validator.w3.org/
+Home Page = http://localhost/w3c-validator/
 
 #
 # Base URI for the Element Reference.

w3c-markup-validator-0.7.2-feedback.patch:

--- NEW FILE w3c-markup-validator-0.7.2-feedback.patch ---
===================================================================
RCS file: /sources/public/validator/httpd/cgi-bin/sendfeedback.pl,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- validator/httpd/cgi-bin/sendfeedback.pl	2005/02/25 00:18:51	1.4
+++ validator/httpd/cgi-bin/sendfeedback.pl	2006/02/24 20:51:20	1.4.2.1
@@ -70,12 +70,19 @@
 our $lang = 'en_US'; # @@@ TODO: conneg
 
 # Read error message + explanations file
-our $error_messages_list =  File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'error_messages.cfg');
-our %config_opts = (-ConfigFile => $error_messages_list);
-our %rsrc = Config::General->new(%config_opts)->getall();
+our %rsrc = Config::General->new(
+  -MergeDuplicateBlocks => 1,
+  -ConfigFile           => File::Spec->catfile($CFG->{Paths}->{Templates},
+                                               $lang, 'error_messages.cfg'),
+  )->getall();
+# Config::General workarounds for <msg 0> issues:
+$rsrc{msg}{0} ||=
+  delete($rsrc{'msg 0'}) ||                   # < 2.31
+  { original => delete($rsrc{msg}{original}), #   2.31
+    verbose  => delete($rsrc{msg}{verbose}),
+  };
 $RSRC = \%rsrc;
 
-
 our $T = HTML::Template->new(
   filename          => File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'feedback.tmpl'),
   die_on_bad_params => FALSE,

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

--- NEW FILE w3c-markup-validator-0.7.2-html401.patch ---
--- validator-0.7.2/htdocs/sgml-lib/sgml.soc~	2005-07-26 06:22:32.000000000 +0300
+++ validator-0.7.2/htdocs/sgml-lib/sgml.soc	2006-08-26 15:31:10.000000000 +0300
@@ -41,19 +41,11 @@
 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
+CATALOG "/etc/sgml/html401-dtds.soc"
 
 	-- 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
 
 
         -- Do not prefer document type name over a SYSTEM Identifier. --

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

--- NEW FILE w3c-markup-validator-0.7.2-syspaths.patch ---
--- validator-0.7.2/httpd/cgi-bin/check~	2006-02-18 22:06:41.000000000 +0200
+++ validator-0.7.2/httpd/cgi-bin/check	2006-08-26 15:35:01.000000000 +0300
@@ -605,6 +605,8 @@
   #
   # Tell onsgmls about the SGML Library.
   $ENV{SGML_SEARCH_PATH} = $CFG->{Paths}->{SGML}->{Library};
+  $ENV{SGML_SEARCH_PATH} .= ":" . join(":", qw(
+    /etc/sgml /usr/share/sgml /etc/xml /usr/share/xml));
 
   #
   # Set the command to execute.

w3c-markup-validator-0.7.2-undebian.patch:

--- NEW FILE w3c-markup-validator-0.7.2-undebian.patch ---
--- htdocs/about.html~	2005-08-05 03:17:25.000000000 +0300
+++ htdocs/about.html	2006-09-15 18:38:24.000000000 +0300
@@ -186,12 +186,8 @@
         </li>
         <li>Documentation and Error Explanations originally written by Scott Bigham.</li>
         <li>Open source software including <a
-          href="http://httpd.apache.org/">Apache</a>, <a
-          href="http://www.perl.com/">Perl</a>, and <a
-          href="http://www.debian.org/">Debian GNU/Linux</a>.<a
-          href="http://www.debian.org/"><img
-          style="float: right; clear: both; width: 88px; height: 30px"
-          src="images/debian.png" alt="[Powered by Debian]" /></a>
+          href="http://httpd.apache.org/">Apache</a> and <a
+          href="http://www.perl.com/">Perl</a>.
         </li>
         <li>
           Patches and ideas from:


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/FC-5/w3c-markup-validator.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- w3c-markup-validator.spec	29 Mar 2006 16:58:35 -0000	1.8
+++ w3c-markup-validator.spec	15 Sep 2006 15:54:08 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.2
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -10,6 +10,11 @@
 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
+Patch0:         %{name}-0.7.2-config.patch
+Patch1:         %{name}-0.7.2-syspaths.patch
+Patch2:         %{name}-0.7.2-html401.patch
+Patch3:         %{name}-0.7.2-feedback.patch
+Patch4:         %{name}-0.7.2-undebian.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,7 +22,6 @@
 Requires:       httpd
 Requires:       opensp >= 1.5
 Requires:       %{name}-libs = %{version}
-Obsoletes:      w3c-validator
 
 %description
 The W3C Markup Validator checks documents like HTML and XHTML for
@@ -27,7 +31,7 @@
 Summary:        SGML and XML DTDs for the W3C Markup Validator
 Group:          Applications/Text
 Requires:       sgml-common
-Obsoletes:      w3c-validator-libs
+Requires:       html401-dtds
 
 %description    libs
 SGML and XML DTDs for the W3C Markup Validator.
@@ -35,16 +39,21 @@
 
 %prep
 %setup -q -a 1 -n validator-%{version}
+rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
 mv validator-%{version}/htdocs/sgml-lib .
+%patch0 -p1
+%patch1 -p1
+%patch2 -p2
+%patch3 -p1
+%patch4 -p0
+rm -f htdocs/images/debian.png
 
 # Localize configs.
 %{__perl} -pi -e \
   's|/usr/local/validator\b|%{_datadir}/%{name}|' \
   htdocs/config/validator.conf httpd/conf/httpd.conf httpd/cgi-bin/*
 %{__perl} -pi -e \
-  's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}| ;
-   s|\bwww-validator\@w3\.org\b|root\@localhost| ;
-   s|/validator\.w3\.org/|/localhost/w3c-validator/|' \
+  's|^(\s*Library\s*=\s*).*|${1}%{_datadir}/sgml/%{name}|' \
   htdocs/config/validator.conf
 
 # Move config out of the way
@@ -101,9 +110,8 @@
 
 %files
 %defattr(-,root,root,-)
-# Configs not "noreplace", they're incompatible in 0.6.7 vs 0.7.x.
-%config %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%config %{_sysconfdir}/w3c/
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/w3c/
 %{_datadir}/%{name}/
 
 %files libs
@@ -113,6 +121,15 @@
 
 
 %changelog
+* Fri Sep 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-4
+- Fix feedback view, remove references to Debian (#206617).
+
+* Sat Aug 26 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-3
+- Patch to allow use of system catalogs and DTDs, use system html401-dtds.
+- Make config files noreplace again.
+- Drop no longer needed Obsoletes.
+- Allow FTP by default.
+
 * Wed Mar 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-2
 - Rebuild due to #187173, SELinux issues are being worked on in #182673.
 




More information about the scm-commits mailing list