Add the comps.dtd file to the anaconda package so that some package on
the system is providing it for users.
---
Makefile.am | 3 +++
anaconda.spec.in | 28 ++++++++++++++++++++++++----
comps.dtd | 43 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 70 insertions(+), 4 deletions(-)
create mode 100644 comps.dtd
diff --git a/Makefile.am b/Makefile.am
index 572dfe8..32a7bcd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,9 @@ langdir = $(libdir)/$(PACKAGE_NAME)
lang_DATA = lang-names
dist_lang_DATA = lang-table
+compsdir = $(datadir)/xml/comps/1.0
+dist_comps_DATA = comps.dtd
+
pkgpyexecdir = $(libdir)/$(PACKAGE_NAME)
pkgpythondir = $(libdir)/$(PACKAGE_NAME)
diff --git a/anaconda.spec.in b/anaconda.spec.in
index c802ca7..f119cd0 100644
--- a/anaconda.spec.in
+++ b/anaconda.spec.in
@@ -142,12 +142,17 @@ Requires: dhclient
Requires: dhcpv6-client
Requires: anaconda-yum-plugins
Requires: libselinux-python >= %{libselinuxver}
+Requires: xml-common
+Requires: libxml2
Obsoletes: anaconda-images <= 10
Provides: anaconda-images = %{version}-%{release}
Obsoletes: anaconda-runtime < %{version}-%{release}
Provides: anaconda-runtime = %{version}-%{release}
Obsoletes: booty
+Requires(post): /usr/bin/xmlcatalog
+Requires(postun): /usr/bin/xmlcatalog
+
%description
The anaconda package contains the program which was used to install your
system. These files are of little use on an already installed system.
@@ -173,15 +178,29 @@ desktop-file-install --vendor="" --dir=%{buildroot}%{_datadir}/applications %{bu
%clean
%{__rm} -rf %{buildroot}
-%ifarch %livearches
%post
-update-desktop-database &> /dev/null || :
+CATALOG=%{_sysconfdir}/xml/catalog
+%{_bindir}/xmlcatalog --noout --add "rewriteSystem" \
+ "comps.dtd" \
+ "%{_datadir}/xml/comps/1.0/comps.dtd" $CATALOG
+%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
+ "comps.dtd" \
+ "%{_datadir}/xml/comps/1.0/comps.dtd" $CATALOG
+%ifarch %livearches
+update-desktop-database &> /dev/null
%endif
+|| :
-%ifarch %livearches
%postun
-update-desktop-database &> /dev/null || :
+if [ $1 = 0 ]; then
+ CATALOG=%{_syscondir}/xml/catalog
+ %{_bindir}/xmlcatalog --noout --del \
+ "%{_datadir}/xml/comps/1.0/comps.dtd" $CATALOG
+fi
+%ifarch %livearches
+update-desktop-database &> /dev/null
%endif
+|| :
%files -f %{name}.lang
%defattr(-,root,root)
@@ -202,6 +221,7 @@ update-desktop-database &> /dev/null || :
%{_datadir}/anaconda
%{_prefix}/lib/anaconda
%{_prefix}/lib/anaconda-runtime
+%{_datadir}/xml/comps
%ifarch %livearches
%{_bindir}/liveinst
%{_sbindir}/liveinst
diff --git a/comps.dtd b/comps.dtd
new file mode 100644
index 0000000..92c5ebc
--- /dev/null
+++ b/comps.dtd
@@ -0,0 +1,43 @@
+<?xml encoding="UTF-8"?>
+
+<!ELEMENT comps (group+,category+)>
+<!ATTLIST comps xmlns CDATA #FIXED ''>
+
+<!ELEMENT group (id,name,description,default,uservisible,langonly?, packagelist)>
+<!ATTLIST group xmlns CDATA #FIXED ''>
+
+<!ELEMENT category (id,name,description,display_order?,grouplist)>
+<!ATTLIST category xmlns CDATA #FIXED ''>
+
+<!ELEMENT default (#PCDATA)>
+<!ATTLIST default xmlns CDATA #FIXED ''>
+
+<!ELEMENT uservisible (#PCDATA)>
+<!ATTLIST uservisible xmlns CDATA #FIXED ''>
+
+<!ELEMENT langonly (#PCDATA)>
+<!ATTLIST langonly xmlns CDATA #FIXED ''>
+
+<!ELEMENT packagelist (packagereq)+>
+<!ATTLIST packagelist xmlns CDATA #FIXED ''>
+
+<!ELEMENT display_order (#PCDATA)>
+<!ATTLIST display_order xmlns CDATA #FIXED ''>
+
+<!ELEMENT grouplist (groupid)+>
+<!ATTLIST grouplist xmlns CDATA #FIXED ''>
+
+<!ELEMENT packagereq (#PCDATA)>
+<!ATTLIST packagereq xmlns CDATA #FIXED '' requires NMTOKEN #IMPLIED type NMTOKEN #REQUIRED>
+
+<!ELEMENT groupid (#PCDATA)>
+<!ATTLIST groupid xmlns CDATA #FIXED ''>
+
+<!ELEMENT id (#PCDATA)>
+<!ATTLIST id xmlns CDATA #FIXED ''>
+
+<!ELEMENT name (#PCDATA)>
+<!ATTLIST name xmlns CDATA #FIXED ''>
+
+<!ELEMENT description (#PCDATA)>
+<!ATTLIST description xmlns CDATA #FIXED ''>
--
1.6.3.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
