rpms/sgml-common/devel sgml-common.spec,1.21,1.22

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/sgml-common/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4689

Modified Files:
	sgml-common.spec 
Log Message:
mark xmlcatalog as config(noreplace) and move it to sysconfdir to prevent overwriting of it(make symlink in old destination)


Index: sgml-common.spec
===================================================================
RCS file: /cvs/extras/rpms/sgml-common/devel/sgml-common.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sgml-common.spec	30 Jun 2008 05:36:06 -0000	1.21
+++ sgml-common.spec	4 Jul 2008 16:09:34 -0000	1.22
@@ -1,6 +1,6 @@
 Name: sgml-common
 Version: 0.6.3
-Release: 24%{?dist}
+Release: 25%{?dist}
 Group: Applications/Text
 
 Summary: Common SGML catalog and DTD files
@@ -70,6 +70,7 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR="$RPM_BUILD_ROOT" htmldir='%{_datadir}/doc' INSTALL='install -p'
 mkdir $RPM_BUILD_ROOT%{_sysconfdir}/xml
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/sgml/docbook
 # Create an empty XML catalog.
 XMLCATALOG=$RPM_BUILD_ROOT%{_sysconfdir}/xml/catalog
@@ -77,21 +78,23 @@
 # Now put the common DocBook entries in it
 %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
 	"-//OASIS//ENTITIES DocBook XML" \
-	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+	"file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
 	"-//OASIS//DTD DocBook XML" \
-	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+	"file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 %{_bindir}/xmlcatalog --noout --add "delegatePublic" \
 	"ISO 8879:1986" \
-	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+	"file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 %{_bindir}/xmlcatalog --noout --add "delegateSystem" \
 	"http://www.oasis-open.org/docbook/" \
-	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+	"file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 %{_bindir}/xmlcatalog --noout --add "delegateURI" \
 	"http://www.oasis-open.org/docbook/" \
-	"file://%{_datadir}/sgml/docbook/xmlcatalog" $XMLCATALOG
+	"file://%{_sysconfdir}/sgml/docbook/xmlcatalog" $XMLCATALOG
 # Also create the common DocBook catalog
 %{_bindir}/xmlcatalog --noout --create \
+	$RPM_BUILD_ROOT%{_sysconfdir}/sgml/docbook/xmlcatalog
+ln -s %{_sysconfdir}/sgml/docbook/xmlcatalog\
 	$RPM_BUILD_ROOT%{_datadir}/sgml/docbook/xmlcatalog
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/sgml/xml.dcl
@@ -129,12 +132,18 @@
 %defattr (-,root,root,-)
 %dir %{_sysconfdir}/xml
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/xml/catalog
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/sgml/docbook/xmlcatalog
 %dir %{_datadir}/sgml
 %dir %{_datadir}/sgml/docbook
-%verify(not md5 size mtime) %{_datadir}/sgml/docbook/xmlcatalog
+%{_datadir}/sgml/docbook/xmlcatalog
 %dir %{_datadir}/xml
 
 %changelog
+* Tue Jul 01 2008 Ondrej Vasik <ovasik at redhat.com> 0.6.3-25
+- mark xmlcatalog config(noreplace) to prevent overwriting
+  of the content, move it to sysconfdir and make symlink for
+  it to silence rpmlint
+
 * Mon Jun 30 2008 Ondrej Vasik <ovasik at redhat.com> 0.6.3-24
 - mark catalog files as (not md5 size mtime) for verify to
   prevent info about changed files (#453271)