rpms/w3c-markup-validator/devel w3c-markup-validator-0.7.2-feedback.patch, NONE, 1.1 w3c-markup-validator-0.7.2-undebian.patch, NONE, 1.1 w3c-markup-validator.spec, 1.9, 1.10

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1106

Modified Files:
	w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.7.2-feedback.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).


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-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/devel/w3c-markup-validator.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- w3c-markup-validator.spec	1 Sep 2006 22:15:14 -0000	1.9
+++ w3c-markup-validator.spec	15 Sep 2006 15:51:40 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           w3c-markup-validator
 Version:        0.7.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
@@ -13,6 +13,8 @@
 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
@@ -42,6 +44,9 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
+%patch3 -p1
+%patch4 -p0
+rm -f htdocs/images/debian.png
 
 # Localize configs.
 %{__perl} -pi -e \
@@ -116,6 +121,9 @@
 
 
 %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.