Hello community, here is the log from the commit of package docbook_4 for openSUSE:Factory checked in at 2015-02-22 17:25:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook_4 (Old) and /work/SRC/openSUSE:Factory/.docbook_4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "docbook_4" Changes: -------- --- /work/SRC/openSUSE:Factory/docbook_4/docbook_4.changes 2013-07-22 12:58:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.docbook_4.new/docbook_4.changes 2015-02-22 17:25:07.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 19 09:42:19 UTC 2015 - toms@opensuse.org + +- Fixed subtle XML catalog bug (bsc#918565) +- Renamed docbook_4-README.SuSE -> docbook_4-README.SUSE to + avoid rpmlint warnings + +------------------------------------------------------------------- Old: ---- docbook_4-README.SuSE New: ---- docbook_4-README.SUSE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook_4.spec ++++++ --- /var/tmp/diff_new_pack.afELJm/_old 2015-02-22 17:25:08.000000000 +0100 +++ /var/tmp/diff_new_pack.afELJm/_new 2015-02-22 17:25:08.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package docbook_4 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ Group: Productivity/Publishing/DocBook Version: 4.5 Release: 0 -Source2: docbook_4-README.SuSE +Source2: docbook_4-README.SUSE Source7: CATALOG.docbook_4 # DocBook 4.1 Source410: http://www.oasis-open.org/docbook/sgml/4.1/docbk41.zip @@ -101,7 +101,7 @@ %prep %setup -n %{name} -c -T -cp -p $RPM_SOURCE_DIR/%{name}-README.SuSE README.SuSE +cp -p $RPM_SOURCE_DIR/%{name}-README.SUSE README.SUSE %{INSTALL_DIR} dtd/4.{1,2,3,4,5} 4.{1,2,3,4,5}xml echo "**** %{S:410}" pushd dtd/4.1 @@ -359,10 +359,14 @@ >/dev/null 2>&1 || true done fi -if [ -x /usr/bin/edit-xml-catalog ]; then + +# in case of an update, remove old +if [ "2" = "$1" ]; then /usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --add /etc/xml/%{FOR_ROOT_CAT} + --del %{name}-%{version} || true fi +/usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ + --add /etc/xml/%{FOR_ROOT_CAT} %postun if [ "$1" = "0" -a -x %{regcat} ]; then @@ -372,7 +376,7 @@ done fi # remove entries only on removal of file -if [ ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} -a -x /usr/bin/edit-xml-catalog ] ; then +if [ "0" = "$1" -a ! -f %{xml_sysconf_dir}/%{FOR_ROOT_CAT} ] ; then /usr/bin/edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ --del %{name}-%{version} fi @@ -380,7 +384,7 @@ %files %defattr(-, root, root) %config %{sgml_config_dir}/CATALOG.* -%doc README.SuSE +%doc README.SUSE %{sgml_dir}/CATALOG.* %{sgml_docbook_dtd_dir}/4.1 %{sgml_docbook_dtd_dir}/4.2 ++++++ docbook_4-README.SUSE ++++++ README.SuSE (2005-02-02 13:52:09 CET) ===================================== SGML CATALOG Files ------------------ SGML .... The default CATALOG file for DocBook 4 is /usr/share/sgml/CATALOG.docbook_4; it is valid for DocBook DTD 4.1, 4.2, 4.3, and 4.4. XML ... The name of the SGML CATALOG file for the XML versions are: /usr/share/sgml/CATALOG.db41xml /usr/share/sgml/CATALOG.db42xml /usr/share/sgml/CATALOG.db43xml /usr/share/sgml/CATALOG.db44xml XML CATALOG Files ------------------ XML catalogs are available through /etc/xml/catalog which points to /etc/xml/suse-catalog.xml. -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org