packages: xhtml-dtd11-xml/xhtml-dtd11-xml.spec - packaged xhtml-modularizat...

Mon Feb 8 16:05:04 CET 2010

Author: sparky                       Date: Mon Feb  8 15:05:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- packaged xhtml-modularization and xhtml-ruby-1.mod as part of this spec
  (non-flat dtd works now)
- packaged centralized sgml catalog as %ghost
- use macros for most paths

---- Files affected:
packages/xhtml-dtd11-xml:
   xhtml-dtd11-xml.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/xhtml-dtd11-xml/xhtml-dtd11-xml.spec
diff -u packages/xhtml-dtd11-xml/xhtml-dtd11-xml.spec:1.2 packages/xhtml-dtd11-xml/xhtml-dtd11-xml.spec:1.3

--- packages/xhtml-dtd11-xml/xhtml-dtd11-xml.spec:1.2	Mon Feb  8 01:34:43 2010
+++ packages/xhtml-dtd11-xml/xhtml-dtd11-xml.spec	Mon Feb  8 16:04:56 2010
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
-#  - xhtml11.dtd requires http://www.w3.org/TR/xhtml-modularization/
-#    to work, should those modules be included here or as separate spec ?
+# - maybe separate xhtml-modularization
 %define		major	1
 %define		minor	1
 %define		micro	%{nil}
@@ -14,29 +13,40 @@
 %define		ver	%{major}%{minor}%{micro}
 %define		v_er	%{major}.%{minor}%{micro}
 %define		v__er	%{major}\.%{minor}%{micro}
+
+%define		xhtmlver	%{year}%{month}%{day}
+%define		modver	20081008
+%define		rubyver	20010531
+
 Summary:	XHTML %{v_er}
 Summary(pl.UTF-8):	XHTML %{v_er}
 Name:		xhtml-dtd%{ver}-xml
-Version:	%{year}%{month}%{day}
-Release:	0.1
+Version:	%{xhtmlver}
+Release:	1
 Group:		Applications/Publishing/SGML
 License:	W3C
 Vendor:		W3C
-Source0:	http://www.w3.org/TR/%{year}/%{type}-xhtml%{mver}-%{version}/xhtml%{mver}.tgz
+Source0:	http://www.w3.org/TR/%{year}/%{type}-xhtml%{mver}-%{xhtmlver}/xhtml%{mver}.tgz
 # Source0-md5:	00c3fe896f3d29419dbda4186aa98fe1
+Source1:	http://www.w3.org/TR/2008/REC-xhtml-modularization-%{modver}/xhtml-modularization.tgz
+# Source1-md5:	404429a5aae9c60382569d4d1b67acc0
+Source2:	http://www.w3.org/TR/2001/REC-ruby-%{rubyver}/xhtml-ruby-1.mod
+# Source2-md5:	0ea30a78a115139d3dde421227a54b24
 URL:		http://www.w3.org/TR/xhtml11/
 BuildRequires:	libxml2-progs
-Requires:	sgml-common >= 0.6.3-5
-Requires:	sgmlparser
 Requires(post):	/usr/bin/xmlcatalog
 Requires(post):	sgml-common >= 0.5
 Requires(preun):	/usr/bin/xmlcatalog
 Requires(preun):	sgml-common >= 0.5
+Requires:	sgml-common >= 0.6.3-5
+Requires:	sgmlparser
 AutoReqProv:	no
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		catalog		%{_datadir}/sgml/html/xml-dtd-%{v_er}/xmlcatalog-%{v_er}-%{version}-%{release}
+%define		dtddir		%{_datadir}/sgml/html/xml-dtd-%{v_er}
+%define		catalog		%{dtddir}/xmlcatalog-%{v_er}-%{version}-%{release}
+%define		ccatalog	%{_sysconfdir}/sgml/xhtml-%{v_er}-%{version}-%{release}.cat
 
 %description
 XHTML 1.1 specification (with DTD, needed to parse XHTML 1.1 code).
@@ -46,36 +56,48 @@
 poprawności kodu XHTML 1.1).
 
 %prep
-%setup -q -n xhtml%{mver}-%{version}
+%setup -q -a1 -n xhtml%{mver}-%{xhtmlver}
 rm DTD/VERSION
+rm DTD/xml*.dcl
+rm xhtml-modularization-%{modver}/DTD/VERSION
+rm -r xhtml-modularization-%{modver}/DTD/{examples,templates}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/sgml/html/xml-dtd-%{v_er}
+install -d $RPM_BUILD_ROOT{%{dtddir},%{_sysconfdir}/sgml}
 
 xmlcatalog --noout --create $RPM_BUILD_ROOT%{catalog}
 xmlcatalog --noout --add rewriteSystem \
 	'http://www.w3.org/TR/xhtml11/DTD/' \
-	'/usr/share/sgml/html/xml-dtd-%{v_er}/' \
+	'%{dtddir}/' \
 	$RPM_BUILD_ROOT%{catalog}
-xmlcatalog --noout -add public \
-	"-//W3C//DTD XHTML 1.1//EN" \
-	xhtml11.dtd \
+xmlcatalog --noout --add rewriteSystem \
+	'http://www.w3.org/TR/xhtml-modularization/DTD/' \
+	'%{dtddir}/' \
+	$RPM_BUILD_ROOT%{catalog}
+xmlcatalog --noout --add rewriteSystem \
+	'http://www.w3.org/TR/ruby/' \
+	'%{dtddir}/' \
 	$RPM_BUILD_ROOT%{catalog}
 xmlcatalog --noout -add public \
-	"-//W3C//DTD XHTML 1.1//EN" \
-	xhtml11-flat.dtd \
+	'-//W3C//DTD XHTML 1.1//EN' \
+	'xhtml11.dtd' \
 	$RPM_BUILD_ROOT%{catalog}
 
-install DTD/* $RPM_BUILD_ROOT%{_datadir}/sgml/html/xml-dtd-%{v_er}
+install DTD/* xhtml-modularization-%{modver}/DTD/* %{SOURCE2} \
+	$RPM_BUILD_ROOT%{dtddir}
+
+touch $RPM_BUILD_ROOT%{ccatalog}
 
 %post
-/usr/bin/install-catalog --add /etc/sgml/xhtml-%{v_er}-%{version}-%{release}.cat /usr/share/sgml/html/xml-dtd-%{v_er}/xhtml11.cat > /dev/null
-/usr/bin/xmlcatalog --noout --add nextCatalog xhtml %{catalog} /etc/xml/catalog
+%{_bindir}/install-catalog --add %{ccatalog} %{dtddir}/xhtml11.cat > /dev/null
+%{_bindir}/install-catalog --add %{ccatalog} %{dtddir}/xhtml.cat > /dev/null
+%{_bindir}/xmlcatalog --noout --add nextCatalog xhtml %{catalog} %{_sysconfdir}/xml/catalog
 
 %preun
-/usr/bin/install-catalog --remove /etc/sgml/xhtml-%{v_er}-%{version}-%{release}.cat /usr/share/sgml/html/xml-dtd-%{v_er}/xhtml11.cat > /dev/null
-/usr/bin/xmlcatalog --noout --del %{catalog} /etc/xml/catalog
+%{_bindir}/install-catalog --remove %{ccatalog} %{dtddir}/xhtml11.cat > /dev/null
+%{_bindir}/install-catalog --remove %{ccatalog} %{dtddir}/xhtml.cat > /dev/null
+%{_bindir}/xmlcatalog --noout --del %{catalog} %{_sysconfdir}/xml/catalog
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,7 +105,8 @@
 %files
 %defattr(644,root,root,755)
 %doc xhtml11.pdf
-%{_datadir}/sgml/html/*
+%ghost %{ccatalog}
+%{_datadir}/sgml/html/xml-dtd-%{v_er}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -91,6 +114,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/02/08 15:04:56  sparky
+- packaged xhtml-modularization and xhtml-ruby-1.mod as part of this spec
+  (non-flat dtd works now)
+- packaged centralized sgml catalog as %ghost
+- use macros for most paths
+
 Revision 1.2  2010/02/08 00:34:43  sparky
 - added TODO: modules required for xhtml11.dtd; flat version works as expected
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xhtml-dtd11-xml/xhtml-dtd11-xml.spec?r1=1.2&r2=1.3&f=u

