rpms/w3c-markup-validator/devel w3c-markup-validator-0.8.5-config.patch, NONE, 1.1 w3c-markup-validator-0.8.5-hanextra.patch, NONE, 1.1 w3c-markup-validator-0.8.5-iso-html.patch, NONE, 1.1 w3c-markup-validator-0.8.5-syspaths.patch, NONE, 1.1 w3c-markup-validator-0.8.5-valid-icons.patch, NONE, 1.1 w3c-markup-validator-prepare-tarball.sh, NONE, 1.1 .cvsignore, 1.12, 1.13 sources, 1.12, 1.13 w3c-markup-validator.spec, 1.23, 1.24 w3c-markup-validator-0.7.2-config.patch, 1.1, NONE w3c-markup-validator-0.7.3-html401.patch, 1.1, NONE w3c-markup-validator-0.8.0b1-syspaths.patch, 1.1, NONE w3c-markup-validator-0.8.1-extra-encoders.patch, 1.1, NONE w3c-markup-validator-0.8.4-override.patch, 1.1, NONE w3c-markup-validator-0.8.4-xhtml1.patch, 1.1, NONE
Ville Skyttä
scop at fedoraproject.org
Sun Mar 29 20:04:24 UTC 2009
- Previous message (by thread): rpms/gcompris/F-10 gcompris.spec,1.41,1.42 sources,1.20,1.21
- Next message (by thread): rpms/w3c-markup-validator/F-9 w3c-markup-validator-0.8.5-config.patch, NONE, 1.1 w3c-markup-validator-0.8.5-hanextra.patch, NONE, 1.1 w3c-markup-validator-0.8.5-iso-html.patch, NONE, 1.1 w3c-markup-validator-0.8.5-syspaths.patch, NONE, 1.1 w3c-markup-validator-0.8.5-valid-icons.patch, NONE, 1.1 w3c-markup-validator-prepare-tarball.sh, 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.7.2-config.patch, 1.1, NONE w3c-markup-validator-0.7.3-html401.patch, 1.1, NONE w3c-markup-validator-0.8.0b1-syspaths.patch, 1.1, NONE w3c-markup-validator-0.8.1-extra-encoders.patch, 1.1, NONE 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: scop
Update of /cvs/pkgs/rpms/w3c-markup-validator/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21330
Modified Files:
.cvsignore sources w3c-markup-validator.spec
Added Files:
w3c-markup-validator-0.8.5-config.patch
w3c-markup-validator-0.8.5-hanextra.patch
w3c-markup-validator-0.8.5-iso-html.patch
w3c-markup-validator-0.8.5-syspaths.patch
w3c-markup-validator-0.8.5-valid-icons.patch
w3c-markup-validator-prepare-tarball.sh
Removed Files:
w3c-markup-validator-0.7.2-config.patch
w3c-markup-validator-0.7.3-html401.patch
w3c-markup-validator-0.8.0b1-syspaths.patch
w3c-markup-validator-0.8.1-extra-encoders.patch
w3c-markup-validator-0.8.4-override.patch
w3c-markup-validator-0.8.4-xhtml1.patch
Log Message:
* Sun Mar 29 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-1
- 0.8.5, override patch applied upstream.
- Drop content not acceptable in Fedora (some icons, ISO-HTML DTD).
- Refresh/reorganize patches.
w3c-markup-validator-0.8.5-config.patch:
--- NEW FILE w3c-markup-validator-0.8.5-config.patch ---
--- validator-0.8.5/htdocs/config/validator.conf.config
+++ validator-0.8.5/htdocs/config/validator.conf
@@ -66,16 +66,16 @@ Max Recursion = 0
# 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.8.5-hanextra.patch:
--- NEW FILE w3c-markup-validator-0.8.5-hanextra.patch ---
diff -up validator-0.8.5/htdocs/charset-select.html~ validator-0.8.5/htdocs/charset-select.html
--- validator-0.8.5/htdocs/charset-select.html~ 2007-07-20 04:24:59.000000000 +0300
+++ validator-0.8.5/htdocs/charset-select.html 2009-03-27 23:04:16.000000000 +0200
@@ -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>
diff -up validator-0.8.5/htdocs/config/charset.cfg~ validator-0.8.5/htdocs/config/charset.cfg
--- validator-0.8.5/htdocs/config/charset.cfg~ 2007-07-20 05:58:10.000000000 +0300
+++ validator-0.8.5/htdocs/config/charset.cfg 2009-03-27 23:04:13.000000000 +0200
@@ -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
diff -up validator-0.8.5/httpd/cgi-bin/check~ validator-0.8.5/httpd/cgi-bin/check
--- validator-0.8.5/httpd/cgi-bin/check~ 2009-03-17 20:03:43.000000000 +0200
+++ validator-0.8.5/httpd/cgi-bin/check 2009-03-27 23:03:39.000000000 +0200
@@ -49,8 +49,6 @@ use CGI::Carp qw(carp cr
use Config::General 2.31 qw(); # Need 2.31 for (partial) <msg 0> sanity
use Encode qw();
use Encode::Alias qw();
-use Encode::HanExtra qw(); # for some chinese character encodings,
- # e.g gb18030
use File::Spec::Functions qw(catfile);
use HTML::Encoding 0.52 qw();
use HTML::Parser 3.24 qw(); # Need 3.24 for $p->parse($code_ref)
@@ -224,6 +222,10 @@ $RSRC = \%rsrc;
eval {
local $SIG{__DIE__};
+ require Encode::HanExtra; # for some chinese character encodings, e.g gb18030
+};
+eval {
+ local $SIG{__DIE__};
require Encode::JIS2K; # for optional extra Japanese encodings
};
diff -up validator-0.8.5/share/templates/en_US/popup_charset.tmpl~ validator-0.8.5/share/templates/en_US/popup_charset.tmpl
--- validator-0.8.5/share/templates/en_US/popup_charset.tmpl~ 2007-07-20 04:25:00.000000000 +0300
+++ validator-0.8.5/share/templates/en_US/popup_charset.tmpl 2009-03-27 23:04:11.000000000 +0200
@@ -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>
w3c-markup-validator-0.8.5-iso-html.patch:
--- NEW FILE w3c-markup-validator-0.8.5-iso-html.patch ---
diff -up validator-0.8.5/htdocs/sgml-lib/sgml.soc~ validator-0.8.5/htdocs/sgml-lib/sgml.soc
--- validator-0.8.5/htdocs/sgml-lib/sgml.soc~ 2007-12-06 04:44:45.000000000 +0200
+++ validator-0.8.5/htdocs/sgml-lib/sgml.soc 2009-03-28 00:30:07.000000000 +0200
@@ -52,8 +52,6 @@ PUBLIC "-//W3C//ENTITIES Special//EN//HT
PUBLIC "-//W3C//ENTITIES Symbols//EN//HTML" REC-html401-19991224/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
w3c-markup-validator-0.8.5-syspaths.patch:
--- NEW FILE w3c-markup-validator-0.8.5-syspaths.patch ---
diff -up validator-0.8.0b1/httpd/cgi-bin/check~ validator-0.8.0b1/httpd/cgi-bin/check
--- validator-0.8.5/httpd/cgi-bin/check.syspaths
+++ validator-0.8.5/httpd/cgi-bin/check
@@ -1153,7 +1153,8 @@ sub dtd_validate (\$) {
#
# Parser configuration
- $opensp->search_dirs($CFG->{Paths}->{SGML}->{Library});
+ $opensp->search_dirs($CFG->{Paths}->{SGML}->{Library},
+ '/usr/share/xml', '/usr/share/sgml');
$opensp->catalogs($catalog);
$opensp->show_error_numbers(1);
$opensp->warnings(@spopt);
w3c-markup-validator-0.8.5-valid-icons.patch:
--- NEW FILE w3c-markup-validator-0.8.5-valid-icons.patch ---
diff -up validator-0.8.5/htdocs/config/types.conf~ validator-0.8.5/htdocs/config/types.conf
--- validator-0.8.5/htdocs/config/types.conf~ 2009-02-16 16:11:42.000000000 +0200
+++ validator-0.8.5/htdocs/config/types.conf 2009-03-27 23:24:19.000000000 +0200
@@ -31,8 +31,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html20
ALT URI = http://www.w3.org/Icons/valid-html20-blue
-# Local URI = images/valid_icons/valid-html20
-# Local ALT URI = images/valid_icons/valid-html20-blue
</Badge>
</HTML_2_0>
@@ -49,8 +47,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html20
ALT URI = http://www.w3.org/Icons/valid-html20-blue
- Local URI = images/valid_icons/valid-html20
- Local ALT URI = images/valid_icons/valid-html20-blue
</Badge>
</HTML_2_0_Level_2>
@@ -67,8 +63,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html20
ALT URI = http://www.w3.org/Icons/valid-html20-blue
- Local URI = images/valid_icons/valid-html20
- Local ALT URI = images/valid_icons/valid-html20-blue
</Badge>
</HTML_2_0_Strict>
@@ -85,8 +79,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html20
ALT URI = http://www.w3.org/Icons/valid-html20-blue
- Local URI = images/valid_icons/valid-html20
- Local ALT URI = images/valid_icons/valid-html20-blue
</Badge>
</HTML_2_0_Level_1>
@@ -103,8 +95,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html20
ALT URI = http://www.w3.org/Icons/valid-html20-blue
- Local URI = images/valid_icons/valid-html20
- Local ALT URI = images/valid_icons/valid-html20-blue
</Badge>
</HTML_2_0_Strict_Level_1>
@@ -124,8 +114,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html32
ALT URI = http://www.w3.org/Icons/valid-html32-blue
- Local URI = images/valid_icons/valid-html32
- Local ALT URI = images/valid_icons/valid-html32-blue
Height = 31
Width = 88
</Badge>
@@ -149,8 +137,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html40
ALT URI = http://www.w3.org/Icons/valid-html40-blue
- Local URI = images/valid_icons/valid-html40
- Local ALT URI = images/valid_icons/valid-html40-blue
Height = 31
Width = 88
Alt = Valid HTML 4.0 Strict
@@ -171,8 +157,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html40
ALT URI = http://www.w3.org/Icons/valid-html40-blue
- Local URI = images/valid_icons/valid-html40
- Local ALT URI = images/valid_icons/valid-html40-blue
Height = 31
Width = 88
Alt = Valid HTML 4.0 Transitional
@@ -193,8 +177,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html40
ALT URI = http://www.w3.org/Icons/valid-html40-blue
- Local URI = images/valid_icons/valid-html40
- Local ALT URI = images/valid_icons/valid-html40-blue
Height = 31
Width = 88
Alt = Valid HTML 4.0 Frameset
@@ -215,8 +197,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html401
ALT URI = http://www.w3.org/Icons/valid-html401-blue
- Local URI = images/valid_icons/valid-html401
- Local ALT URI = images/valid_icons/valid-html401-blue
Height = 31
Width = 88
Alt = Valid HTML 4.01 Strict
@@ -237,8 +217,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html401
ALT URI = http://www.w3.org/Icons/valid-html401-blue
- Local URI = images/valid_icons/valid-html401
- Local ALT URI = images/valid_icons/valid-html401-blue
Height = 31
Width = 88
Alt = Valid HTML 4.01 Transitional
@@ -259,8 +237,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-html401
ALT URI = http://www.w3.org/Icons/valid-html401-blue
- Local URI = images/valid_icons/valid-html401
- Local ALT URI = images/valid_icons/valid-html401-blue
Height = 31
Width = 88
Alt = Valid HTML 4.01 Frameset
@@ -280,8 +256,6 @@
# <Badge>
# URI = http://www.w3.org/Icons/valid-html401
# ALT URI = http://www.w3.org/Icons/valid-html401-blue
- # Local URI = images/valid_icons/valid-html401
- # Local ALT URI = images/valid_icons/valid-html401-blue
# Height = 31
# Width = 88
# Alt = Valid HTML 4.01 Frameset
@@ -305,8 +279,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-xhtml10
ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
- Local URI = images/valid_icons/valid-xhtml10
- Local ALT URI = images/valid_icons/valid-xhtml10-blue
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Strict
@@ -329,8 +301,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-xhtml10
ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
- Local URI = images/valid_icons/valid-xhtml10
- Local ALT URI = images/valid_icons/valid-xhtml10-blue
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Transitional
@@ -353,8 +323,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-xhtml10
ALT URI = http://www.w3.org/Icons/valid-xhtml10-blue
- Local URI = images/valid_icons/valid-xhtml10
- Local ALT URI = images/valid_icons/valid-xhtml10-blue
Height = 31
Width = 88
Alt = Valid XHTML 1.0 Frameset
@@ -377,8 +345,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-xhtmlbasic10
ALT URI = http://www.w3.org/Icons/valid-xhtmlbasic10-blue
- Local URI = images/valid_icons/valid-xhtmlbasic10
- Local ALT URI = images/valid_icons/valid-xhtmlbasic10-blue
Height = 31
Width = 88
Alt = Valid XHTML Basic 1.0
@@ -459,8 +425,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-xhtmlprint10
ALT URI = http://www.w3.org/Icons/valid-xhtmlprint10-blue
- Local URI = images/valid_icons/valid-xhtmlprint10
- Local ALT URI = images/valid_icons/valid-xhtmlprint10-blue
Height = 31
Width = 88
Alt = Valid XHTML-Print 1.0
@@ -484,8 +448,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-xhtml11
ALT URI = http://www.w3.org/Icons/valid-xhtml11-blue
- Local URI = images/valid_icons/valid-xhtml11
- Local ALT URI = images/valid_icons/valid-xhtml11-blue
Height = 31
Width = 88
Alt = Valid XHTML 1.1
@@ -516,7 +478,7 @@
</Types>
<Badge>
URI = http://validator.w3.org/images/v15445
- Local URI = http://validator.w3.org/images/v15445
+ Local URI = images/v15445
Alt = Valid ISO/IEC 15445:2000
</Badge>
</ISO_IEC_15445_2000>
@@ -533,7 +495,7 @@
</Types>
<Badge>
URI = http://validator.w3.org/images/v15445
- Local URI = /images/v15445
+ Local URI = images/v15445
Alt = Valid ISO/IEC 15445:2000
</Badge>
</ISO_IEC_15445_2000_MARKUP>
@@ -556,8 +518,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-mathml20
ALT URI = http://www.w3.org/Icons/valid-mathml20-blue
- Local URI = images/valid_icons/valid-mathml20
- Local ALT URI = images/valid_icons/valid-mathml20-blue
Height = 31
Width = 88
Alt = Valid MathML 2.0
@@ -611,8 +571,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-xhtml-rdfa
ALT URI = http://www.w3.org/Icons/valid-xhtml-rdfa-blue
- Local URI = images/valid_icons/valid-xhtml-rdfa
- Local ALT URI = images/valid_icons/valid-xhtml-rdfa-blue
Alt = Valid XHTML + RDFa
RDFa = http://www.w3.org/TR/rdfa-syntax
</Badge>
@@ -638,8 +596,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-svg10
ALT URI = http://www.w3.org/Icons/valid-svg10-blue
- Local URI = images/valid_icons/valid-svg10
- Local ALT URI = images/valid_icons/valid-svg10-blue
Alt = Valid SVG 1.0
</Badge>
</SVG_1_0>
@@ -662,8 +618,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-svg11
ALT URI = http://www.w3.org/Icons/valid-svg11-blue
- Local URI = images/valid_icons/valid-svg11
- Local ALT URI = images/valid_icons/valid-svg11-blue
Alt = Valid SVG 1.1
</Badge>
</SVG_1_1>
@@ -684,8 +638,6 @@
<Badge>
URI = http://www.w3.org/Icons/valid-svgtiny11
ALT URI = http://www.w3.org/Icons/valid-svgtiny11-blue
- Local URI = images/valid_icons/valid-svgtiny11
- Local ALT URI = images/valid_icons/valid-svgtiny11-blue
Alt = Valid SVG 1.1 Tiny
</Badge>
</SVG_1_1_Tiny>
diff -up validator-0.8.5/htdocs/docs/help.html~ validator-0.8.5/htdocs/docs/help.html
--- validator-0.8.5/htdocs/docs/help.html~ 2007-07-06 08:45:50.000000000 +0300
+++ validator-0.8.5/htdocs/docs/help.html 2009-03-27 23:24:23.000000000 +0200
@@ -333,7 +333,7 @@ mailing-list.</p>
<h4 id="icon">"valid" icons</h4>
<h5 id="icon-usage">My document is valid, can I use your "valid" icon?</h5>
<p>
- <img class="inline-badge" src="<!--#echo var="relroot" -->images/valid_icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" />
+ <img class="inline-badge" src="http://www.w3.org/Icons/valid-xhtml10" alt="Valid XHTML 1.0!" height="31" width="88" />
Yes. To show readers that one has taken some care to create an
interoperable Web page, a "W3C valid" badge may be displayed
(here, the "valid XHTML 1.0" badge) <strong>on any page
--- NEW FILE w3c-markup-validator-prepare-tarball.sh ---
#!/bin/bash
# Prune content from upstream tarballs, generate combined one:
# https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00015.html
# https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00020.html
set -e
if [ -z "$1" -o $# -ne 1 ]; then
echo "Usage: $0 <validator-version>"
exit 2
fi
unset CDPATH
tmpdir=
origdir=$(pwd)
version=$1
tbver=${version//./_}
pkg=w3c-markup-validator
url1=http://validator.w3.org/dist/validator-$tbver.tar.gz
url2=http://validator.w3.org/dist/sgml-lib-$tbver.tar.gz
trap cleanup EXIT
cleanup()
{
set +e
[ -z "$tmpdir" -o ! -d "$tmpdir" ] || rm -rf "$tmpdir"
}
tmpdir=$(mktemp -d)
cd $tmpdir
curl -O $url1
curl -O $url2
tar zxf $(basename $url1)
tar zxf $(basename $url2)
rm -r validator-$version/htdocs/sgml-lib/ISO-HTML
rm -r validator-$version/htdocs/images/valid_icons
tar cf $origdir/$pkg-$version.tar validator-$version
lzma -f -v $origdir/$pkg-$version.tar
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 22 Nov 2008 07:27:16 -0000 1.12
+++ .cvsignore 29 Mar 2009 20:03:54 -0000 1.13
@@ -1,2 +1 @@
-sgml-lib-0_8_4.tar.gz
-validator-0_8_4.tar.gz
+w3c-markup-validator-0.8.5.tar.lzma
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 22 Nov 2008 07:27:16 -0000 1.12
+++ sources 29 Mar 2009 20:03:54 -0000 1.13
@@ -1,2 +1 @@
-e333381c7c70db99437a320a9bb2b074 sgml-lib-0_8_4.tar.gz
-9444b3b0a8531bcb9841cfb6b07503d1 validator-0_8_4.tar.gz
+d5f6c1f6fb709a88a90867a00a317886 w3c-markup-validator-0.8.5.tar.lzma
Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- w3c-markup-validator.spec 25 Feb 2009 18:00:52 -0000 1.23
+++ w3c-markup-validator.spec 29 Mar 2009 20:03:54 -0000 1.24
@@ -1,31 +1,31 @@
-%{expand: %%define tbver %(echo %{version} | tr . _)}
-
Name: w3c-markup-validator
-Version: 0.8.4
-Release: 2
+Version: 0.8.5
+Release: 1%{?dist}
Summary: W3C Markup Validator
Group: Applications/Internet
License: W3C
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
+# Source0 created with Source99
+Source0: %{name}-%{version}.tar.lzma
+Source99: %{name}-prepare-tarball.sh
# Not upstreamable
-Patch2: %{name}-0.7.3-html401.patch
+Patch0: %{name}-0.8.5-config.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
-# In upstream post 0.8.4 CVS
-Patch5: %{name}-0.8.4-override.patch
+Patch1: %{name}-0.8.5-syspaths.patch
+# Not upstreamable,
+# https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00015.html
+Patch2: %{name}-0.8.5-valid-icons.patch
+# Not upstreamable,
+# https://www.redhat.com/archives/fedora-legal-list/2009-February/msg00020.html
+Patch3: %{name}-0.8.5-iso-html.patch
+# Not upstreamable, kept until Encode::HanExtra is packaged
+Patch4: %{name}-0.8.5-hanextra.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: %{__perl}
+BuildRequires: lzma
Requires: httpd
Requires: %{name}-libs = %{version}
Requires(hint): perl(HTML::Tidy)
@@ -46,17 +46,20 @@
%prep
-%setup -q -b 1 -n validator-%{version}
+%setup -q -n validator-%{version}
+
+# Remove not needed stuff
rm -r htdocs/sgml-lib/REC-html401-19991224
rm -r htdocs/sgml-lib/REC-xhtml1-20020801
-mv htdocs/sgml-lib .
+rm htdocs/images/markup_validation_service.psd
+
%patch0 -p1
%patch1 -p1
-%patch2 -p2
-%patch3 -p2
+%patch2 -p1
+%patch3 -p1
%patch4 -p1
-%patch5 -p0
-find . -name "*.orig" -print0 | xargs -0 rm
+
+mv htdocs/sgml-lib .
# Localize configs.
%{__perl} -pi -e \
@@ -90,6 +93,9 @@
# SGML library
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/sgml
cp -pR sgml-lib $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}
+ln -s ../html/4.01 $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}/REC-html401-19991224
+ln -s ../../xml/xhtml/1.0 \
+ $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}/REC-xhtml1-20020801
install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml
touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat
@@ -122,9 +128,10 @@
%files
%defattr(-,root,root,-)
# Configs not "noreplace" are incompatible to some extent between releases
-%config %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%dir %{_sysconfdir}/w3c/
-%config %{_sysconfdir}/w3c/charset.cfg
+%config(noreplace) %{_sysconfdir}/w3c/attref.cfg
+%config(noreplace) %{_sysconfdir}/w3c/charset.cfg
%config(noreplace) %{_sysconfdir}/w3c/eref.cfg
%config(noreplace) %{_sysconfdir}/w3c/tidy.conf
%config(noreplace) %{_sysconfdir}/w3c/tips.cfg
@@ -139,6 +146,11 @@
%changelog
+* Sun Mar 29 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.8.5-1
+- 0.8.5, override patch applied upstream.
+- Drop content not acceptable in Fedora (some icons, ISO-HTML DTD).
+- Refresh/reorganize patches.
+
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
--- w3c-markup-validator-0.7.2-config.patch DELETED ---
--- w3c-markup-validator-0.7.3-html401.patch DELETED ---
--- w3c-markup-validator-0.8.0b1-syspaths.patch DELETED ---
--- w3c-markup-validator-0.8.1-extra-encoders.patch DELETED ---
--- w3c-markup-validator-0.8.4-override.patch DELETED ---
--- w3c-markup-validator-0.8.4-xhtml1.patch DELETED ---
- Previous message (by thread): rpms/gcompris/F-10 gcompris.spec,1.41,1.42 sources,1.20,1.21
- Next message (by thread): rpms/w3c-markup-validator/F-9 w3c-markup-validator-0.8.5-config.patch, NONE, 1.1 w3c-markup-validator-0.8.5-hanextra.patch, NONE, 1.1 w3c-markup-validator-0.8.5-iso-html.patch, NONE, 1.1 w3c-markup-validator-0.8.5-syspaths.patch, NONE, 1.1 w3c-markup-validator-0.8.5-valid-icons.patch, NONE, 1.1 w3c-markup-validator-prepare-tarball.sh, 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.7.2-config.patch, 1.1, NONE w3c-markup-validator-0.7.3-html401.patch, 1.1, NONE w3c-markup-validator-0.8.0b1-syspaths.patch, 1.1, NONE w3c-markup-validator-0.8.1-extra-encoders.patch, 1.1, NONE 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
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list