Hello community,
here is the log from the commit of package xhtml-dtd for openSUSE:Factory
checked in at 2016-07-30 00:27:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xhtml-dtd (Old)
and /work/SRC/openSUSE:Factory/.xhtml-dtd.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xhtml-dtd"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xhtml-dtd/xhtml-dtd.changes 2013-01-22
18:07:51.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.xhtml-dtd.new/xhtml-dtd.changes 2016-07-30
00:27:37.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 25 14:25:53 UTC 2016 - fv...@suse.com
+
+- Use update-xml-catalog
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xhtml-dtd.spec ++++++
--- /var/tmp/diff_new_pack.8HhrvF/_old 2016-07-30 00:27:38.000000000 +0200
+++ /var/tmp/diff_new_pack.8HhrvF/_new 2016-07-30 00:27:38.000000000 +0200
@@ -25,10 +25,12 @@
Release: 0
BuildArch: noarch
Requires: libxml2
-Requires: sgml-skel
+BuildRequires: sgml-skel >= 0.7
+Requires(post): sgml-skel >= 0.7
+Requires(postun): sgml-skel >= 0.7
+Requires: sgml-skel >= 0.7
%define regcat /usr/bin/sgml-register-catalog
PreReq: %{regcat} /usr/bin/xmlcatalog
-PreReq: /usr/bin/edit-xml-catalog
Url: http://www.w3.org/MarkUp/
Source0: http://www.w3.org/Consortium/Legal/copyright-software.html
Source1: http://www.w3.org/TR/xhtml1/xhtml1.tgz
@@ -239,39 +241,10 @@
"file:///usr/share/xml/xhtml/schema/dtd/$version/$file" xhtml.xml
done
rm -f tmp.cat
-%{INSTALL_DIR} $RPM_BUILD_ROOT/etc/xml
-%{INSTALL_DATA} xhtml.xml $RPM_BUILD_ROOT/etc/xml/xhtml.xml
-xmlcatalog --noout --add "system" \
- "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"; \
- "file:///usr/share/xml/xhtml/schema/dtd/1.1/xhtml11.dtd" \
- $RPM_BUILD_ROOT/etc/xml/xhtml.xml
+%{INSTALL_DIR} $RPM_BUILD_ROOT/etc/xml/catalog.d
+%{INSTALL_DATA} xhtml.xml $RPM_BUILD_ROOT/etc/xml/catalog.d/xhtml.xml
+
%define all_cat xhtml-1 xhtml-basic10 xhtml-1-modularization xhtml-1.1
-xmlcatbin=/usr/bin/xmlcatalog
-%define FOR_ROOT_CAT for-catalog-%{name}-%{version}-%{release}.xml
-CATALOG=etc/xml/xhtml.xml
-rm -f %{FOR_ROOT_CAT}.tmp
-$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
-$xmlcatbin --noout --add "delegateSystem" \
- "http://www.w3.org/TR/xhtml"; \
- "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp
-$xmlcatbin --noout --add "delegatePublic" \
- "-//W3C//DTD XHTML" \
- "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp
-$xmlcatbin --noout --add "delegatePublic" \
- "-//W3C//ELEMENTS XHTML" \
- "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp
-$xmlcatbin --noout --add "delegatePublic" \
- "-//W3C//ENTITIES XHTML" \
- "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp
-# Create tag
-sed '/<catalog/a\
- <group id="%{name}-%{version}-%{release}">
-/<\/catalog/i\
- </group>' \
- %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT}
-cat_dir=%{buildroot}/etc/xml
-%{INSTALL_DIR} $cat_dir
-%{INSTALL_DATA} %{FOR_ROOT_CAT} $cat_dir
%post
if [ -x %{regcat} ]; then
@@ -280,8 +253,7 @@
|| %{regcat} -a %{sgml_dir}/CATALOG.$c >/dev/null 2>&1
done
fi
-edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
- --add /etc/xml/%{FOR_ROOT_CAT}
+update-xml-catalog
%postun
if [ "$1" = "0" -a -x %{regcat} ]; then
@@ -289,8 +261,7 @@
%{regcat} -r %{sgml_dir}/CATALOG.$c >/dev/null 2>&1
done
fi
-edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
- --del %{name}-%{version}-%{release}
+update-xml-catalog
%clean
rm -fr $RPM_BUILD_ROOT
@@ -300,7 +271,7 @@
%defattr(-, root, root)
%doc %{_docdir}/%{name}
%config %{sgml_var_dir}/CATALOG.*
-%config /etc/xml/*.xml
+%config /etc/xml/catalog.d/xhtml.xml
%{sgml_dir}/*
%dir %{xml_mod_dir}
%dir %{xml_mod_schema_dir}
