From bc046f78e042fd5b70d05b46e3416fd1f286eba6 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Mon, 19 Dec 2005 13:48:52 +0000
Subject: [PATCH] - Fix location of catalog.

---
 openjade.spec | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/openjade.spec b/openjade.spec
index a855587..0e4ae1b 100644
--- a/openjade.spec
+++ b/openjade.spec
@@ -1,7 +1,7 @@
 Summary: A DSSSL implementation.
 Name: openjade
 Version: 1.3.2
-Release: 20
+Release: 21
 Prereq: sgml-common >= 0.5
 Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
 Patch0: openjade-ppc64.patch
@@ -34,7 +34,7 @@ XML, RTF, TeX, MIF (FrameMaker), SGML, or XML.
 
 %build
 
-%configure --disable-static --datadir=%{_datadir}/sgml/%{name} \
+%configure --disable-static --datadir=%{_datadir}/sgml/%{name}-%{version} \
 	--enable-splibdir=%{_libdir}
 make %{?_smp_mflags}
 
@@ -53,8 +53,8 @@ ln -s openjade $RPM_BUILD_ROOT/%{prefix}/bin/jade
 echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
 
 # install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade 
-cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}/
-cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}/
+cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/
+cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/
 
 # add unversioned/versioned catalog and symlink
 mkdir -p $RPM_BUILD_ROOT/etc/sgml
@@ -89,10 +89,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %{_libdir}/*.so.*
 %{_mandir}/*/*
-%{_datadir}/sgml/%{name}
+%{_datadir}/sgml/%{name}-%{version}
 %{_libdir}/*.la
 
 %changelog
+* Mon Dec 19 2005 Tim Waugh <twaugh@redhat.com> 1.3.2-21
+- Fix location of catalog.
+
 * Tue Dec 13 2005 Tim Waugh <twaugh@redhat.com> 1.3.2-20
 - Use --enable-splibdir to prevent ambiguity.
 - Move 'install-catalog --remove' to %%preun section (bug #60409).