rpms/w3c-markup-validator/devel w3c-markup-validator-0.8.0b1-syspaths.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 w3c-markup-validator.spec, 1.13, 1.14 w3c-markup-validator-0.7.3-syspaths.patch, 1.1, NONE

[Ville Skytta (scop)]

Author: scop

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

Modified Files:
	.cvsignore sources w3c-markup-validator.spec 
Added Files:
	w3c-markup-validator-0.8.0b1-syspaths.patch 
Removed Files:
	w3c-markup-validator-0.7.3-syspaths.patch 
Log Message:
* Sun May 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.1.b1
- 0.8.0b1.


w3c-markup-validator-0.8.0b1-syspaths.patch:

--- NEW FILE w3c-markup-validator-0.8.0b1-syspaths.patch ---
diff -up validator-0.8.0b1/httpd/cgi-bin/check~ validator-0.8.0b1/httpd/cgi-bin/check
--- validator-0.8.0b1/httpd/cgi-bin/check~	2007-05-26 00:37:53.000000000 +0300
+++ validator-0.8.0b1/httpd/cgi-bin/check	2007-05-26 00:39:46.000000000 +0300
@@ -737,7 +737,8 @@ sub parse (\$) {
 
   #
   # 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);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Nov 2006 18:01:57 -0000	1.6
+++ .cvsignore	27 May 2007 20:50:31 -0000	1.7
@@ -1,2 +1,2 @@
-validator-0_7_4.tar.gz
-sgml-lib-0_7_4.tar.gz
+validator-0_8_0b1.tar.gz
+sgml-lib-0_8_0b1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Nov 2006 18:01:57 -0000	1.6
+++ sources	27 May 2007 20:50:31 -0000	1.7
@@ -1,2 +1,2 @@
-e5fbda9e67c6d904fca2b80f7052c1e5  validator-0_7_4.tar.gz
-bb72a0bb7d31b2ceff13ac966a0ff62f  sgml-lib-0_7_4.tar.gz
+f1123c33211bf5fb6a88a6701e936b9f  validator-0_8_0b1.tar.gz
+2847ec1072859264c00733a8fe05629b  sgml-lib-0_8_0b1.tar.gz


Index: w3c-markup-validator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/w3c-markup-validator/devel/w3c-markup-validator.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- w3c-markup-validator.spec	15 Nov 2006 18:01:57 -0000	1.13
+++ w3c-markup-validator.spec	27 May 2007 20:50:31 -0000	1.14
@@ -1,17 +1,17 @@
 %{expand: %%define tbver %(echo %{version} | tr . _)}
 
 Name:           w3c-markup-validator
-Version:        0.7.4
-Release:        1%{?dist}
+Version:        0.8.0
+Release:        0.1.b1%{?dist}
 Summary:        W3C Markup Validator
 
 Group:          Applications/Internet
 License:        W3C License
 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
+Source0:        http://validator.w3.org/dist/validator-%{tbver}b1.tar.gz
+Source1:        http://validator.w3.org/dist/sgml-lib-%{tbver}b1.tar.gz
 Patch0:         %{name}-0.7.2-config.patch
-Patch1:         %{name}-0.7.3-syspaths.patch
+Patch1:         %{name}-0.8.0b1-syspaths.patch
 Patch2:         %{name}-0.7.3-html401.patch
 Patch3:         %{name}-0.7.3-xhtml1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -19,7 +19,6 @@
 BuildArch:      noarch
 BuildRequires:  %{__perl}
 Requires:       httpd
-Requires:       opensp >= 1.5
 Requires:       %{name}-libs = %{version}
 
 %description
@@ -38,23 +37,25 @@
 
 
 %prep
-%setup -q -a 1 -n validator-%{version}
-rm -rf validator-%{version}/htdocs/sgml-lib/REC-html401-19991224
-rm -rf validator-%{version}/htdocs/sgml-lib/REC-xhtml1-20020801
-mv validator-%{version}/htdocs/sgml-lib .
+%setup -q -b 1 -n validator-%{version}b1
+rm -rf htdocs/sgml-lib/REC-html401-19991224
+rm -rf htdocs/sgml-lib/REC-xhtml1-20020801
+mv htdocs/sgml-lib .
 %patch0 -p1
 %patch1 -p1
 %patch2 -p2
 %patch3 -p2
 find . -name "*.orig" -print0 | xargs -0 rm
+rm htdocs/dev/tests/.htaccess
 
 # 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|\$base(_path)?/htdocs/sgml-lib|%{_datadir}/sgml/%{name}|i' \
-  htdocs/config/validator.conf httpd/cgi-bin/check
+  's|\$Base/htdocs/sgml-lib|%{_datadir}/sgml/%{name}| ;
+   s|\$Base/htdocs/config/tidy\.conf|%{_sysconfdir}/w3c/tidy.conf|' \
+  htdocs/config/validator.conf
 
 # Move config out of the way
 mv htdocs/config __config
@@ -110,8 +111,14 @@
 
 %files
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
-%config(noreplace) %{_sysconfdir}/w3c/
+# Configs not "noreplace" are incompatible to some extent between releases
+%config %{_sysconfdir}/httpd/conf.d/%{name}.conf
+%config %{_sysconfdir}/w3c/charset.cfg
+%config(noreplace) %{_sysconfdir}/w3c/eref.cfg
+%config(noreplace) %{_sysconfdir}/w3c/tidy.conf
+%config(noreplace) %{_sysconfdir}/w3c/tips.cfg
+%config %{_sysconfdir}/w3c/types.conf
+%config %{_sysconfdir}/w3c/validator.conf
 %{_datadir}/%{name}/
 
 %files libs
@@ -121,6 +128,9 @@
 
 
 %changelog
+* Sun May 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.1.b1
+- 0.8.0b1.
+
 * Wed Nov 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.7.4-1
 - 0.7.4.
 


--- w3c-markup-validator-0.7.3-syspaths.patch DELETED ---