X-Git-Url: http://git.pld-linux.org/?p=packages%2Fmaven.git;a=blobdiff_plain;f=maven.spec;h=3cfaacebdab994d54e0b27c33dae52b42b873f1f;hp=07edad774b989648429d41aaea07bdaf6745f219;hb=acfff6e35ab695455e7068714cd3467ff4fb97ec;hpb=e0d893ceb206b36176133d61ba7f7c96619b2242

diff --git a/maven.spec b/maven.spec
index 07edad7..3cfaace 100644
--- a/maven.spec
+++ b/maven.spec
@@ -1,71 +1,72 @@
-
 # TODO:
-#  - cleanups in lib directory -- replace jar files 
-#    with package dependencies
-
-%define		beta	beta-10
+# - cleanups in lib directory -- replace jar files
+#   with package dependencies
+# - use source package
+# - patch for --local-repository: http://codehaus01a.managed.contegix.com/browse/MNG-939
+# - jpp sync http://www.jpackage.org/cgi-bin/viewvc.cgi/rpms/free/maven2/?root=jpackage&pathrev=JPACKAGE-1_7
 
 Summary:	Java project management and project comprehension tool
-Summary(pl):	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
-%define		buildname	%{version}-%{beta}
-Release:	0.%(echo %{beta}|tr - .)
-Group:		Development/Languages/Java
+Version:	2.0.10
+Release:	1
 License:	Apache
-Source0:	http://maven.apache.org/builds/release/%{buildname}/maven-%{buildname}.tar.gz
-# Source0-md5:	4179bd3fdb5371f6c59424194447ecde
-Patch0:		%{name}-MAVEN_HOME.patch
+Group:		Development/Languages/Java
+Source0:	http://www.apache.org/dist/maven/binaries/apache-%{name}-%{version}-bin.tar.bz2
+# Source0-md5:	244b216dedd433d5277e72193dffc70e
 URL:		http://maven.apache.org/
-Requires:	jre
+Requires:	jdk
 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
-# maven
+%description -l pl.UTF-8
+Maven to narzędzie do zarządzania projektami w Javie, ułatwiające ich
+zrozumienie. Jest oparty na idei obiektowego modelu projektu (POM -
+Project Object Model), w której wszystkie wytwory Mavena są wynikiem
+konsultowania z dobrze zdefiniowanym modelem projektu.
+
+Intencją Mavena jest uczynić rozwój wewnątrzprojektowy wysoko
+zarządzalnym w nadziei pozostawienia większej ilości czasu na rozwój
+międzyprojektowy. Można to nazwać zapylaniem międzyprojektowym lub
+dzieleniem wiedzy o rozwoju projektów - do tego Maven próbuje
+zachęcić.
 
 %prep
-%setup -q -n %{name}-%{buildname}
-%patch0 -p1
+%setup -q -n apache-%{name}-%{version}
 
 %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 -s %{_datadir}/%{name}/bin/maven $RPM_BUILD_ROOT/%{_bindir}/maven
-
-install -d $RPM_BUILD_ROOT%{_datadir}/%{name}
-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)
-%{_bindir}/maven
-
-%attr(755,root,root) %{_datadir}/%{name}/bin/maven
-%{_datadir}/%{name}/bin/forehead.conf
+%doc NOTICE.txt
+%attr(755,root,root) %{_bindir}/mvn
+%dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/bin
+%{_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