rpms/ws-commons-util/devel ws-commons-util.spec,1.1,1.2

[Andrew Overholt (overholt)]

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25481

Modified Files:
	ws-commons-util.spec 
Log Message:
* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
- maven-ify.
- Add OSGi MANIFEST information.


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ws-commons-util.spec	20 Mar 2007 01:49:46 -0000	1.1
+++ ws-commons-util.spec	13 Sep 2007 15:14:47 -0000	1.2
@@ -1,15 +1,24 @@
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
 License:        Apache Software License
 URL:            http://apache.osuosl.org/ws/commons/util/
 Source0:        http://apache.osuosl.org/ws/commons/util/sources/ws-commons-util-1.0.1-src.tar.gz
+Patch0:         %{name}-addosgimanifest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jpackage-utils >= 1.5
+BuildRequires:  maven2
+BuildRequires:  maven2-plugin-jar
+BuildRequires:  maven2-plugin-compiler
+BuildRequires:  maven2-plugin-source
+BuildRequires:  maven2-plugin-assembly
+BuildRequires:  maven2-plugin-javadoc
+BuildRequires:  junit
+BuildRequires:  java-javadoc
 
 BuildRequires:    java-gcj-compat-devel >= 1.0.31
 Requires(post):   java-gcj-compat >= 1.0.31
@@ -28,25 +37,24 @@
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
-
-cd src/main/java
-find ./ -name \*.java | xargs javac
-find ./ -name \*.class| xargs jar cvf %{name}-%{version}.jar
-mkdir html
-find ./ -name \*.java | xargs javadoc -d html
+export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
+mkdir -p $MAVEN_REPO_LOCAL
+mvn-jpp \
+  -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
+  install javadoc:javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd src/main/java
 install -dm 755 $RPM_BUILD_ROOT%{_javadir}
-install -pm 644 %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pR html/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 aot-compile-rpm
@@ -70,5 +78,9 @@
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Thu Sep 06 2007 Andrew Overholt <overholt at redhat.com> 1.0.1-2
+- maven-ify.
+- Add OSGi MANIFEST information.
+
 * Fri Mar 16 2007 Anthony Green <green at redhat.com> - 1.0.1-1
 - Created.