Hello community, here is the log from the commit of package docbook_3 for openSUSE:Factory checked in at 2019-02-20 14:07:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docbook_3 (Old) and /work/SRC/openSUSE:Factory/.docbook_3.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook_3" Wed Feb 20 14:07:41 2019 rev:20 rq:676370 version:3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/docbook_3/docbook_3.changes 2013-02-04 19:03:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.docbook_3.new.28833/docbook_3.changes 2019-02-20 14:07:47.511009953 +0100 @@ -1,0 +2,15 @@ +Thu Feb 14 17:11:22 UTC 2019 - Dominique Leuenberger <[email protected]> + +- Fixup installed CATALOG files to follow the move to /usr/share. + +------------------------------------------------------------------- +Tue Feb 5 14:50:05 UTC 2019 - Jan Engelhardt <[email protected]> + +- Replace old $RPM_* shell vars and "useless use of cat". + +------------------------------------------------------------------- +Thu Jan 31 08:54:05 UTC 2019 - [email protected] + +- Do not install in /var/lib; bsc#1093345 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docbook_3.spec ++++++ --- /var/tmp/diff_new_pack.q6mb4y/_old 2019-02-20 14:07:48.279009699 +0100 +++ /var/tmp/diff_new_pack.q6mb4y/_new 2019-02-20 14:07:48.279009699 +0100 @@ -1,7 +1,7 @@ # # spec file for package docbook_3 # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # 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/ # @@ -29,7 +29,7 @@ %define regcat /usr/bin/sgml-register-catalog PreReq: %{regcat} /usr/bin/xmlcatalog Summary: DocBook DTD 3.x -License: BSD-3-Clause and MIT +License: BSD-3-Clause AND MIT Group: Productivity/Publishing/DocBook Version: 3.1 Release: 0 @@ -83,9 +83,7 @@ %define xml_docbook_dtd_dir %{xml_docbook_dir}/schema/dtd %define xml_docbook_custom_dir %{xml_docbook_dir}/custom %define xml_docbook_style_dir %{xml_docbook_dir}/stylesheet -%define sgml_config_dir /var/lib/sgml %define sgml_sysconf_dir %{_sysconfdir}/sgml -%define xml_config_dir /var/lib/xml %define xml_sysconf_dir %{_sysconfdir}/xml %prep @@ -93,58 +91,53 @@ cp %{S:5} README.SuSE %{INSTALL_DIR} dtd/{3.0,3.1} html xml sdb cd dtd/3.0 -unzip -aq $RPM_SOURCE_DIR/%{dtd30} +unzip -aq %{_sourcedir}/%{dtd30} cd ../3.1 -unzip -aq $RPM_SOURCE_DIR/%{dtd31} +unzip -aq %{_sourcedir}/%{dtd31} cd ../../xml -unzip -aq $RPM_SOURCE_DIR/%{db3x} +unzip -aq %{_sourcedir}/%{db3x} cd ../sdb -unzip -aq $RPM_SOURCE_DIR/%{sdb} +unzip -aq %{_sourcedir}/%{sdb} cd ../html -gzip -dc $RPM_SOURCE_DIR/%{docu} | tar -xf - +tar -xzf %{_sourcedir}/%{docu} cd .. # %setup -T -D -a 1 -cp -p $RPM_SOURCE_DIR/png-support.dtd . -cp -p $RPM_SOURCE_DIR/png-support-3.1.dtd . +cp -p %{_sourcedir}/png-support.dtd . +cp -p %{_sourcedir}/png-support-3.1.dtd . cp %{S:8} %{S:9} %{S:10} %{S:11} %{S:12} . -cat $RPM_SOURCE_DIR/%{pkgdif} | patch -s -p0 +patch -s -p0 <%{_sourcedir}/%{pkgdif} rm -f html/index.html.orig chmod -R a+rX,g-w,o-w . -find $RPM_BUILD_DIR -type d | xargs chmod 755 +find %{_builddir} -type d -exec chmod 755 {} + %build %install pkg_name=%{name} -doc_dir=$RPM_BUILD_ROOT/%{_defaultdocdir}/$pkg_name +doc_dir=%{buildroot}/%{_defaultdocdir}/$pkg_name %{INSTALL_DIR} $doc_dir/{30,31} -%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/{3.0,3.1,3.x-gnome} -%{INSTALL_DIR} $RPM_BUILD_ROOT%{sgml_config_dir} -%{INSTALL_DATA} dtd/3.0/* $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/3.0 -%{INSTALL_DATA} dtd/3.1/* $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/3.1 +%{INSTALL_DIR} %{buildroot}%{sgml_docbook_dtd_dir}/{3.0,3.1,3.x-gnome} +%{INSTALL_DATA} dtd/3.0/* %{buildroot}/%{sgml_docbook_dtd_dir}/3.0 +%{INSTALL_DATA} dtd/3.1/* %{buildroot}/%{sgml_docbook_dtd_dir}/3.1 %{INSTALL_DATA} png-support.dtd png-support-3.1.dtd \ - $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/3.x-gnome + %{buildroot}/%{sgml_docbook_dtd_dir}/3.x-gnome # xml -%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/{3.1,3.1-sdb} -%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_config_dir} -cp -a xml/* $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/3.1 -cp -a sdb/* $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/3.1-sdb -# pushd $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir} -ln -sf %{xml_docbook_dtd_dir}/3.1 $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/3.1xml +%{INSTALL_DIR} %{buildroot}/%{xml_docbook_dtd_dir}/{3.1,3.1-sdb} +cp -a xml/* %{buildroot}/%{xml_docbook_dtd_dir}/3.1 +cp -a sdb/* %{buildroot}/%{xml_docbook_dtd_dir}/3.1-sdb +# pushd %{buildroot}/%{sgml_docbook_dtd_dir} +ln -sf %{xml_docbook_dtd_dir}/3.1 %{buildroot}/%{sgml_docbook_dtd_dir}/3.1xml ln -sf %{xml_docbook_dtd_dir}/3.1-sdb \ - $RPM_BUILD_ROOT%{sgml_docbook_dtd_dir}/3.1-sdbxml + %{buildroot}/%{sgml_docbook_dtd_dir}/3.1-sdbxml # popd # %{INSTALL_DIR} $sgml_dir/USA-DOD/dtd # %{INSTALL_DIR} $sgml_dir/Davenport/{elements,entities,dtd} # %{INSTALL_DIR} $sgml_dir/OASIS/{elements,entities,dtd} %{INSTALL_DATA} element-list.txt README.SuSE $doc_dir c=$(echo CATALOG.*) -%{INSTALL_DATA} $c $RPM_BUILD_ROOT%{sgml_config_dir} -ln -sf %{sgml_config_dir}/CATALOG.docbook_3 \ - $RPM_BUILD_ROOT%{sgml_dir}/CATALOG.docbk31 -for f in $c; do - ln -sf %{sgml_config_dir}/$f $RPM_BUILD_ROOT%{sgml_dir}/$f -done +%{INSTALL_DATA} $c %{buildroot}/%{sgml_dir} +ln -sf %{sgml_dir}/CATALOG.docbook_3 \ + %{buildroot}/%{sgml_dir}/CATALOG.docbk31 # docomentation cp -a html $doc_dir @@ -166,7 +159,6 @@ %files %defattr(-, root, root) -%config %{sgml_config_dir}/CATALOG.* %{sgml_dir}/CATALOG.* %{sgml_docbook_dtd_dir}/3* %{xml_docbook_dtd_dir}/3* ++++++ CATALOG.db3sxml ++++++ --- /var/tmp/diff_new_pack.q6mb4y/_old 2019-02-20 14:07:48.307009690 +0100 +++ /var/tmp/diff_new_pack.q6mb4y/_new 2019-02-20 14:07:48.307009690 +0100 @@ -23,7 +23,7 @@ -- /usr/share/sgml/sdb/ent/iso-num.ent -- -- /usr/share/sgml/sdb/ent/iso-pub.ent -- -CATALOG "/var/lib/sgml/CATALOG.db3xml" +CATALOG "/usr/share/sgml/CATALOG.db3xml" -- Local Variables: -- -- mode:sgml -- ++++++ CATALOG.docbk30 ++++++ --- /var/tmp/diff_new_pack.q6mb4y/_old 2019-02-20 14:07:48.331009682 +0100 +++ /var/tmp/diff_new_pack.q6mb4y/_new 2019-02-20 14:07:48.335009681 +0100 @@ -49,6 +49,6 @@ -- DOCTYPE "article" Davenport/docbook-2.4/docbook.dtd -- -- DOCTYPE "article" dtd/docbook.dtd -- -- SGMLDECL "/usr/share/sgml/docbk30/docbook.dcl" -- --- CATALOG "/var/lib/sgml/CATALOG.iso_ent" -- +-- CATALOG "/usr/share/sgml/CATALOG.iso_ent" -- -- CATALOG ends here -- ++++++ CATALOG.docbook_3 ++++++ --- /var/tmp/diff_new_pack.q6mb4y/_old 2019-02-20 14:07:48.351009676 +0100 +++ /var/tmp/diff_new_pack.q6mb4y/_new 2019-02-20 14:07:48.355009674 +0100 @@ -70,7 +70,7 @@ -- ...................................................................... -- -- ISO entity sets ...................................................... -- -CATALOG "/var/lib/sgml/CATALOG.iso_ent" +CATALOG "/usr/share/sgml/CATALOG.iso_ent" -- PUBLIC "ISO 8879:1986//ENTITIES Diacritical Marks//EN" "iso-dia.gml" -- -- PUBLIC "ISO 8879:1986//ENTITIES Numeric and Special Graphic//EN" "iso-num.gml" -- ++++++ CATALOG.gnome ++++++ --- /var/tmp/diff_new_pack.q6mb4y/_old 2019-02-20 14:07:48.367009670 +0100 +++ /var/tmp/diff_new_pack.q6mb4y/_new 2019-02-20 14:07:48.367009670 +0100 @@ -2,5 +2,5 @@ "/usr/share/sgml/gnome/png-support.dtd" PUBLIC "-//GNOME//DTD DocBook PNG Variant V1.1//EN" "/usr/share/sgml/gnome/png-support-3.1.dtd" -CATALOG "/var/lib/sgml/CATALOG.docbook_3" --- CATALOG "/var/lib/sgml/CATALOG.docbk30" -- +CATALOG "/usr/share/sgml/CATALOG.docbook_3" +-- CATALOG "/usr/share/sgml/CATALOG.docbk30" --
