Various cleanups in spec file

- Fix up add_to_maven_depmap
- Add jpackage-utils Requires for javadoc
- Cleanup install a bit (to be consistent with other commons)

apache-commons-logging.spec

@@ -1,11 +1,10 @@
 
 %global base_name  logging
 %global short_name commons-%{base_name}
-%global section    free
 
 Name:           apache-%{short_name}
 Version:        1.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -42,11 +41,10 @@ Requires(postun):jpackage-utils
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+# This should go away with F-17
 Provides:       jakarta-commons-logging = 0:%{version}-%{release}
 Obsoletes:      jakarta-commons-logging <= 0:1.0.4
 
-
-
 %description
 The commons-logging package provides a simple, component oriented
 interface (org.apache.commons.logging.Log) together with wrappers for
@@ -61,9 +59,11 @@ logging implementation.
 %package        javadoc
 Summary:        API documentation for %{name}
 Group:          Documentation
+Requires:       jpackage-utils
+
 
 %description    javadoc
-Javadoc for %{name}.
+%{summary}.
 
 # -----------------------------------------------------------------------------
 
@@ -95,12 +95,18 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 install -p -m 644 target/%{short_name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar
 install -p -m 644 target/%{short_name}-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-adapters-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
 
+pushd $RPM_BUILD_ROOT%{_javadir}
+for jar in *-%{version}*; do
+    ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
+    ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`
+done
+popd # come back from javadir
+
+# pom
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.maven %{name} %{version} JPP %{name}
+%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{name}
 
 
 # javadoc
@@ -132,11 +138,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(-,root,root,-)
-%{_javadocdir}/%{name}*
+%{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
 
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon May 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-5
+- Fix up add_to_maven_depmap
+- Add jpackage-utils Requires for javadoc
+- Cleanup install a bit
+
 * Fri May  7 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.1.1-4
 - Fix provides