Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package docbook-simple for openSUSE:Factory checked in at 2021-06-09 21:52:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook-simple (Old) and /work/SRC/openSUSE:Factory/.docbook-simple.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook-simple" Wed Jun 9 21:52:56 2021 rev:20 rq:898666 version:1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/docbook-simple/docbook-simple.changes 2013-03-13 07:32:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.docbook-simple.new.32437/docbook-simple.changes 2021-06-09 21:53:20.142585282 +0200 @@ -1,0 +2,6 @@ +Tue Jun 8 16:19:07 UTC 2021 - Ferdinand Thiessen <[email protected]> + +- Update to docbook-simple version 1.1 + * customization of xml/4.3 + +------------------------------------------------------------------- Old: ---- CATALOG.docbook-simple-1.0 docbook-simple-1.0.zip New: ---- docbook-simple-1.1.cat docbook-simple-1.1.xml docbook-simple-1.1.zip ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook-simple.spec ++++++ --- /var/tmp/diff_new_pack.NihEkw/_old 2021-06-09 21:53:20.586586073 +0200 +++ /var/tmp/diff_new_pack.NihEkw/_new 2021-06-09 21:53:20.586586073 +0200 @@ -1,7 +1,7 @@ # # spec file for package docbook-simple # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,158 +12,99 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: docbook-simple -BuildRequires: libxml2-tools -BuildRequires: sgml-skel BuildRequires: unzip Summary: Simple DocBook DTD and Documentation License: HPND Group: Productivity/Publishing/DocBook -Version: 1.0 +Version: 1.1 Release: 0 BuildArch: noarch Requires: libxml2-tools Requires: sgml-skel -%define regcat /usr/bin/sgml-register-catalog -PreReq: %{regcat} /usr/bin/xmlcatalog /usr/bin/edit-xml-catalog -PreReq: sed grep awk -#Provides: -Url: http://www.oasis-open.org/docbook/xml/simple/ -Source0: docbook-simple-1.0.zip -Source1: CATALOG.docbook-simple-1.0 -#Patch: -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires(post): /usr/bin/install-catalog +Requires(post): /usr/bin/xmlcatalog +Requires(postun): /usr/bin/xmlcatalog +URL: https://www.oasis-open.org/docbook/xml/simple/ +Source0: https://www.oasis-open.org/docbook/xml/simple/%{version}/docbook-simple-%{version}.zip +Source1: %{name}-%{version}.cat +Source2: %{name}-%{version}.xml %description This package contains the Simple DocBook DTD. -%define INSTALL install -m755 -s -%define INSTALL_DIR install -d -m755 -%define INSTALL_DATA install -m644 -%define INSTALL_SCRIPT install -m755 -o root -g root -%define sgml_dir %{_datadir}/sgml -%define sgml_var_dir /var/lib/sgml -%define sgml_mod_dir %{sgml_dir}/docbook -%define sgml_mod_dtd_dir %{sgml_mod_dir}/dtd -%define sgml_mod_custom_dir %{sgml_mod_dir}/custom -%define sgml_mod_style_dir %{sgml_mod_dir}/stylesheet %define xml_dir %{_datadir}/xml -%define xml_mod_dir %{xml_dir}/docbook/custom/simple/%{version} -%define xml_mod_dtd_dir %{xml_mod_dir}/schema/dtd -%define xml_mod_custom_dir %{xml_mod_dir}/custom -%define xml_mod_style_dir %{xml_mod_dir}/stylesheet -%define xml_mod_style_prod_dir %{xml_mod_style_dir} -%define sgml_config_dir /var/lib/sgml +%define sgml_dir %{_datadir}/sgml +%define xml_mod_root %{xml_dir}/docbook/simple +%define xml_mod_dir %{xml_mod_root}/%{version} %define sgml_sysconf_dir %{_sysconfdir}/sgml -%define xml_config_dir /var/lib/xml %define xml_sysconf_dir %{_sysconfdir}/xml +%define xml_catalog %{xml_sysconf_dir}/catalog +%define sgml_catalog %{sgml_sysconf_dir}/catalog %prep -echo $RPM_BUILD_ROOT -%setup -c -T -sed 's|@VERSION@|%{version}| -s|@DIR@|%{xml_mod_dtd_dir}|' %{S:1} > CATALOG.%{name}-%{version} -unzip -q -a %{S:0} -find -type d | xargs chmod 755 -find -type f | xargs chmod 644 +%setup -q -c -n %{version} +sed 's|@XML_DTD_DIR@|%{xml_mod_dir}|' %{SOURCE1} > $(basename %{SOURCE1}) +sed 's|@XML_DTD_DIR@|%{xml_mod_dir}|' %{SOURCE2} > $(basename %{SOURCE2}) +# make sure everything is readable +chmod a+r * %build -# echo -ne 'PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.0//EN" "sdocbook.dtd"\n'\ -# 'SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd"; "sdocbook.dtd"' >catalog -# sed -e 's:\ \"\([-a-zA-Z0-9]*\.\(ent\|dtd\|dcl\|mod\)\)\"$: \"%{sgml_inst_dir}/\1\":g' \ -# catalog > CATALOG.%{name}-%{version} -xmlcatbin=/usr/bin/xmlcatalog -CATALOG=docbook-simple.xml -# etc/xml/%{name}.xml -# create the catalogs root and docbook specific -$xmlcatbin --noout --create $CATALOG -$xmlcatbin --noout --add "public" \ - "-//OASIS//DTD Simplified DocBook XML V1.0//EN" \ - "file://%{xml_mod_dtd_dir}/sdocbook.dtd" $CATALOG -$xmlcatbin --noout --add "system" \ - "http://www.oasis-open.org/docbook/xml/simple/1.0/sdocbook.dtd"; \ - "file://%{xml_mod_dtd_dir}/sdocbook.dtd" $CATALOG -%define FOR_ROOT_CAT for-catalog-%{name}-%{version}.xml -CATALOG=etc/xml/$CATALOG -rm -f %{FOR_ROOT_CAT}.tmp -$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp -$xmlcatbin --noout --add "delegateSystem" \ - "http://www.oasis-open.org/docbook/xml/simple/"; \ - "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp -$xmlcatbin --noout --add "delegatePublic" \ - "-//OASIS//DTD Simplified DocBook XML" \ - "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp -# Create tag -sed '/<catalog/a\ - <group id="%{name}-%{version}"> -/<\/catalog/i\ - </group>' \ - %{FOR_ROOT_CAT}.tmp > %{FOR_ROOT_CAT} +# nothing to build %install -%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_dir} \ - $RPM_BUILD_ROOT%{xml_mod_dtd_dir} \ - $RPM_BUILD_ROOT%{sgml_var_dir} \ - $RPM_BUILD_ROOT%{_docdir}/%{name} -cp -a [a-su-z][!C]* $RPM_BUILD_ROOT%{xml_mod_dtd_dir} -%{INSTALL_DATA} CATALOG.* $RPM_BUILD_ROOT%{sgml_var_dir} -# sgml2xmlcat.sh -i catalog -l -s %{buildroot}/usr/share/sgml \ -# -p %{inst_name} -pushd $RPM_BUILD_ROOT - for c in var/lib/sgml/CATALOG.*; do - rm -f %{buildroot}%{sgml_dir}/${c##*/} && ln -sf /$c %{buildroot}%{sgml_dir}/${c##*/} - done -popd -# pushd $RPM_BUILD_ROOT%{sgml_dir} -# for c in ../../../var/lib/sgml/CATALOG.*; do -# rm -f ${c##*/} && ln -sf $c ${c##*/} -# done -# popd -# sgml2xmlcat.sh -i CATALOG.%{name}-%{version} -c %{name}.xml -cat_dir=%{buildroot}/etc/xml -%{INSTALL_DIR} $cat_dir -# %{INSTALL_DATA} %{name}.xml $RPM_BUILD_ROOT/etc/xml/%{name}.xml -%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir -%define all_cat %{name}-%{version} +# install versioned directory of dtd files +mkdir -p %{buildroot}%{xml_mod_dir} +cp -a *.{css,dtd,mod} %{buildroot}%{xml_mod_dir} +# install package catalogs +mkdir -p %{buildroot}%{sgml_dir} +mkdir -p %{buildroot}%{xml_mod_dir} +install -p -m 644 "$(basename %{SOURCE1})" %{buildroot}%{sgml_dir} +install -p -m 644 "$(basename %{SOURCE2})" %{buildroot}%{xml_mod_root} %post -if [ -x %{regcat} ]; then - for c in %{all_cat}; do - grep -q -e "%{sgml_dir}/CATALOG.$c\\>" /etc/sgml/catalog \ - || %{regcat} -a %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 - done +# SGML catalog registration +if [ -w %{sgml_catalog} ]; then + install-catalog --add \ + "%{sgml_dir}/%{name}-%{version}.cat" \ + "%{sgml_catalog}" 1>/dev/null +# Workaround bug in install-catalog (from Fedora) + sed -i '/^CATALOG.*log\"$/d' %{sgml_dir}/%{name}-%{version}.cat + sed -i '/^CATALOG.*log$/d' %{sgml_dir}/%{name}-%{version}.cat +fi +# XML catalog registration +if [ -w %{xml_catalog} ]; then + xmlcatalog --noout --add "delegatePublic" \ + "-//OASIS//DTD Simplified" \ + "file://%{xml_mod_dir}/%{name}-%{version}.xml" %{xml_catalog} + xmlcatalog --noout --add "delegateURI" \ + "http://www.oasis-open.org/docbook/xml/simple/1.1/"; \ + "file://%{xml_mod_dir}/%{name}-%{version}.xml" %{xml_catalog} +# Some resolvers misinterpret uri entries + xmlcatalog --noout --add "delegateSystem" \ + "http://www.oasis-open.org/docbook/xml/simple/1.1/"; \ + "file://%{xml_mod_dir}/%{name}-%{version}.xml" %{xml_catalog} fi -edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --add /etc/xml/%{FOR_ROOT_CAT} %postun -if [ "$1" = "0" -a -x %{regcat} ]; then - for c in %{all_cat}; do - %{regcat} -r %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 - 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 - edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \ - --del %{name}-%{version} +if [ "$1" = 0 ]; then + xmlcatalog --sgml --noout --del \ + %{sgml_catalog} \ + %{sgml_dir}/%{name}-%{version}.cat + + xmlcatalog --noout --del \ + "file://%{xml_mod_dir}/%{name}-%{version}.xml" \ + %{xml_catalog} fi -exit 0 %files -%defattr(-, root, root) -# %doc copyright-software.html -%config %{sgml_var_dir}/CATALOG.* -%config %{_sysconfdir}/xml/%{name}.xml -%config %{_sysconfdir}/xml/%{FOR_ROOT_CAT} -%{sgml_dir}/CATALOG.* -%{xml_mod_dtd_dir} -%dir %{xml_dir}/docbook/custom -%dir %{xml_dir}/docbook/custom/simple -%dir %{xml_mod_dir} -%dir %{xml_mod_dir}/schema +%{xml_mod_dir} +%dir %{xml_mod_root} +%{sgml_dir}/%{name}-%{version}.cat +%{xml_mod_root}/%{name}-%{version}.xml %changelog ++++++ docbook-simple-1.1.cat ++++++ -- BEGIN OASIS TR 9401:1997 catalog for docbook-simple V1.1 -- OVERRIDE YES PUBLIC "-//OASIS//DTD Simplified DocBook XML V1.1//EN" "@XML_DTD_DIR@/sdocbook.dtd" PUBLIC "-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN" "@XML_DTD_DIR@/sdocbook-custom.dtd" PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" "@XML_DTD_DIR@/sdocbookref.dtd" PUBLIC "-//OASIS//DTD Simplified DocBook RefEntry XML CustomizationV1.1//EN" "@XML_DTD_DIR@/sdocbookref-custom.dtd" SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd"; "@XML_DTD_DIR@/sdocbook.dtd" SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd"; "@XML_DTD_DIR@/sdocbook-custom.dtd" SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd"; "@XML_DTD_DIR@/sdocbookref.dtd" SYSTEM "http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd"; "@XML_DTD_DIR@/sdocbookref-custom.dtd" -- END OASIS TR 9401:1997 catalog for docbook-simple V1.1 -- ++++++ docbook-simple-1.1.xml ++++++ <?xml version="1.0" standalone="no"?> <!DOCTYPE catalog PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN" "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd";> <!-- XML package catalog for docbook-simple v1.1 --> <catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog" prefer="public"> <public publicId="-//OASIS//DTD Simplified DocBook XML V1.1//EN" uri="file://@XML_DTD_DIR@/sdocbook.dtd"/> <public publicId="-//OASIS//DTD Simplified DocBook XML Customization V1.1//EN" uri="file://@XML_DTD_DIR@/sdocbook-custom.dtd"/> <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML V1.1//EN" uri="file://@XML_DTD_DIR@/sdocbookref.dtd"/> <public publicId="-//OASIS//DTD Simplified DocBook RefEntry XML Customization V1.1//EN" uri="file://@XML_DTD_DIR@/sdocbookref-custom.dtd"/> <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook.dtd"; uri="file://@XML_DTD_DIR@/sdocbook.dtd"/> <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbook-custom.dtd"; uri="file://@XML_DTD_DIR@/sdocbook-custom.dtd"/> <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref.dtd"; uri="file://@XML_DTD_DIR@/sdocbookref.dtd"/> <system systemId="http://www.oasis-open.org/docbook/xml/simple/1.1/sdocbookref-custom.dtd"; uri="file://@XML_DTD_DIR@/sdocbookref-custom.dtd"/> </catalog>
