Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package svg-schema for openSUSE:Factory checked in at 2026-05-28 17:24:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/svg-schema (Old) and /work/SRC/openSUSE:Factory/.svg-schema.new.1937 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "svg-schema" Thu May 28 17:24:14 2026 rev:19 rq:1355377 version:20030114 Changes: -------- --- /work/SRC/openSUSE:Factory/svg-schema/svg-schema.changes 2024-01-21 23:07:08.534850254 +0100 +++ /work/SRC/openSUSE:Factory/.svg-schema.new.1937/svg-schema.changes 2026-05-28 17:24:54.814688217 +0200 @@ -1,0 +2,8 @@ +Sun May 10 15:03:53 UTC 2026 - Yunus Acar <[email protected]> + +- jsc#PED-14901: Move CATALOG files into /usr/share/sgml + instead of linking them there from /var/lib/sgml. +- Simplify/cleanup specfile, in order to improve readability. +- Trim whitespace in .changes file. + +------------------------------------------------------------------- @@ -127,2 +134,0 @@ - - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ svg-schema.spec ++++++ --- /var/tmp/diff_new_pack.qTyRiJ/_old 2026-05-28 17:24:55.434713883 +0200 +++ /var/tmp/diff_new_pack.qTyRiJ/_new 2026-05-28 17:24:55.438714048 +0200 @@ -1,7 +1,7 @@ # # spec file for package svg-schema # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2026 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,21 +16,15 @@ # -%define regcat %{_bindir}/sgml-register-catalog -%define all_cat svg-1.0 svg-1.1 -# +%define UNZIP TZ=UTC unzip -a -u -qq +%define INSTALL_DIR install -m755 -d +%define INSTALL_DATA install -m644 -p +%define svg_dir %{_datadir}/xml/svg +%define dtd_dir %{svg_dir}/schema/dtd +%define rng_dir %{svg_dir}/schema/rng %define sgml_dir %{_datadir}/sgml -%define sgml_var_dir %{_localstatedir}/lib/sgml -# -%define xml_dir %{_datadir}/xml -%define xml_mod_dir %{xml_dir}/svg -%define xml_mod_dtd_dir %{xml_mod_dir}/schema/dtd -%define xml_mod_rng_dir %{xml_mod_dir}/schema/rng -%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 xml_sysconf_dir %{_sysconfdir}/xml -# +%define xmlcatalog_dir %{_sysconfdir}/xml/catalog.d + Name: svg-schema Version: 20030114 Release: 0 @@ -44,13 +38,13 @@ Source4: svg-1.0.xml Source5: svg-1.1.xml Source10: https://www.w3.org/Graphics/SVG/1.1/rng/rng.zip +BuildRequires: /usr/bin/xmlcatalog BuildRequires: fdupes BuildRequires: sgml-skel >= 0.7 BuildRequires: unzip Requires: sgml-skel >= 0.7 -Requires(post): libxml2-tools Requires(post): sgml-skel >= 0.7 -Requires(postun):sgml-skel >= 0.7 +Requires(postun): sgml-skel >= 0.7 Provides: svg-dtd = %{version} BuildArch: noarch @@ -61,7 +55,7 @@ Recommendation 04 September 2001. * "Scalable Vector Graphics" (SVG) 1.1 Specification, W3C -Recommendation 14 January 2003 + Recommendation 14 January 2003. %package doc Summary: Documentation of SVG Schemas @@ -72,10 +66,9 @@ %prep %autosetup -c -T -unzip -q -a %{SOURCE1} -unzip -q -a %{SOURCE0} -d svg-dtd-20010904 -unzip -q -a %{SOURCE10} -d rng11 - +%{UNZIP} %{SOURCE1} +%{UNZIP} %{SOURCE0} -d REC-SVG-20010904 +%{UNZIP} %{SOURCE10} -d rng cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . find -type d | xargs chmod 755 find -type f | xargs chmod 644 @@ -84,71 +77,59 @@ # nop %install -# Catalogs: -install -d -m755 %{buildroot}%{xml_sysconf_dir}/catalog.d -#RNG -install -d -m755 %{buildroot}%{xml_mod_rng_dir}/1.1 -cp rng11/* %{buildroot}%{xml_mod_rng_dir}/1.1 -#DTD -install -d -m755 %{buildroot}%{xml_mod_dtd_dir}/1.{0,1} \ - %{buildroot}%{sgml_var_dir} %{buildroot}%{sgml_dir} \ +%{INSTALL_DIR} %{buildroot}%{sgml_dir} \ + %{buildroot}%{xmlcatalog_dir} \ + %{buildroot}%{rng_dir}/1.1 \ + %{buildroot}%{dtd_dir}/{1.0,1.1} \ %{buildroot}%{_docdir}/%{name}/{1.0,1.1} -# Data: -install -m644 CATALOG.* %{buildroot}%{sgml_var_dir} -install -m644 svg-1.[01].xml %{buildroot}%{xml_sysconf_dir}/catalog.d/ + +%{INSTALL_DATA} rng/* %{buildroot}%{rng_dir}/1.1/ +%{INSTALL_DATA} CATALOG.* %{buildroot}%{sgml_dir}/ +%{INSTALL_DATA} svg-{1.0,1.1}.xml %{buildroot}%{xmlcatalog_dir}/ pushd REC-SVG11-20030114 cp -a * %{buildroot}%{_docdir}/%{name}/1.1 rm -fr %{buildroot}%{_docdir}/%{name}/1.1/{DTD,zip} - ln -sf %{xml_mod_dtd_dir}/1.1 %{buildroot}%{_docdir}/%{name}/1.1/DTD - cp -a DTD/[a-su-z][!C]* %{buildroot}%{xml_mod_dtd_dir}/1.1 -# + ln -sf %{dtd_dir}/1.1 %{buildroot}%{_docdir}/%{name}/1.1/DTD + cp -a DTD/[a-su-z][!C]* %{buildroot}%{dtd_dir}/1.1 popd -pushd svg-dtd-20010904 + +pushd REC-SVG-20010904 cp -a * %{buildroot}%{_docdir}/%{name}/1.0 rm -fr %{buildroot}%{_docdir}/%{name}/1.0/{DTD,zip} - ln -sf %{xml_mod_dtd_dir}/1.0 %{buildroot}%{_docdir}/%{name}/1.0/DTD - cp -a DTD/[a-su-z][!C]* %{buildroot}%{xml_mod_dtd_dir}/1.0 - pushd %{buildroot}%{sgml_dir} - for c in ../../..%{_localstatedir}/lib/sgml/CATALOG.*; do - ln -sf $c . - done - popd + ln -sf %{dtd_dir}/1.0 %{buildroot}%{_docdir}/%{name}/1.0/DTD + cp -a DTD/[a-su-z][!C]* %{buildroot}%{dtd_dir}/1.0 - xmlcatalog --noout --create %{buildroot}%{xml_sysconf_dir}/catalog.d/svg11-rng.xml + xmlcatalog --noout --create %{buildroot}%{xmlcatalog_dir}/svg11-rng.xml # PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" # SYSTEM "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd" # RNG xmlcatalog --noout --add "uri" \ "http://www.w3.org/Graphics/SVG/1.1/rng/svg11.rng" \ - "file://%{xml_mod_rng_dir}/1.1/svg11.rng" %{buildroot}%{xml_sysconf_dir}/catalog.d/svg11-rng.xml + "file://%{rng_dir}/1.1/svg11.rng" %{buildroot}%{xmlcatalog_dir}/svg11-rng.xml popd -install -d -m755 %{buildroot}%{_sysconfdir}/xml +%{INSTALL_DIR} %{buildroot}%{_sysconfdir}/xml %fdupes %{buildroot}%{_docdir} %post -if [ -x %{regcat} ]; then - for c in %{all_cat}; do - grep -q -e "%{sgml_dir}/CATALOG.$c\\>" %{_sysconfdir}/sgml/catalog \ - || %{regcat} -a %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 || : - done -fi +for c in svg-1.0 svg-1.1; do + sgml-register-catalog -a %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 || : +done update-xml-catalog %postun -if [ "$1" = "0" -a -x %{regcat} ]; then - for c in %{all_cat}; do - %{regcat} -r %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 || : +if [ "$1" = "0" ] && [ -x %{_bindir}/sgml-register-catalog ]; then + for c in svg-1.0 svg-1.1; do + sgml-register-catalog -r %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 || : done fi update-xml-catalog %files -%config %{sgml_var_dir}/CATALOG.* -%config %{_sysconfdir}/xml/catalog.d/*.xml +%{svg_dir} %{sgml_dir}/CATALOG.* -%{xml_mod_dir} +%config %{xmlcatalog_dir}/*.xml %files doc %{_docdir}/%{name}
