Hello community, here is the log from the commit of package docbook5-xsl-stylesheets for openSUSE:Factory checked in at 2016-07-28 23:44:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook5-xsl-stylesheets (Old) and /work/SRC/openSUSE:Factory/.docbook5-xsl-stylesheets.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook5-xsl-stylesheets" Changes: -------- --- /work/SRC/openSUSE:Factory/docbook5-xsl-stylesheets/docbook5-xsl-stylesheets.changes 2016-01-08 15:23:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.docbook5-xsl-stylesheets.new/docbook5-xsl-stylesheets.changes 2016-07-28 23:44:47.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jul 25 08:44:32 UTC 2016 - fv...@suse.com + +- Change catalog entry for consistency with docbook-xsl-stylesheets + +------------------------------------------------------------------- +Wed Jul 20 12:54:03 UTC 2016 - fv...@suse.com + +- Use update-xml-catalog + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook5-xsl-stylesheets.spec ++++++ --- /var/tmp/diff_new_pack.vZRbSe/_old 2016-07-28 23:44:48.000000000 +0200 +++ /var/tmp/diff_new_pack.vZRbSe/_new 2016-07-28 23:44:48.000000000 +0200 @@ -27,12 +27,14 @@ License: SUSE-Docbook-XSL and Apache-2.0 and MIT and EPL-1.0 and MPL-1.1 and BSD-3-Clause and HPND and Zlib and LGPL-2.1+ Group: Productivity/Publishing/DocBook BuildRequires: fdupes -BuildRequires: sgml-skel +BuildRequires: sgml-skel >= 0.7 BuildRequires: unzip BuildArch: noarch Requires: docbook_5 Requires: xmlcharent -Requires(pre): sgml-skel %{_bindir}/xmlcatalog +Requires(pre): sgml-skel >= 0.7 +Requires(post): sgml-skel >= 0.7 +Requires: sgml-skel >= 0.7 Version: 1.79.0 Release: 0 Source0: http://sourceforge.net/projects/docbook/files/docbook-xsl-ns/%{version}/docbook-xsl-ns-%{version}.tar.bz2 @@ -66,7 +68,7 @@ # # -# /etc/xml/docbook-xsl-stylesheets.xml +# /etc/xml/catalog/docbook5-xsl-stylesheets.xml # %{xmlcatalog} --noout --create %{dbstyle_catalog} %{xmlcatalog} --noout --add "rewriteSystem" \ @@ -77,21 +79,10 @@ "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} %{xmlcatalog} --noout --add "rewriteSystem" \ "http://docbook.sourceforge.net/release/xsl-ns/current" \ - "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} + "file://%{dbstyle_dir}/current" %{dbstyle_catalog} %{xmlcatalog} --noout --add "rewriteURI" \ "http://docbook.sourceforge.net/release/xsl-ns/current" \ - "file://%{dbstyle_dir}/%{version}" %{dbstyle_catalog} - -# -# temporary file that is added to /etc/xml/suse-catalog.xml -# during post -# -%{xmlcatalog} --noout --create %{dbstyle_catalog_entry} -%{xmlcatalog} --noout --add "delegateSystem" \ - "http://docbook.sourceforge.net/release/xsl-ns/" \ - "file:///etc/xml/%{dbstyle_catalog}" %{dbstyle_catalog_entry} -%__sed -i -e '/<catalog/a\ <group id="%{name}">' \ - -e '/<\/catalog/i\ </group>' %{dbstyle_catalog_entry} + "file://%{dbstyle_dir}/current" %{dbstyle_catalog} #-------------------------------------------------------------------------- %install @@ -128,10 +119,9 @@ popd >/dev/null fi -# install the catalog files -# -%__install -m644 %{dbstyle_catalog} %{buildroot}%{_sysconfdir}/xml -%__install -m644 %{dbstyle_catalog_entry} %{buildroot}%{_sysconfdir}/xml +# install the catalog file +mkdir -p %{buildroot}%{_sysconfdir}/xml/catalog.d/ # It should exist, but it doesn't... +%__install -D -m644 %{dbstyle_catalog} %{buildroot}%{_sysconfdir}/xml/catalog.d/ # the docs come last # @@ -139,36 +129,11 @@ %fdupes -s %{buildroot} -#-------------------------------------------------------------------------- %post -# -# XML Catalog entries for daps profiling -# -# remove existing entries first (if existing) - needed for -# zypper in, since it does not call postun -# -# in case of an update, remove old -if [ "2" = "$1" ]; then -%{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name} -fi -# ... and (re)add it again -%{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} \ - --add %{_sysconfdir}/xml/%{dbstyle_catalog_entry} +update-xml-catalog -exit 0 - -#-------------------------------------------------------------------------- %postun -# -# delete catalog entry for daps profiling -# only run if package is really uninstalled ($1 = 0) and not -# in case of an update -# -if [ "0" = "$1" ]; then - %{_bindir}/edit-xml-catalog --group --catalog %{suse_catalog} --del %{name} -fi - -exit 0 +update-xml-catalog #-------------------------------------------------------------------------- %files @@ -181,7 +146,7 @@ %exclude %{dbstyle_dir}/%{version}/slides/slidy/.htaccess %exclude %{dbstyle_dir}/%{version}/slides/slidy/*/.htaccess -%config %{_sysconfdir}/xml/*.xml +%config %{_sysconfdir}/xml/catalog.d/*.xml %doc BUGS NEWS README RELEASE-NOTES.txt TODO