pool/svg-schema
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 637271 from home:thomas-schraitle:branches:Publishing

Browse Source 
Several spec improvements, 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}

OBS-URL: https://build.opensuse.org/request/show/637271
OBS-URL: https://build.opensuse.org/package/show/Publishing/svg-schema?expand=0&rev=7
This commit is contained in:
Martin Pluskal 2018-09-24 07:31:38 +00:00 committed by Git OBS Bridge
parent 5b44365b51
commit 4b6a7b7a32
2 changed files with 102 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
svg-schema.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Sun Sep 23 14:32:52 UTC 2018 - thomas.schraitle@suse.com
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}
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jul 25 09:20:02 UTC 2016 - fvogt@suse.com Mon Jul 25 09:20:02 UTC 2016 - fvogt@suse.com

187
svg-schema.spec
View File

@ -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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,30 +15,33 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild
%define regcat %{_bindir}/sgml-register-catalog
%define all_cat svg-1.0 svg-1.1
#
%define INSTALL_DIR install -d -m755
%define INSTALL_DATA install -m644
#
%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 Name: svg-schema
BuildRequires: fdupes sgml-skel unzip
Summary: SVG DTDs and Documentation
Version: 20030114 Version: 20030114
Release: 101 Release: 0
Group: Productivity/Graphics/Other Summary: SVG DTD and RELAX NG Schema
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:
License: BSD-3-Clause 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 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 Source1: http://www.w3.org/TR/SVG11/REC-SVG11-20030114.zip
Source2: CATALOG.svg-1.0 Source2: CATALOG.svg-1.0
@ -46,8 +49,19 @@ Source3: CATALOG.svg-1.1
Source4: svg-1.0.xml Source4: svg-1.0.xml
Source5: svg-1.1.xml Source5: svg-1.1.xml
Source10: http://www.w3.org/Graphics/SVG/1.1/rng/rng.zip Source10: http://www.w3.org/Graphics/SVG/1.1/rng/rng.zip
#Patch: BuildRequires: fdupes
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: sgml-skel >= 0.7
BuildRequires: unzip
Requires: sgml-skel >= 0.7
# FIXME: use proper Requires(pre/post/preun/...)
PreReq: %{_bindir}/xmlcatalog
PreReq: %{regcat}
PreReq: awk
PreReq: grep
PreReq: sed
Requires(post): sgml-skel >= 0.7
Requires(postun): sgml-skel >= 0.7
BuildArch: noarch
%description %description
Contains the following DTDs: Contains the following DTDs:
@ -59,94 +73,74 @@ Contains the following DTDs:
Recommendation 14 January 2003 Recommendation 14 January 2003
%package doc
Summary: Documentation of SVG Schemas
Group: Productivity/Graphics/Other
%define INSTALL install -m755 -s %description doc
%define INSTALL_DIR install -d -m755 %{summary} in HTML
%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
%prep %prep
%setup -c -T %setup -q -c -T
unzip -q -a %{S:1} unzip -q -a %{SOURCE1}
mkdir svg-dtd-20010904 unzip -q -a %{SOURCE0} -d svg-dtd-20010904
cd svg-dtd-20010904 unzip -q -a %{SOURCE10} -d rng11
unzip -q -a %{S:0}
cd .. cp %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
mkdir rng11
cd rng11
unzip -q -a %{S:10}
cd ..
cp %{S:2} %{S:3} %{S:4} %{S:5} .
find -type d | xargs chmod 755 find -type d | xargs chmod 755
find -type f | xargs chmod 644 find -type f | xargs chmod 644
%build %build
# nop
%install %install
[ -d %{buildroot} -a "%{buildroot}" != "" ] && rm -rf %{buildroot} # Catalogs:
%{INSTALL_DIR} %{buildroot}%{xml_sysconf_dir}/catalog.d
#RNG #RNG
%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_mod_rng_dir}/1.1 %{INSTALL_DIR} %{buildroot}%{xml_mod_rng_dir}/1.1
cp rng11/* $RPM_BUILD_ROOT%{xml_mod_rng_dir}/1.1 cp rng11/* %{buildroot}%{xml_mod_rng_dir}/1.1
#DTD #DTD
%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_mod_dtd_dir}/1.{0,1} \ %{INSTALL_DIR} %{buildroot}%{xml_mod_dtd_dir}/1.{0,1} \
$RPM_BUILD_ROOT%{sgml_var_dir} $RPM_BUILD_ROOT%{sgml_dir} \ %{buildroot}%{sgml_var_dir} %{buildroot}%{sgml_dir} \
$RPM_BUILD_ROOT%{_docdir}/%{name}/{1.0,1.1} %{buildroot}%{_docdir}/%{name}/{1.0,1.1}
%{INSTALL_DATA} CATALOG.* $RPM_BUILD_ROOT%{sgml_var_dir} # Data:
%{INSTALL_DIR} $RPM_BUILD_ROOT%{xml_sysconf_dir} %{INSTALL_DATA} CATALOG.* %{buildroot}%{sgml_var_dir}
mkdir -p $RPM_BUILD_ROOT%{xml_sysconf_dir}/catalog.d %{INSTALL_DATA} svg-1.[01].xml %{buildroot}%{xml_sysconf_dir}/catalog.d/
%{INSTALL_DATA} svg-1.[01].xml $RPM_BUILD_ROOT%{xml_sysconf_dir}/catalog.d/
pushd REC-SVG11-20030114 pushd REC-SVG11-20030114
cp -a * $RPM_BUILD_ROOT%{_docdir}/%{name}/1.1 cp -a * %{buildroot}%{_docdir}/%{name}/1.1
rm -fr $RPM_BUILD_ROOT%{_docdir}/%{name}/1.1/{DTD,zip} rm -fr %{buildroot}%{_docdir}/%{name}/1.1/{DTD,zip}
ln -sf %{xml_mod_dtd_dir}/1.1 $RPM_BUILD_ROOT%{_docdir}/%{name}/1.1/DTD ln -sf %{xml_mod_dtd_dir}/1.1 %{buildroot}%{_docdir}/%{name}/1.1/DTD
cp -a DTD/[a-su-z][!C]* $RPM_BUILD_ROOT%{xml_mod_dtd_dir}/1.1 cp -a DTD/[a-su-z][!C]* %{buildroot}%{xml_mod_dtd_dir}/1.1
# #
popd popd
pushd svg-dtd-20010904 pushd svg-dtd-20010904
cp -a * $RPM_BUILD_ROOT%{_docdir}/%{name}/1.0 cp -a * %{buildroot}%{_docdir}/%{name}/1.0
rm -fr $RPM_BUILD_ROOT%{_docdir}/%{name}/1.0/{DTD,zip} rm -fr %{buildroot}%{_docdir}/%{name}/1.0/{DTD,zip}
ln -sf %{xml_mod_dtd_dir}/1.0 $RPM_BUILD_ROOT%{_docdir}/%{name}/1.0/DTD ln -sf %{xml_mod_dtd_dir}/1.0 %{buildroot}%{_docdir}/%{name}/1.0/DTD
cp -a DTD/[a-su-z][!C]* $RPM_BUILD_ROOT%{xml_mod_dtd_dir}/1.0 cp -a DTD/[a-su-z][!C]* %{buildroot}%{xml_mod_dtd_dir}/1.0
pushd $RPM_BUILD_ROOT%{sgml_dir} pushd %{buildroot}%{sgml_dir}
for c in ../../../var/lib/sgml/CATALOG.*; do for c in ../../..%{_localstatedir}/lib/sgml/CATALOG.*; do
ln -sf $c . ln -sf $c .
done done
popd
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" %{buildroot}%{xml_sysconf_dir}/catalog.d/svg11-rng.xml
popd popd
xmlcatalog --noout --create $RPM_BUILD_ROOT%{xml_sysconf_dir}/catalog.d/svg11-rng.xml %{INSTALL_DIR} %{buildroot}%{_sysconfdir}/xml
# PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" %fdupes %{buildroot}%{_docdir}
# 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
cat_dir=%{buildroot}/etc/xml
%{INSTALL_DIR} $cat_dir
%define all_cat svg-1.0 svg-1.1
%fdupes $RPM_BUILD_ROOT
%post %post
if [ -x %{regcat} ]; then if [ -x %{regcat} ]; then
for c in %{all_cat}; do 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 || : || %{regcat} -a %{sgml_dir}/CATALOG.$c >/dev/null 2>&1 || :
done done
fi fi
@ -160,16 +154,15 @@ if [ "$1" = "0" -a -x %{regcat} ]; then
fi fi
update-xml-catalog update-xml-catalog
%clean
rm -fr $RPM_BUILD_ROOT
%files %files
%defattr(-, root, root)
# %doc copyright-software.html
%config %{sgml_var_dir}/CATALOG.* %config %{sgml_var_dir}/CATALOG.*
%config /etc/xml/catalog.d/*.xml %config %{_sysconfdir}/xml/catalog.d/*.xml
%doc %{_docdir}/%{name}
%{sgml_dir}/CATALOG.* %{sgml_dir}/CATALOG.*
%{xml_mod_dir} %{xml_mod_dir}
%files doc
%{_docdir}/%{name}
%exclude %{_docdir}/%{name}/1.0/DTD
%exclude %{_docdir}/%{name}/1.1/DTD
%changelog %changelog