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

Changed DocBook catalog URIs to 5.1 instead of 5.1CR3

OBS-URL: https://build.opensuse.org/request/show/306504
OBS-URL: https://build.opensuse.org/package/show/Publishing/docbook_5?expand=0&rev=14
This commit is contained in:
Frank Sundermeyer 2015-05-12 13:05:07 +00:00 committed by Git OBS Bridge
parent f8883459e8
commit ff3800ac8f
2 changed files with 20 additions and 12 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 12 12:44:54 UTC 2015 - toms@opensuse.org
- Changed DocBook catalog URIs to 5.1 instead of 5.1CR3
-------------------------------------------------------------------
Tue Feb 19 11:35:00 UTC 2015 - toms@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package docbook_5
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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
@ -41,7 +41,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Url: http://www.oasis-open.org/docbook/
%define versions 5.0 5.1CR3
%define schemaversions 5.0 5.1
%define lastschemaversion 5.1
%description
The version 5.0 release is a complete rewrite of DocBook in RELAX NG.
@ -75,6 +76,8 @@ cp %{S:3} %{S:4} %{S:5} .
tar -xjf %{S:500}
tar -xjf %{S:510}
mv docbook-%{version} docbook-%{lastschemaversion}
chmod -R a+rX,g-w,o-w .
find . -type f | xargs chmod a-x
@ -85,7 +88,7 @@ CATALOG=%{name}.xml
$xmlcatbin --create --noout $CATALOG
# Iterate over all versions...
for v in %{versions}; do
for v in %{schemaversions}; do
docbookdir=%{xml_docbook_dtd_dir}/${v}
@ -132,7 +135,7 @@ done
# ---------------------
# Build XML catalog files for each Schema
for v in %{versions}; do
for v in %{schemaversions}; do
for s in dtd rng sch xsd; do
cat=docbook-${v}/${s}/catalog.xml
@ -195,7 +198,8 @@ CATALOG=etc/xml/$CATALOG
rm -f %{FOR_ROOT_CAT}.tmp
$xmlcatbin --noout --create %{FOR_ROOT_CAT}.tmp
for v in %{versions}; do
for v in %{schemaversions}; do
cat=%{xml_docbook_dtd_dir}/${v}/catalog.xml
# DTDs
$xmlcatbin --noout --add "delegatePublic" \
@ -223,7 +227,6 @@ for v in %{versions}; do
"file://%{xml_docbook_sch_dir}/${v}/catalog.xml" \
%{FOR_ROOT_CAT}.tmp
done
done
# Create tag
@ -242,7 +245,7 @@ cat_dir=%{buildroot}/etc/xml
%{INSTALL_DIR} $cat_dir
%{INSTALL_DATA} %{FOR_ROOT_CAT} %{name}.xml $cat_dir
for v in %{versions}; do
for v in %{schemaversions}; do
# Create directories
mkdir -p $RPM_BUILD_ROOT%{xml_docbook_dtd_dir}/$v \
$RPM_BUILD_ROOT%{xml_docbook_rng_dir}/$v \
@ -296,7 +299,7 @@ fi
%doc *README*
%doc docbook-5.0-spec-cd-01.{pdf,html,xml}
# Use the last version of DocBook:
%doc docbook-5.0/docs/* docbook-%{version}/docbook.nvdl
%doc docbook-5.0/docs/* docbook-%{lastschemaversion}/docbook.nvdl
#%%{sgml_dir}/CATALOG.*
%dir %{xml_docbook_dir}/schema
%dir %{xml_docbook_dtd_dir}
@ -311,10 +314,10 @@ fi
%{xml_docbook_xsd_dir}/5.0
%{xml_docbook_style_dir}/upgrade
# 5.1CR3
%{xml_docbook_dtd_dir}/5.1CR3
%{xml_docbook_rng_dir}/5.1CR3
%{xml_docbook_sch_dir}/5.1CR3
%{xml_docbook_xsd_dir}/5.1CR3
%{xml_docbook_dtd_dir}/%{lastschemaversion}
%{xml_docbook_rng_dir}/%{lastschemaversion}
%{xml_docbook_sch_dir}/%{lastschemaversion}
%{xml_docbook_xsd_dir}/%{lastschemaversion}
%{_bindir}/db4-entities.pl