[ws-commons-util] Fix OSGi manifest.

[Alexander Kurtakov]

commit 6abb81e93a11d728330e1514460309b44d5ba136
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Apr 17 14:53:10 2012 +0300

    Fix OSGi manifest.
    
    - Adapt to current guidelines.

 ws-commons-util-addosgimanifest.patch |    4 ++--
 ws-commons-util.spec                  |   25 ++++++-------------------
 2 files changed, 8 insertions(+), 21 deletions(-)
---
diff --git a/ws-commons-util-addosgimanifest.patch b/ws-commons-util-addosgimanifest.patch
index cfcc9c1..9695559 100644
--- a/ws-commons-util-addosgimanifest.patch
+++ b/ws-commons-util-addosgimanifest.patch
@@ -14,8 +14,8 @@
 +			    <Bundle-Name>%Bundle-Name</Bundle-Name>
 +			    <Bundle-Localization>plugin</Bundle-Localization>
 +			    <Bundle-SymbolicName>org.apache.ws.commons.util</Bundle-SymbolicName>
-+			    <Bundle-Version>1.0.0.qualifier</Bundle-Version>
-+			    <Export-Package>org.apache.ws.commons.serialize;version="1.0.0", org.apache.ws.commons.util;version="1.0.0"</Export-Package>
++			    <Bundle-Version>1.0.1</Bundle-Version>
++			    <Export-Package>org.apache.ws.commons.serialize;version="1.0.1", org.apache.ws.commons.util;version="1.0.1"</Export-Package>
 +			    <Import-Package>javax.xml, javax.xml.namespace, org.w3c.dom, org.xml.sax, org.xml.sax.ext, org.xml.sax.helpers</Import-Package>
 +			    <Bundle-RequiredExecutionEnvironment>J2SE-1.4, CDC-1.0/Foundation-1.0, J2SE-1.3</Bundle-RequiredExecutionEnvironment>
 +			</manifestEntries>
diff --git a/ws-commons-util.spec b/ws-commons-util.spec
index 8b40b00..86240a2 100644
--- a/ws-commons-util.spec
+++ b/ws-commons-util.spec
@@ -1,6 +1,6 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        20%{?dist}
+Release:        21%{?dist}
 Summary:        Common utilities from the Apache Web Services Project
 
 Group:          System Environment/Libraries
@@ -27,9 +27,6 @@ BuildRequires:  maven-doxia-sitetools
 BuildRequires:  junit
 BuildRequires:  java-javadoc
 
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
 %description
 This is version 1.0.1 of the common utilities from the Apache Web
 Services Project.
@@ -57,25 +54,11 @@ install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
 install -Dm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 
 # ... and maven depmap
-%add_to_maven_depmap org.apache.ws.commons %{name} %{version} JPP %{name}
-# and alternative depmap used by upstream
-%add_to_maven_depmap org.apache.ws.commons.util %{name} %{version} JPP %{name}
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.ws.commons.util:%{name}"
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-
 %files
 %doc LICENSE.txt
 %{_javadir}/*.jar
@@ -87,6 +70,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Apr 17 2012 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-21
+- Fix OSGi manifest.
+- Adapt to current guidelines.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild