rpms/rarian/devel scrollkeeper-omf.dtd, NONE, 1.1 .cvsignore, 1.6, 1.7 rarian.spec, 1.12, 1.13

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/rarian/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8725

Modified Files:
	.cvsignore rarian.spec 
Added Files:
	scrollkeeper-omf.dtd 
Log Message:

* Sat Feb 09 2008 Matthew Barnes <mbarnes at redhat.com> - 0.7.1-2
- Install XML DTD for scrollkeeper OMF files (RH bug #431088).



***** Error reading new file: [Errno 2] No such file or directory: 'scrollkeeper-omf.dtd'

Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Jan 2008 16:18:45 -0000	1.6
+++ .cvsignore	10 Feb 2008 02:56:13 -0000	1.7
@@ -1 +1,2 @@
 rarian-0.7.1.tar.bz2
+scrollkeeper-omf.dtd


Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/devel/rarian.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- rarian.spec	8 Jan 2008 16:18:45 -0000	1.12
+++ rarian.spec	10 Feb 2008 02:56:13 -0000	1.13
@@ -2,18 +2,21 @@
 
 Name: rarian
 Version: 0.7.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2+
 Group: System Environment/Base
 Summary: Rarian is a documentation meta-data library
 URL: http://ftp.gnome.org/pub/gnome/sources/rarian
 Source: http://ftp.gnome.org/pub/gnome/sources/rarian/0.5/rarian-%{version}.tar.bz2
+Source1: scrollkeeper-omf.dtd
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ### Dependencies ###
 
+Requires: libxml2
+# for /usr/bin/xmlcatalog
 Requires: libxslt
-# (for /usr/bin/xsltproc)
+# for /usr/bin/xsltproc
 Requires: coreutils, util-linux, gawk
 # for basename, getopt, awk, etc
 
@@ -62,6 +65,9 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/xml/scrollkeeper/dtds
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xml/scrollkeeper/dtds
+
 rm -rf $RPM_BUILD_ROOT%{_libdir}/librarian.a
 rm -rf $RPM_BUILD_ROOT%{_libdir}/librarian.la
 
@@ -73,8 +79,26 @@
 %post compat
 %{_bindir}/rarian-sk-update
 
+# Add OMF DTD to XML catalog.
+CATALOG=/etc/xml/catalog
+/usr/bin/xmlcatalog --noout --add "rewriteSystem" \
+  "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" \
+  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+/usr/bin/xmlcatalog --noout --add "rewriteURI" \
+  "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd" \
+  "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+
 %postun -p /sbin/ldconfig
 
+%postun compat
+
+# Delete OMF DTD from XML catalog.
+if [ $1 = 0 ]; then
+  CATALOG=/etc/xml/catalog
+  /usr/bin/xmlcatalog --noout --del \
+    "/usr/share/xml/scrollkeeper/dtds/scrollkeeper-omf.dtd" $CATALOG
+fi
+
 %files
 %defattr(-,root,root,-)
 %doc README COPYING COPYING.LIB COPYING.UTILS ChangeLog NEWS AUTHORS
@@ -87,6 +111,7 @@
 %defattr(-,root,root,-)
 %{_bindir}/rarian-sk-*
 %{_bindir}/scrollkeeper-*
+%{_datadir}/xml/scrollkeeper
 
 %files devel
 %defattr(644,root,root,755)
@@ -95,6 +120,9 @@
 %{_libdir}/pkgconfig/rarian.pc
 
 %changelog
+* Sat Feb 09 2008 Matthew Barnes <mbarnes at redhat.com> - 0.7.1-2
+- Install XML DTD for scrollkeeper OMF files (RH bug #431088).
+
 * Tue Jan 08 2008 - Bastien Nocera <bnocera at redhat.com> - 0.7.1-1
 - Update to 0.7.1