rpms/rarian/F-8 scrollkeeper-omf.dtd, NONE, 1.1 .cvsignore, 1.4, 1.5 rarian.spec, 1.10, 1.11 sources, 1.4, 1.5
Matthew Barnes (mbarnes)
fedora-extras-commits at redhat.com
Mon Feb 11 19:49:18 UTC 2008
Author: mbarnes
Update of /cvs/pkgs/rpms/rarian/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5289
Modified Files:
.cvsignore rarian.spec sources
Added Files:
scrollkeeper-omf.dtd
Log Message:
* Mon Feb 11 2008 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-3
- 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/F-8/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 12 Sep 2007 18:45:42 -0000 1.4
+++ .cvsignore 11 Feb 2008 19:48:41 -0000 1.5
@@ -1 +1,2 @@
rarian-0.6.0.tar.bz2
+scrollkeeper-omf.dtd
Index: rarian.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/F-8/rarian.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rarian.spec 6 Nov 2007 20:25:51 -0000 1.10
+++ rarian.spec 11 Feb 2008 19:48:41 -0000 1.11
@@ -2,18 +2,21 @@
Name: rarian
Version: 0.6.0
-Release: 2%{?dist}
+Release: 3%{?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
+* Mon Feb 11 2008 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-3
+- Install XML DTD for scrollkeeper OMF files (RH bug #431088).
+
* Tue Nov 06 2007 Matthew Barnes <mbarnes at redhat.com> - 0.6.0-2
- Own /usr/share/help (RH bug #363311).
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/rarian/F-8/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 12 Sep 2007 18:45:42 -0000 1.4
+++ sources 11 Feb 2008 19:48:41 -0000 1.5
@@ -1 +1,2 @@
23772a3b0f882d13c86dd9fa67bb21bf rarian-0.6.0.tar.bz2
+7839f69862f7bd200a43615f922f2f61 scrollkeeper-omf.dtd
More information about the fedora-extras-commits
mailing list