rpms/w3c-markup-validator/devel w3c-markup-validator-0.7.1-cg231.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 w3c-markup-validator.spec, 1.5, 1.6
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Sun Jan 29 18:31:18 UTC 2006
Author: scop
Update of /cvs/extras/rpms/w3c-markup-validator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4055
Modified Files:
.cvsignore sources w3c-markup-validator.spec
Added Files:
w3c-markup-validator-0.7.1-cg231.patch
Log Message:
(build still disabled)
* Sun Jan 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-1
- Require opensp >= 1.5, not openjade.
- Patch to work with Config::General 2.31.
* Sat Oct 8 2005 Ville Skyttä <ville.skytta at iki.fi>
- 0.7.1.
* Fri Sep 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-1
- 0.7.0.
w3c-markup-validator-0.7.1-cg231.patch:
--- NEW FILE w3c-markup-validator-0.7.1-cg231.patch ---
--- validator/httpd/cgi-bin/check 2005/10/13 05:35:17 1.432.2.5
+++ validator/httpd/cgi-bin/check 2006/01/26 20:21:41 1.432.2.6
@@ -306,9 +306,17 @@
$File->{H} = $H;
# Read friendly error message file
-my $error_messages_list = File::Spec->catfile($CFG->{Paths}->{Templates}, $lang, 'error_messages.cfg');
-my %config_opts = (-ConfigFile => $error_messages_list);
-my %rsrc = Config::General->new(%config_opts)->getall();
+my %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;
$T->param(cfg_home_page => $CFG->{'Home Page'});
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 05:31:31 -0000 1.2
+++ .cvsignore 29 Jan 2006 18:31:17 -0000 1.3
@@ -1,2 +1,2 @@
-sgml-lib-0_6_7.tar.gz
-validator-0_6_7.tar.gz
+sgml-lib-0_7_1.tar.gz
+validator-0_7_1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 05:31:31 -0000 1.2
+++ sources 29 Jan 2006 18:31:17 -0000 1.3
@@ -1,2 +1,2 @@
-db6088a83583a33b902d52c2d499acea sgml-lib-0_6_7.tar.gz
-5322f884eb75ddb7b27e56154d74452f validator-0_6_7.tar.gz
+9bb2e4a04730dec300922bd9a92b622e sgml-lib-0_7_1.tar.gz
+c4336201cf8ea48fce809d716bdc0d9d validator-0_7_1.tar.gz
Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- w3c-markup-validator.spec 10 Jun 2005 06:37:45 -0000 1.5
+++ w3c-markup-validator.spec 29 Jan 2006 18:31:17 -0000 1.6
@@ -1,19 +1,23 @@
-Name: w3c-markup-validator
-Version: 0.6.7
-Release: 2
+%{expand: %%define tbver %(echo %{version} | tr . _)}
+Name: w3c-markup-validator
+Version: 0.7.1
+Release: 1
Summary: W3C Markup Validator
Group: Applications/Internet
License: W3C Software License
URL: http://validator.w3.org/
-Source0: http://validator.w3.org/dist/validator-0_6_7.tar.gz
-Source1: http://validator.w3.org/dist/sgml-lib-0_6_7.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.1-cg231.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: perl
-Requires: httpd, openjade >= 1.3.2, %{name}-libs = %{version}
+BuildRequires: %{__perl}
+Requires: httpd
+Requires: opensp >= 1.5
+Requires: %{name}-libs = %{version}
Obsoletes: w3c-validator
%description
@@ -50,56 +54,42 @@
%setup -q -a 1 -n validator-%{version}
mv validator-%{version}/htdocs/sgml-lib .
+%patch0 -p1
-# Localize config files
-perl -pi -e \
- 's|\bwww-validator\@w3\.org\b|root\@localhost| ;
- s|/validator\.w3\.org/|/localhost/%{name}/| ;
- s|/usr/local/validator/htdocs/config/|%{_sysconfdir}/w3c/| ;
- s|/usr/local/validator/htdocs/|%{_datadir}/%{name}/| ;
- s|^(SGML\s+Library\s+).*|${1}%{_datadir}/sgml/%{name}|' \
+# 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/|' \
htdocs/config/validator.conf
-perl -pi -e \
- 's|/usr/share/w3c-markup-validator|%{_datadir}/%{name}|g' \
- httpd/conf/httpd.conf
-
-# Cleanup of unused files
-rm -f htdocs/config/verbosemsg.rc
# Move config out of the way
mv htdocs/config __config
-# Fixup permissions
-find . -type d | xargs chmod 755
-find . -type f | xargs chmod 644
-chmod 755 httpd/cgi-bin/check
-
%build
-# Not
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -pm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
-
-# Script
-cp -p httpd/cgi-bin/check $RPM_BUILD_ROOT%{_datadir}/%{name}
# Config files
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/w3c
-cp -p __config/* $RPM_BUILD_ROOT%{_sysconfdir}/w3c
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-cp -p httpd/conf/httpd.conf \
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/w3c
+install -pm 644 __config/* $RPM_BUILD_ROOT%{_sysconfdir}/w3c
+install -Dpm 644 httpd/conf/httpd.conf \
$RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/%{name}.conf
-# HTML and stuff
-cp -pR htdocs/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+# Scripts, HTML, etc.
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
+cp -pR httpd/cgi-bin htdocs share $RPM_BUILD_ROOT%{_datadir}/%{name}
# SGML library
-mkdir -pm 755 $RPM_BUILD_ROOT%{_datadir}/sgml
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/sgml
cp -pR sgml-lib $RPM_BUILD_ROOT%{_datadir}/sgml/%{name}
-mkdir -pm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/sgml
touch $RPM_BUILD_ROOT%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat
@@ -108,22 +98,20 @@
%post
-if [ $1 -eq 1 ] ; then
- %{_initrddir}/httpd reload &>/dev/null || :
-fi
+[ $1 -eq 1 ] && %{_initrddir}/httpd reload &>/dev/null || :
%postun
%{_initrddir}/httpd reload &>/dev/null || :
%post libs
-for catalog in "mathml.soc sgml.soc svg.soc xhtml.soc xml.soc"; do
+for catalog in sgml.soc xml.soc ; do
install-catalog --add \
%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
%{_datadir}/sgml/%{name}/$catalog >/dev/null 2>&1 || :
done
%preun libs
-for catalog in "mathml.soc sgml.soc svg.soc xhtml.soc xml.soc"; do
+for catalog in sgml.soc xml.soc ; do
install-catalog --remove \
%{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat \
%{_datadir}/sgml/%{name}/$catalog >/dev/null 2>&1 || :
@@ -132,18 +120,29 @@
%files
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%config(noreplace) %{_sysconfdir}/w3c
-%{_datadir}/%{name}
+# Configs not "noreplace", they're incompatible in 0.6.7 vs 0.7.x.
+%config %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config %{_sysconfdir}/w3c/
+%{_datadir}/%{name}/
%files libs
%defattr(-,root,root,-)
%ghost %config %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.cat
-%{_datadir}/sgml/%{name}
+%{_datadir}/sgml/%{name}/
%changelog
-* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Sun Jan 29 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-1
+- Require opensp >= 1.5, not openjade.
+- Patch to work with Config::General 2.31.
+
+* Sat Oct 8 2005 Ville Skyttä <ville.skytta at iki.fi>
+- 0.7.1.
+
+* Fri Sep 23 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-1
+- 0.7.0.
+
+* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.6.7-2
- rebuilt
* Sun Jul 25 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:0.6.7-0.fdr.1
More information about the fedora-extras-commits
mailing list