[log4j] Add DTD public id to XML and SGML catalogs.
Ville Skyttä
scop at fedoraproject.org
Tue May 14 15:31:33 UTC 2013
commit 03ce3ebc2de792f5f59ce565e4145f99be888f4f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Tue May 14 18:31:02 2013 +0300
Add DTD public id to XML and SGML catalogs.
log4j.catalog | 1 +
log4j.spec | 11 +++++++++--
2 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/log4j.catalog b/log4j.catalog
index ae2faa3..82ce3be 100644
--- a/log4j.catalog
+++ b/log4j.catalog
@@ -2,3 +2,4 @@
-- JPackage Project <http://www.jpackage.org/> --
DOCTYPE log4j:configuration log4j.dtd
+PUBLIC "-//APACHE//DTD LOG4J 1.2//EN" log4j.dtd
diff --git a/log4j.spec b/log4j.spec
index 17ffdc4..49c821e 100644
--- a/log4j.spec
+++ b/log4j.spec
@@ -3,7 +3,7 @@
Name: log4j
Version: 1.2.17
-Release: 11%{?dist}
+Release: 12%{?dist}
Epoch: 0
Summary: Java logging package
BuildArch: noarch
@@ -146,6 +146,9 @@ if [ -x %{_bindir}/install-catalog -a -d %{_sysconfdir}/sgml ]; then
%{_datadir}/sgml/%{name}/catalog > /dev/null || :
fi
if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
+ %{_bindir}/xmlcatalog --noout --add public "-//APACHE//DTD LOG4J 1.2//EN" \
+ file://%{_datadir}/sgml/%{name}/log4j.dtd %{_sysconfdir}/xml/catalog \
+ > /dev/null
%{_bindir}/xmlcatalog --noout --add system log4j.dtd \
file://%{_datadir}/sgml/%{name}/log4j.dtd %{_sysconfdir}/xml/catalog \
> /dev/null || :
@@ -155,7 +158,8 @@ fi
%preun
if [ $1 -eq 0 ]; then
if [ -x %{_bindir}/xmlcatalog -a -w %{_sysconfdir}/xml/catalog ]; then
- %{_bindir}/xmlcatalog --noout --del log4j.dtd \
+ %{_bindir}/xmlcatalog --noout --del \
+ file://%{_datadir}/sgml/%{name}/log4j.dtd \
%{_sysconfdir}/xml/catalog > /dev/null || :
fi
fi
@@ -187,6 +191,9 @@ fi
%changelog
+* Tue May 14 2013 Ville Skyttä <ville.skytta at iki.fi> - 0:1.2.17-12
+- Add DTD public id to XML and SGML catalogs.
+
* Mon Apr 29 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 0:1.2.17-11
- Remove unneeded BR: maven-idea-plugin
More information about the scm-commits
mailing list