- Changed the IDs in /etc/xml/suse-catalog.xml to something that

makes more sense

OBS-URL: https://build.opensuse.org/package/show/Documentation:Tools/daps?expand=0&rev=4
This commit is contained in:
Frank Sundermeyer 2011-07-07 09:39:17 +00:00 committed by Git OBS Bridge
parent 049985ab13
commit 94ad168a8a
3 changed files with 35 additions and 6 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0955ab7f24e7b1f03e19aae29c524e88aac5f1a15f1286672a8c37a11b2f53c4
size 700395
oid sha256:947b51e9cd785dba00a921f62960a004da0469b590098936043e030ec3bf3cca
size 700414

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jul 7 09:33:47 UTC 2011 - fsundermeyer@opensuse.org
- Changed the IDs in /etc/xml/suse-catalog.xml to something that
makes more sense
-------------------------------------------------------------------
Thu Jul 7 08:07:09 UTC 2011 - fsundermeyer@opensuse.org

View File

@ -18,8 +18,8 @@
Name: daps
Version: 0.9beta1
%define root_catalog for-catalog-%{dtdname}-%{version}.xml
%define xslt_catalog for-catalog-%{dtdname}xslt-%{version}.xml
%define root_catalog for-catalog-%{dtdname}-%{dtdversion}.xml
%define daps_catalog for-catalog-%{name}-%{version}.xml
Release: 1
Summary: DocBook Authoring and Publishing Suite
@ -182,24 +182,37 @@ Authors:
#----------------------
%post
# SGM CATALOG
#
if [ -x %{regcat} ]; then
for CATALOG in CATALOG.%{dtdname}-%{dtdversion}; do
%{regcat} -a %{_datadir}/sgml/$CATALOG >/dev/null 2>&1 || true
done
fi
# XML Catalog
#
# remove existing entries first (if existing) - needed for
# zypper in, since it does not call postun
#
# The first two ones are only there for campatibility reasons and
# can be removed in the future
#
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{version}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}xslt-%{version}
#
# These two entries need to stay
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{dtdversion}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{name}-%{version}
#
# now add new entries
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{root_catalog}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--add /etc/xml/%{xslt_catalog}
--add /etc/xml/%{daps_catalog}
%run_suseconfig_fonts
exit 0
@ -210,11 +223,21 @@ if [ ! -f %{_sysconfdir}/xml/%{root_catalog} -a -x /usr/bin/edit-xml-catalog ] ;
for c in CATALOG.%{dtdname}-%{dtdversion}; do
%{regcat} -r %{_datadir}/sgml/$c >/dev/null 2>&1
done
#now XML catalog
# XML Catalog
#
# The first two ones are only there for campatibility reasons and
# can be removed in the future
#
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{version}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}xslt-%{version}
#
# These two entries need to stay
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{dtdname}-%{dtdversion}
edit-xml-catalog --group --catalog /etc/xml/suse-catalog.xml \
--del %{name}-%{version}
fi
%run_suseconfig_fonts