From efa573d0db8527484f8e43d5b03f3232924bee22 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@fedoraproject.org>
Date: Feb 02 2009 19:52:49 +0000
Subject: - Resolves #473585


---

diff --git a/jetty.spec b/jetty.spec
index c8a4c22..d7e16a4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -46,15 +46,17 @@
 %define confdir     %{_sysconfdir}/%{name}
 %define logdir      %{_localstatedir}/log/%{name}
 %define homedir     %{_datadir}/%{name}
-%define tempdir     %{_localstatedir}/cache/%{name}/temp
+%define jettycachedir %{_localstatedir}/cache/%{name}
+%define tempdir     %{jettycachedir}/temp
 %define rundir      %{_localstatedir}/run/%{name}
-%define libdir      %{_localstatedir}/lib/%{name}/lib
-%define appdir      %{_localstatedir}/lib/%{name}/webapps
-%define demodir     %{_localstatedir}/lib/%{name}/demo
+%define jettylibdir %{_localstatedir}/lib/%{name}
+%define libdir      %{jettylibdir}/lib
+%define appdir      %{jettylibdir}/webapps
+%define demodir     %{jettylibdir}/demo
 
 Name:           jetty
 Version:        5.1.14
-Release:        1.7%{?dist}
+Release:        1.8%{?dist}
 Summary:        The Jetty Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -168,6 +170,7 @@ platforms.
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       %{name} = %{version}
 
 %description    javadoc
 %{summary}.
@@ -536,7 +539,8 @@ fi
 %{_javadir}/%{name}/%{name}-jmx.jar
 %{_javadir}/%{name}/%{name}-servlet.jar
 %config(noreplace) %{confdir}
-%dir %{libdir}
+%dir %{jettylibdir}
+%dir %{jettycachedir}
 %{libdir}/org.mortbay.jetty.jar
 %{libdir}/org.mortbay.jmx.jar
 %dir %{homedir}
@@ -549,6 +553,7 @@ fi
 %attr(755, jetty, jetty) %{tempdir}
 %attr(755, jetty, jetty) %{rundir}
 %dir %{appdir}
+%dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/LICENSE.TXT
 %doc %{_docdir}/%{name}-%{version}/VERSION.TXT
 %{_sysconfdir}/init.d/%{name}
@@ -601,8 +606,10 @@ fi
 %endif
 
 %changelog
-* Tue Jan 06 2009 Jeff Johnston <jjohnstn@redhat.com> 5.1.14-1.7
+* Mon Feb 02 2009 Jeff Johnston <jjohnstn@redhat.com> 5.1.14-1.8
 - Resolves #473585
+
+* Tue Jan 06 2009 Jeff Johnston <jjohnstn@redhat.com> 5.1.14-1.7
 - Patch init.d script to add status operation
 - Patch unix djetty script so it doesn't issue error messages about /dev/tty
   and fix various inconsistencies with the init.d script