Fixes according to latest guidelines

- Fix maven depmap

bsf.spec

@@ -30,7 +30,7 @@
 
 Name:           bsf
 Version:        2.4.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 Epoch:          0
 Summary:        Bean Scripting Framework
 License:        ASL 2.0
@@ -48,15 +48,12 @@ BuildRequires:  xalan-j2
 BuildRequires:  jython
 BuildRequires:  apache-commons-logging
 BuildRequires:  rhino
-Requires:	apache-commons-logging
+Requires:	    apache-commons-logging
 Requires:       servlet6
 Requires:       xalan-j2
 Requires:       tomcat6-jsp-2.1-api
 Requires:       jpackage-utils
-Requires(post):	  jpackage-utils
-Requires(postun): jpackage-utils
 BuildArch:      noarch
-BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 Bean Scripting Framework (BSF) is a set of Java classes which provides
@@ -87,6 +84,7 @@ engines:
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -101,9 +99,9 @@ find . -name "*.jar" -exec %{__rm} -f {} \;
 %patch1 -p1
 
 %build
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java 
+[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
 export CLASSPATH=$(build-classpath apache-commons-logging jython xalan-j2 servlet jsp rhino)
-ant jar 
+ant jar
 %{__rm} -rf bsf/src/org/apache/bsf/engines/java
 ant javadocs
 
@@ -112,41 +110,34 @@ ant javadocs
 # jar
 %{__install} -d -m 755 %{buildroot}%{_javadir}
 %{__install} -m 644 build/lib/%{name}.jar \
-%{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do \
-ln -sf ${jar} ${jar/-%{version}/}; done)
+             %{buildroot}%{_javadir}/%{name}.jar
 # javadoc
-%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-(cd %{buildroot}%{_javadocdir} && ln -sf %{name}-%{version} %{name})
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%{__install} -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+%{__cp} -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}
 
 %{__install} -DTm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_to_maven_depmap org.apache.bsf %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.bsf:%{name}"
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-%{__rm} -rf %{buildroot}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-20
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
-%defattr(-,root,root)
 %doc LICENSE.txt AUTHORS.txt CHANGES.txt NOTICE.txt README.txt TODO.txt RELEASE-NOTE.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
 
 %files javadoc
-%defattr(-,root,root)
-%dir %{_javadocdir}/%{name}-%{version}
-%{_javadocdir}/%{name}-%{version}/*
+%doc LICENSE.txt NOTICE.txt
 %{_javadocdir}/%{name}
 
 %changelog
+* Fri Dec  2 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:2.4.0-10
+- Fixes according to latest guidelines
+- Fix maven depmap
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.4.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -236,7 +227,7 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 * Mon Jan 13 2003 David Walluck <david@anti-microsoft.org> 2.3.0-1jpp
 - version 2.3.0 (first jakarta release)
 
-* Tue May 07 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.2-5jpp 
+* Tue May 07 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 2.2-5jpp
 - vendor, distribution, group tags
 - versioned dir for javadoc
 - section macro