Hello community, here is the log from the commit of package svg-schema for openSUSE:Factory checked in at 2018-11-26 10:16:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/svg-schema (Old) and /work/SRC/openSUSE:Factory/.svg-schema.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "svg-schema" Mon Nov 26 10:16:58 2018 rev:17 rq:649216 version:20030114 Changes: -------- --- /work/SRC/openSUSE:Factory/svg-schema/svg-schema.changes 2016-07-30 00:27:39.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.svg-schema.new.19453/svg-schema.changes 2018-11-26 10:17:03.289961170 +0100 @@ -1,0 +2,22 @@ +Thu Nov 15 09:41:42 UTC 2018 - Tomáš Chvátal <[email protected]> + +- Provide still svg-dtd symbol to make sure things are still resolvable + +------------------------------------------------------------------- +Mon Sep 24 08:33:37 UTC 2018 - Martin Pluskal <[email protected]> + +- Use correct form of requires(pre) + +------------------------------------------------------------------- +Sun Sep 23 14:32:52 UTC 2018 - [email protected] + +Several spec changes, but no version update: + - Use spec-cleaner + - Simplified unzip with -d option + - Split into svg-schema and svg-schema-doc + - Fix warnings + - Add missing "popd" + - General cleanup with structure & variables + - Apply %fdupes macro only to %{buildroot}%{_docdir} + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ svg-schema.spec ++++++ --- /var/tmp/diff_new_pack.3fqymn/_old 2018-11-26 10:17:03.953960393 +0100 +++ /var/tmp/diff_new_pack.3fqymn/_new 2018-11-26 10:17:03.961960384 +0100 @@ -1,7 +1,7 @@ # -# spec file for package svg-schema (Version 20030114) +# spec file for package svg-schema # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,33 +12,32 @@ # 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/ # -# norootforbuild - +%define regcat %{_bindir}/sgml-register-catalog +%define all_cat svg-1.0 svg-1.1 +# +%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 +# Name: svg-schema -BuildRequires: fdupes sgml-skel unzip -Summary: SVG DTDs and Documentation Version: 20030114 -Release: 101 -Group: Productivity/Graphics/Other -BuildArch: noarch -Provides: svg-dtd -Obsoletes: svg-dtd -PreReq: /usr/bin/xmlcatalog -BuildRequires: sgml-skel >= 0.7 -Requires(post): sgml-skel >= 0.7 -Requires(postun): sgml-skel >= 0.7 -Requires: sgml-skel >= 0.7 -Requires: libxml2 -%define regcat /usr/bin/sgml-register-catalog -PreReq: %{regcat} -PreReq: sed grep awk -#Provides: +Release: 0 +Summary: SVG DTD and RELAX NG Schema License: BSD-3-Clause -Url: http://www.w3.org/Graphics/SVG/ +Group: Productivity/Graphics/Other +URL: http://www.w3.org/Graphics/SVG/ Source0: http://www.w3.org/TR/2001/REC-SVG-20010904/REC-SVG-20010904.zip Source1: http://www.w3.org/TR/SVG11/REC-SVG11-20030114.zip Source2: CATALOG.svg-1.0 @@ -46,8 +45,15 @@ Source4: svg-1.0.xml Source5: svg-1.1.xml Source10: http://www.w3.org/Graphics/SVG/1.1/rng/rng.zip -#Patch: -BuildRoot: %{_tmppath}/%{name}-%{version}-build +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 +Provides: svg-dtd = %{version} +BuildArch: noarch %description Contains the following DTDs: @@ -58,95 +64,74 @@ * "Scalable Vector Graphics" (SVG) 1.1 Specification, W3C Recommendation 14 January 2003 +%package doc +Summary: Documentation of SVG Schemas +Group: Productivity/Graphics/Other - -%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}/svg -%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}/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 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 +%description doc +SVG DTD and RELAX NG Schema Documentation in HTML %prep -%setup -c -T -unzip -q -a %{S:1} -mkdir svg-dtd-20010904 -cd svg-dtd-20010904 -unzip -q -a %{S:0} -cd .. -mkdir rng11 -cd rng11 -unzip -q -a %{S:10} -cd .. -cp %{S:2} %{S:3} %{S:4} %{S:5} . +%setup -q -c -T +unzip -q -a %{SOURCE1} +unzip -q -a %{SOURCE0} -d svg-dtd-20010904 +unzip -q -a %{SOURCE10} -d rng11 + +cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} . find -type d | xargs chmod 755 find -type f | xargs chmod 644 %build +# nop %install -[ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot} +# Catalogs: +install -d -m755 %{buildroot}%{xml_sysconf_dir}/catalog.d #RNG -%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_mod_rng_dir}/1.1 -cp rng11/* $RPM_BUILD_ROOT%{xml_mod_rng_dir}/1.1 +install -d -m755 %{buildroot}%{xml_mod_rng_dir}/1.1 +cp rng11/* %{buildroot}%{xml_mod_rng_dir}/1.1 #DTD -%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_mod_dtd_dir}/1.{0,1} \ - $RPM_BUILD_ROOT%{sgml_var_dir} $RPM_BUILD_ROOT%{sgml_dir} \ - $RPM_BUILD_ROOT%{_docdir}/%{name}/{1.0,1.1} -%{INSTALL_DATA} CATALOG.* $RPM_BUILD_ROOT%{sgml_var_dir} -%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_sysconf_dir} -mkdir -p $RPM_BUILD_ROOT%{xml_sysconf_dir}/catalog.d -%{INSTALL_DATA} svg-1.[01].xml $RPM_BUILD_ROOT%{xml_sysconf_dir}/catalog.d/ +install -d -m755 %{buildroot}%{xml_mod_dtd_dir}/1.{0,1} \ + %{buildroot}%{sgml_var_dir} %{buildroot}%{sgml_dir} \ + %{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/ + pushd REC-SVG11-20030114 -cp -a * $RPM_BUILD_ROOT%{_docdir}/%{name}/1.1 -rm -fr $RPM_BUILD_ROOT%{_docdir}/%{name}/1.1/{DTD,zip} -ln -sf %{xml_mod_dtd_dir}/1.1 $RPM_BUILD_ROOT%{_docdir}/%{name}/1.1/DTD -cp -a DTD/[a-su-z][!C]* $RPM_BUILD_ROOT%{xml_mod_dtd_dir}/1.1 + 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 # popd pushd svg-dtd-20010904 -cp -a * $RPM_BUILD_ROOT%{_docdir}/%{name}/1.0 -rm -fr $RPM_BUILD_ROOT%{_docdir}/%{name}/1.0/{DTD,zip} -ln -sf %{xml_mod_dtd_dir}/1.0 $RPM_BUILD_ROOT%{_docdir}/%{name}/1.0/DTD -cp -a DTD/[a-su-z][!C]* $RPM_BUILD_ROOT%{xml_mod_dtd_dir}/1.0 -pushd $RPM_BUILD_ROOT%{sgml_dir} - for c in ../../../var/lib/sgml/CATALOG.*; do + 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 + popd -xmlcatalog --noout --create $RPM_BUILD_ROOT%{xml_sysconf_dir}/catalog.d/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" \ + xmlcatalog --noout --create %{buildroot}%{xml_sysconf_dir}/catalog.d/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" $RPM_BUILD_ROOT%{xml_sysconf_dir}/catalog.d/svg11-rng.xml + "file://%{xml_mod_rng_dir}/1.1/svg11.rng" %{buildroot}%{xml_sysconf_dir}/catalog.d/svg11-rng.xml +popd -cat_dir=%{buildroot}/etc/xml -%{INSTALL_DIR} $cat_dir -%define all_cat svg-1.0 svg-1.1 -%fdupes $RPM_BUILD_ROOT +install -d -m755 %{buildroot}%{_sysconfdir}/xml +%fdupes %{buildroot}%{_docdir} %post if [ -x %{regcat} ]; then for c in %{all_cat}; do - grep -q -e "%{sgml_dir}/CATALOG.$c\\>" /etc/sgml/catalog \ + grep -q -e "%{sgml_dir}/CATALOG.$c\\>" %{_sysconfdir}/sgml/catalog \ || %{regcat} -a %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 || : done fi @@ -160,16 +145,15 @@ fi update-xml-catalog -%clean -rm -fr $RPM_BUILD_ROOT - %files -%defattr(-, root, root) -# %doc copyright-software.html %config %{sgml_var_dir}/CATALOG.* -%config /etc/xml/catalog.d/*.xml -%doc %{_docdir}/%{name} +%config %{_sysconfdir}/xml/catalog.d/*.xml %{sgml_dir}/CATALOG.* %{xml_mod_dir} +%files doc +%{_docdir}/%{name} +%exclude %{_docdir}/%{name}/1.0/DTD +%exclude %{_docdir}/%{name}/1.1/DTD + %changelog
