rpms/w3c-markup-validator/devel w3c-markup-validator-0.8.1-extra-encoders.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 sources, 1.8, 1.9 w3c-markup-validator.spec, 1.15, 1.16
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Thu Aug 16 14:25:49 UTC 2007
Author: scop
Update of /cvs/pkgs/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9504
Modified Files:
.cvsignore sources w3c-markup-validator.spec
Added Files:
w3c-markup-validator-0.8.1-extra-encoders.patch
Log Message:
* Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-1
- 0.8.1.
- License: W3C
- Own the %{_sysconfdir}/w3c directory.
- Patch to make some Encode::* modules that aren't packaged in Fedora yet
optional.
w3c-markup-validator-0.8.1-extra-encoders.patch:
--- NEW FILE w3c-markup-validator-0.8.1-extra-encoders.patch ---
--- validator-0.8.1/httpd/cgi-bin/check~ 2007-08-07 05:32:49.000000000 +0300
+++ validator-0.8.1/httpd/cgi-bin/check 2007-08-16 17:14:56.000000000 +0300
@@ -48,9 +48,6 @@ use CGI::Carp qw(carp cr
use Config::General 2.19 qw(); # Need 2.19 for -AutoLaunder
use Encode qw();
use Encode::Alias qw();
-use Encode::HanExtra qw(); # for some chinese character encodings,
- # e.g gb18030
-use Encode::JIS2K qw(); # ditto extra japanese encodings
use File::Spec qw();
use HTML::Encoding 0.52 qw();
use HTML::Parser 3.25 qw(); # Need 3.25 for $p->ignore_elements.
@@ -211,7 +208,14 @@ $rsrc{msg}{0} ||=
};
$RSRC = \%rsrc;
-
+eval {
+ local $SIG{__DIE__};
+ require Encode::HanExtra; # for some chinese character encodings, e.g gb18030
+};
+eval {
+ local $SIG{__DIE__};
+ require Encode::JIS2K; # ditto extra japanese encodings
+};
} # end of BEGIN block.
--- validator-0.8.1/htdocs/charset-select.html~ 2007-07-20 04:24:59.000000000 +0300
+++ validator-0.8.1/htdocs/charset-select.html 2007-08-16 17:12:02.000000000 +0300
@@ -25,7 +25,7 @@
<option value="euc-kr">euc-kr (Korean)</option>
<option value="ksc_5601">ksc_5601 (Korean)</option>
<option value="gb2312">gb2312 (Chinese, simplified)</option>
- <option value="gb18030">gb18030 (Chinese, simplified)</option>
+ <!--option value="gb18030">gb18030 (Chinese, simplified)</option-->
<option value="big5">big5 (Chinese, traditional)</option>
<option value="big5-HKSCS">Big5-HKSCS (Chinese, Hong Kong)</option>
<option value="tis-620">tis-620 (Thai)</option>
--- validator-0.8.1/htdocs/config/charset.cfg~ 2007-07-20 05:58:10.000000000 +0300
+++ validator-0.8.1/htdocs/config/charset.cfg 2007-08-16 17:11:35.000000000 +0300
@@ -52,7 +52,7 @@ big5 = 1
big5-hkscs = 1
iso-2022-kr = 1
euc-kr = 1
-gb18030 = 1
+# gb18030 = 1
tis-620 = 1
koi8-r = 1
koi8-u = 1
--- validator-0.8.1/share/templates/en_US/popup_charset.tmpl~ 2007-07-20 04:25:00.000000000 +0300
+++ validator-0.8.1/share/templates/en_US/popup_charset.tmpl 2007-08-16 17:12:18.000000000 +0300
@@ -24,7 +24,7 @@
<option value="iso-2022-jp" <TMPL_IF NAME="override charset iso-2022-jp">selected="selected"</TMPL_IF>>iso-2022-jp (Japanese, email)</option>
<option value="euc-kr" <TMPL_IF NAME="override charset euc-kr">selected="selected"</TMPL_IF>>euc-kr (Korean)</option>
<option value="gb2312" <TMPL_IF NAME="override charset gb2312">selected="selected"</TMPL_IF>>gb2312 (Chinese, simplified)</option>
- <option value="gb18030" <TMPL_IF NAME="override charset gb18030">selected="selected"</TMPL_IF>>gb18030 (Chinese, simplified)</option>
+ <!--option value="gb18030" <TMPL_IF NAME="override charset gb18030">selected="selected"</TMPL_IF>>gb18030 (Chinese, simplified)</option-->
<option value="big5" <TMPL_IF NAME="override charset big5">selected="selected"</TMPL_IF>>big5 (Chinese, traditional)</option>
<option value="big5-HKSCS" <TMPL_IF NAME="override charset big5-HKSCS">selected="selected"</TMPL_IF>>Big5-HKSCS (Chinese, Hong Kong)</option>
<option value="tis-620" <TMPL_IF NAME="override charset tis-620">selected="selected"</TMPL_IF>>tis-620 (Thai)</option>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 5 Jun 2007 17:54:07 -0000 1.8
+++ .cvsignore 16 Aug 2007 14:25:17 -0000 1.9
@@ -1,2 +1,2 @@
-validator-0_8_0b2.tar.gz
-sgml-lib-0_8_0b2.tar.gz
+sgml-lib-0_8_1.tar.gz
+validator-0_8_1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources 5 Jun 2007 17:54:07 -0000 1.8
+++ sources 16 Aug 2007 14:25:17 -0000 1.9
@@ -1,2 +1,2 @@
-7618506f1e04de61f6f3cd6319e8201c validator-0_8_0b2.tar.gz
-0d95dbb4002fe4b6956deacf08570d4e sgml-lib-0_8_0b2.tar.gz
+24e6d1c4473e2f65ee53c1cad809a60c sgml-lib-0_8_1.tar.gz
+ba0893b04da53fea4eabf0b0dbc39151 validator-0_8_1.tar.gz
Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- w3c-markup-validator.spec 5 Jun 2007 17:54:07 -0000 1.15
+++ w3c-markup-validator.spec 16 Aug 2007 14:25:17 -0000 1.16
@@ -1,19 +1,20 @@
%{expand: %%define tbver %(echo %{version} | tr . _)}
Name: w3c-markup-validator
-Version: 0.8.0
-Release: 0.1.b2%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
Summary: W3C Markup Validator
Group: Applications/Internet
-License: W3C License
+License: W3C
URL: http://validator.w3.org/
-Source0: http://validator.w3.org/dist/validator-%{tbver}b2.tar.gz
-Source1: http://validator.w3.org/dist/sgml-lib-%{tbver}b2.tar.gz
+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.8.0b1-syspaths.patch
Patch2: %{name}-0.7.3-html401.patch
Patch3: %{name}-0.7.3-xhtml1.patch
+Patch4: %{name}-0.8.1-extra-encoders.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -37,7 +38,7 @@
%prep
-%setup -q -b 1 -n validator-%{version}b2
+%setup -q -b 1 -n validator-%{version}
rm -rf htdocs/sgml-lib/REC-html401-19991224
rm -rf htdocs/sgml-lib/REC-xhtml1-20020801
mv htdocs/sgml-lib .
@@ -45,6 +46,7 @@
%patch1 -p1
%patch2 -p2
%patch3 -p2
+%patch4 -p1
find . -name "*.orig" -print0 | xargs -0 rm
# Localize configs.
@@ -112,6 +114,7 @@
%defattr(-,root,root,-)
# Configs not "noreplace" are incompatible to some extent between releases
%config %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%dir %{_sysconfdir}/w3c/
%config %{_sysconfdir}/w3c/charset.cfg
%config(noreplace) %{_sysconfdir}/w3c/eref.cfg
%config(noreplace) %{_sysconfdir}/w3c/tidy.conf
@@ -127,6 +130,13 @@
%changelog
+* Fri Aug 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-1
+- 0.8.1.
+- License: W3C
+- Own the %%{_sysconfdir}/w3c directory.
+- Patch to make some Encode::* modules that aren't packaged in Fedora yet
+ optional.
+
* Tue Jun 5 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.1.b2
- 0.8.0b2.
More information about the fedora-extras-commits
mailing list