Accepting request 411817 from Publishing

1

OBS-URL: https://build.opensuse.org/request/show/411817
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlcharent?expand=0&rev=19

xmlcharent.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul 18 12:29:42 UTC 2016 - fvogt@suse.com
+
+- Use update-xml-catalog
+
 -------------------------------------------------------------------
 Tue Aug  5 10:48:58 UTC 2014 - rsalevsky@suse.com
 

xmlcharent.spec

@@ -26,10 +26,9 @@ Url:            http://www.oasis-open.org/docbook/xmlcharent/
 Source0:        xmlcharent-0.3.tar.bz2
 Source1:        xmlcharent.xml
 Source2:        xmlcharent.sgml
-Requires:       sgml-skel
-Requires:       xml-group-manager
-BuildRequires:  sgml-skel
-BuildRequires:  xml-group-manager
+Requires:       sgml-skel >= 0.7
+Requires(post): sgml-skel >= 0.7
+Requires(postun): sgml-skel >= 0.7
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -47,19 +46,20 @@ sed 's|__DIR__|%{_datadir}/%{name}|' %{SOURCE2} > xmlcharent.sgml
 %install
 %{__mkdir} -p %{buildroot}%{_datadir}/%{name}/entities/
 %{__install} -m 0664 -D *.ent %{buildroot}%{_datadir}/%{name}/entities/
-%{__install} -m 0644 -D xmlcharent.xml %{buildroot}%{_datadir}/%{name}/%{name}.xml
+%{__install} -m 0644 -D xmlcharent.xml %{buildroot}%{_sysconfdir}/xml/catalog.d/%{name}.xml
 %{__install} -m 0644 -D xmlcharent.sgml %{buildroot}%{_datadir}/%{name}/%{name}.sgml
 
 %post
-xml-group-manager -i %{name} -p "ISO 8879:1986//ENTITIES" -s "http://www.oasis-open.org/docbook/xmlcharent/0.3/" %{_datadir}/%{name}/%{name}.xml
+update-xml-catalog
 sgml-register-catalog -a %{_datadir}/%{name}/%{name}.sgml
 
 %postun
-xml-group-manager -d %{name}
+update-xml-catalog
 sgml-register-catalog -r %{_datadir}/%{name}/%{name}.sgml
 
 %files
 %defattr(-, root, root)
 %{_datadir}/%{name}
+%{_sysconfdir}/xml/catalog.d/%{name}.xml
 
 %changelog