- Merge with upstream version

- Add missing javadoc post and postun
- Add missing javadoc requires

jdepend.spec

@@ -36,7 +36,7 @@
 
 Name:		jdepend
 Version:	2.6
-Release:	5jpp_2fc
+Release:	6jpp.1
 Epoch:		0
 Summary:        Java Design Quality Metrics
 License:        Clarkware License
@@ -96,6 +96,7 @@ install -m 644 lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 rm -rf docs/api
 # demo
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -124,6 +125,16 @@ then
 fi
 %endif
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+  rm -f %{_javadocdir}/%{name}
+fi
+
+
 %files
 %defattr(-,root,root)
 %doc README LICENSE docs
@@ -136,12 +147,18 @@ fi
 %files javadoc
 %defattr(-,root,root)
 %{_javadocdir}/%{name}-%{version}
+%ghost %doc %{_javadocdir}/%{name}
 
 %files demo
 %defattr(-,root,root)
 %{_datadir}/%{name}
 
 %changelog
+* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> - 0:2.6-6jpp.1
+- Merge with upstream version
+ - Add missing javadoc post and postun
+ - Add missing javadoc requires
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:2.6-5jpp_2fc
 - Rebuilt