[jetty] Fix upgrade path problems

[Stanislav Ochotnicky]

commit 518967e63ba19fc8021dd2af0c32acd377439949
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Mon Jan 30 09:49:07 2012 +0100

    Fix upgrade path problems
    
    - Symlink conf files into etc (so users still see them there)

 jetty.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/jetty.spec b/jetty.spec
index f9c52b8..35342e4 100644
--- a/jetty.spec
+++ b/jetty.spec
@@ -42,7 +42,7 @@
 
 Name:           jetty
 Version:        8.1.0
-Release:        0.3.rc5%{?dist}
+Release:        0.4.rc5%{?dist}
 Summary:        Java Webserver and Servlet Container
 
 Group:          Applications/Internet
@@ -311,11 +311,18 @@ ln -s %{appdir} %{buildroot}%{homedir}/webapps
 rm %{buildroot}%{homedir}/*.txt  %{buildroot}%{homedir}/*.html
 
 # following seem like config directories
-for cdir in overlays resources;do
+for cdir in overlays;do
    mv %{buildroot}%{homedir}/$cdir %{buildroot}/%{confdir}/$cdir
    ln -s %{confdir}/$cdir %{buildroot}%{homedir}/$cdir
 done
 
+# this should be symlinked the other way around but rpm doesn't let us
+# do that! BAD BAD rpm
+# https://bugzilla.redhat.com/show_bug.cgi?id=447156
+for cdir in contexts contexts-available resources;do
+    ln -sf %{homedir}/$cdir %{buildroot}/%{confdir}/$cdir
+done
+
 # javadocs
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
@@ -368,6 +375,10 @@ fi
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jan 30 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 8.1.0-0.4.rc5
+- Fix upgrade path problems
+- Symlink conf files into etc (so users still see them there)
+
 * Thu Jan 26 2012 Alexander Kurtakov <akurtako at redhat.com> 8.1.0-0.3.rc5
 - Revert the dependency on jetty-parent - we don't need the whole maven stack when installing jetty.
 - Make the javadoc package not depend on the main one.