SPECS (DEVEL): maven.spec - java.home hacks (patch0 and MAVEN_OPTS) - it %%...

[pawelz]

Author: pawelz                       Date: Wed Mar 25 20:38:19 2009 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- java.home hacks (patch0 and MAVEN_OPTS)
- it %%builds now
- TODO
- NFY

---- Files affected:
SPECS:
   maven.spec (1.16.2.1 -> 1.16.2.2) 

---- Diffs:

================================================================
Index: SPECS/maven.spec
diff -u SPECS/maven.spec:1.16.2.1 SPECS/maven.spec:1.16.2.2
--- SPECS/maven.spec:1.16.2.1	Wed Mar 25 14:54:23 2009
+++ SPECS/maven.spec	Wed Mar 25 21:38:13 2009
@@ -1,7 +1,12 @@
 # $Revision$, $Date$
+# TODO:
+# - %%install and %%files sections
+# - jppize (offline-mode)
+# - patch build.xml to use system jars, it must not download anything
+# - package classworlds
 
 Summary:	Java project management and project comprehension tool
-Summary(pl.UTF-8):	Narzędzie do zarządzania projektami Javy ułatwiajęce ich zrozumienie
+Summary(pl.UTF-8):	Narzędzie do zarządzania projektami Javy ułatwiające ich zrozumienie
 Name:		maven
 Version:	2.0.10
 Release:	1.1
@@ -9,8 +14,10 @@
 Group:		Development/Languages/Java
 Source0:	%{name}-%{version}.tar.bz2
 # Source0-md5:	f7db6421681782be0dff40bf82c8e246
+Patch0:		%{name}-build.patch
 URL:		http://maven.apache.org/
-Requires:	jdk
+BuildRequires:	ant
+Requires:	jdk >= 1.4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -41,6 +48,21 @@
 %prep
 %setup -q
 
+%patch -p0
+
+# I believe this test is broken, not the maven itself.
+mv ./maven-project/src/test/java/org/apache/maven/project/path/DefaultPathTranslatorTest.java{,.disabled}
+
+%build
+
+# maven sux. Why on earth maven expects java.home property to point to JRE not
+# JDK, and $JAVA_HOME env variable to JDK not JRE?
+M2_HOME=/usr/share/maven
+MAVEN_OPTS="-Djava.home=$JAVA_HOME/jre"
+export M2_HOME
+export MAVEN_OPTS
+%ant clean-bootstrap init maven-compile
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/bin}
@@ -72,6 +94,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.16.2.2  2009/03/25 20:38:13  pawelz
+- java.home hacks (patch0 and MAVEN_OPTS)
+- it %%builds now
+- TODO
+- NFY
+
 Revision 1.16.2.1  2009/03/25 13:54:23  pawelz
 - 2.0.10
 - use source package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/maven.spec?r1=1.16.2.1&r2=1.16.2.2&f=u