X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=maven.spec;h=05e3873abca497d9b1413c27a72d3828d88eac61;hb=refs%2Fheads%2FDEVEL;hp=36f1be5f0e9b64c7913f75b367b77a87f4ecfc31;hpb=f2a68a385b9d5019b2f6f20519303464f23ac570;p=packages%2Fmaven.git

diff --git a/maven.spec b/maven.spec
index 36f1be5..05e3873 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,34 +1,41 @@
-
 # TODO:
-#  - cleanups in lib directory -- replace jar files 
-#    with package dependencies
+# - %%install and %%files sections
+# - jppize (offline-mode)
+# - patch build.xml to use system jars, it must not download anything
+# - package classworlds
+# - do not do that:
+#   [java] [INFO] Installing /home/users/z/rpm/BUILD/maven-2.0.10/apache-maven/target/apache-maven-2.0.10.jar to /home/users/z/.m2/repository/org/apache/maven/apache-maven/2.0.10/apache-maven-2.0.10.jar
+#   [java] [INFO] Installing /home/users/z/rpm/BUILD/maven-2.0.10/apache-maven/target/apache-maven-2.0.10-bin.tar.gz to /home/users/z/.m2/repository/org/apache/maven/apache-maven/2.0.10/apache-maven-2.0.10-bin.tar.gz
+#   [java] [INFO] Installing /home/users/z/rpm/BUILD/maven-2.0.10/apache-maven/target/apache-maven-2.0.10-bin.tar.bz2 to /home/users/z/.m2/repository/org/apache/maven/apache-maven/2.0.10/apache-maven-2.0.10-bin.tar.bz2
+#   [java] [INFO] Installing /home/users/z/rpm/BUILD/maven-2.0.10/apache-maven/target/apache-maven-2.0.10-bin.zip to /home/users/z/.m2/repository/org/apache/maven/apache-maven/2.0.10/apache-maven-2.0.10-bin.zip
 
 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:	1.0.2
-Release:	0.2
+Version:	2.0.10
+Release:	1.1
 License:	Apache
 Group:		Development/Languages/Java
-Source0:	http://www.apache.org/dist/maven/binaries/%{name}-%{version}.tar.gz
-# Source0-md5:	47624c83b907fa16e8257bc5b351f84a
-Patch0:		%{name}-MAVEN_HOME.patch
+Source0:	%{name}-%{version}.tar.bz2
+# Source0-md5:	f7db6421681782be0dff40bf82c8e246
+Patch0:		%{name}-build.patch
 URL:		http://maven.apache.org/
-Requires:	jre
+BuildRequires:	ant
+Requires:	jdk >= 1.4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Maven is a Java project management and project comprehension
-tool. Maven is based on the concept of a project object model
-(POM) in that all the artifacts produced by Maven are a result of
-consulting a well defined model for your project.
+Maven is a Java project management and project comprehension tool.
+Maven is based on the concept of a project object model (POM) in that
+all the artifacts produced by Maven are a result of consulting a well
+defined model for your project.
 
 The intent of Maven is to make intra-project development highly
 manageable in the hopes of providing more time for cross-project
 development. You might call it cross-project pollination or the
-sharing of project development knowledge, this is what Maven
-attempts to encourage.
+sharing of project development knowledge, this is what Maven attempts
+to encourage.
 
 %description -l pl.UTF-8
 Maven to narzędzie do zarządzania projektami w Javie, ułatwiające ich
@@ -44,33 +51,43 @@ zachęcić.
 
 %prep
 %setup -q
-%patch0 -p1
+
+%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}
+ln -sf %{_datadir}/%{name}/bin/mvn $RPM_BUILD_ROOT%{_bindir}/mvn
 
-install -d $RPM_BUILD_ROOT%{_bindir}
-ln -sf %{_datadir}/%{name}/bin/maven $RPM_BUILD_ROOT%{_bindir}/maven
-
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
-install bin/maven $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
-install bin/forehead.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
-cp -r lib $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp -r plugins $RPM_BUILD_ROOT%{_datadir}/%{name}
-#cp -r repository $RPM_BUILD_ROOT%{_datadir}/%{name}
-install maven-project.xsd $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -d $RPM_BUILD_ROOT
+install bin/mvn $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
+cp -a bin/m2.conf $RPM_BUILD_ROOT%{_datadir}/%{name}/bin
+cp -a boot conf lib $RPM_BUILD_ROOT%{_datadir}/%{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/maven
+%doc NOTICE.txt
+%attr(755,root,root) %{_bindir}/mvn
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/bin
-%attr(755,root,root) %{_datadir}/%{name}/bin/maven
-%{_datadir}/%{name}/bin/forehead.conf
+%{_datadir}/%{name}/bin/m2.conf
+%attr(755,root,root) %{_datadir}/%{name}/bin/mvn
+%{_datadir}/%{name}/boot
+%{_datadir}/%{name}/conf
 %{_datadir}/%{name}/lib
-%{_datadir}/%{name}/plugins
-#%{_datadir}/%{name}/repository
-%{_datadir}/%{name}/maven-project.xsd