rpms/ws-commons-util/devel ws-commons-util.spec,1.12,1.13

[Andrew Overholt]

Author: overholt

Update of /cvs/pkgs/rpms/ws-commons-util/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5210

Modified Files:
	ws-commons-util.spec 
Log Message:
* Tue Jan 13 2009 Andrew Overholt <overholt at redhat.com> 1.0.1-13
- Add missing maven-surefire-provider-junit BR.
- Remove gcj support
- Add ability to build with ant and not maven


Index: ws-commons-util.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ws-commons-util/devel/ws-commons-util.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- ws-commons-util.spec	27 Jul 2009 07:28:38 -0000	1.12
+++ ws-commons-util.spec	13 Jan 2010 17:05:39 -0000	1.13
@@ -1,16 +1,27 @@
+%global         with_maven 1
+
 Name:           ws-commons-util
 Version:        1.0.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        Common utilities from the Apache Web Services Project 
 
 Group:          System Environment/Libraries
 License:        ASL 2.0
 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
+%if ! %{with_maven}
+# Generated with mvn ant:ant and MANIFEST.MF added to jar task
+Source1:        build.xml
+Source2:        maven-build.xml
+Source3:        MANIFEST.MF
+%else
 Patch0:         %{name}-addosgimanifest.patch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch:      noarch
 
 BuildRequires:  jpackage-utils >= 1.5
+%if %{with_maven}
 BuildRequires:  maven2
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-compiler
@@ -20,35 +31,46 @@ BuildRequires:  maven2-plugin-assembly
 BuildRequires:  maven2-plugin-javadoc
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-surefire
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  maven2-plugin-eclipse
+%else
+BuildRequires:  ant
+%endif
 BuildRequires:  junit
 BuildRequires:  java-javadoc
 
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
-
 %description 
 This is version 1.0.1 of the common utilities from the Apache Web
 Services Project.
 
 %package        javadoc
 Summary:        Javadoc for %{name}
-Group:          Development/Documentation
+Group:          Documentation
 
 %description    javadoc
 %{summary}.
 
 %prep
 %setup -q -n %{name}-%{version}
+%if ! %{with_maven}
+cp -p %{SOURCE1} .
+cp -p %{SOURCE2} .
+cp -p %{SOURCE3} .
+%else
 %patch0
+%endif
 
 %build
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
+%if %{with_maven}
 mvn-jpp \
   -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
   install javadoc:javadoc
+%else
+ant -Dmaven.mode.offline=true -Dmaven.repo.local=`pwd`/.m2 \
+  -Djunit.skipped=true -Dmaven.test.skip=true javadoc package
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -61,20 +83,13 @@ install -dm 755 $RPM_BUILD_ROOT%{_javado
 cp -pR target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
-aot-compile-rpm
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p %{_bindir}/rebuild-gcj-db
-
-%postun -p %{_bindir}/rebuild-gcj-db
-
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt
 %{_javadir}/*.jar
-%{_libdir}/gcj/*
 
 %files javadoc
 %defattr(644,root,root,755)
@@ -82,6 +97,11 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jan 13 2009 Andrew Overholt <overholt at redhat.com> 1.0.1-13
+- Add missing maven-surefire-provider-junit BR.
+- Remove gcj support
+- Add ability to build with ant and not maven
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild