[jython/f17] Added Maven depmap

[Marek Goldmann]

commit f320f806c972919af640c2d99b904f213f791280
Author: Marek Goldmann <goldmann at fedoraproject.org>
Date:   Tue Jun 19 19:18:37 2012 +0200

    Added Maven depmap

 jython-dont-validate-pom.patch |   12 ++++++++++++
 jython.spec                    |   23 +++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/jython-dont-validate-pom.patch b/jython-dont-validate-pom.patch
new file mode 100644
index 0000000..6b381df
--- /dev/null
+++ b/jython-dont-validate-pom.patch
@@ -0,0 +1,12 @@
+diff -Naur jython-svn-Release_2_2_1/maven/build.xml jython-svn-Release_2_2_1-work/maven/build.xml
+--- jython-svn-Release_2_2_1/maven/build.xml	2007-03-26 22:02:00.000000000 +0200
++++ jython-svn-Release_2_2_1-work/maven/build.xml	2012-06-19 19:06:07.964999996 +0200
+@@ -114,7 +114,7 @@
+ 	<!-- 
+ 		Performs Maven build staging
+ 	-->
+-	<target name="stage" depends="validate-pom">
++	<target name="stage">
+ 		<property name="stage" value="${build}/"/>
+ 		<mkdir dir="${stage}"/>
+ 		
diff --git a/jython.spec b/jython.spec
index 5916fa8..8f07373 100644
--- a/jython.spec
+++ b/jython.spec
@@ -7,7 +7,7 @@
 
 Name:                      jython
 Version:                   2.2.1
-Release:                   8%{?dist}
+Release:                   9%{?dist}
 Summary:                   A Java implementation of the Python language
 License:                   ASL 1.1 and BSD and CNRI and JPython and Python
 URL:                       http://www.jython.org/
@@ -23,7 +23,8 @@ Patch0:                    %{name}-cachedir.patch
 # Also, copy python's license from source directory and not
 # ${python.home}
 Patch1:                    %{name}-nofullbuildpath.patch
-Requires:                  jpackage-utils >= 0:1.5
+Patch2:                    jython-dont-validate-pom.patch
+Requires:                  jpackage-utils
 Requires:                  jakarta-oro
 Requires:                  servlet
 Requires:                  python >= %{cpython_version}
@@ -38,6 +39,7 @@ BuildRequires:             python >= %{cpython_version}
 BuildRequires:             PyXML >= %{pyxml_version}
 BuildRequires:             servlet
 BuildRequires:             java-devel >= 1:1.6.0
+BuildRequires:             jpackage-utils
 Requires:                  java >= 1:1.6.0
 Group:                     Development/Languages
 
@@ -87,6 +89,7 @@ Demonstrations and samples for %{name}.
 %setup -q -n %{name}-svn-%{svn_tag}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 export CLASSPATH=$(build-classpath mysql-connector-java oro servlet)
@@ -115,6 +118,11 @@ pushd dist
   done
 popd
 
+# Create Maven POM's
+pushd maven
+  ant -Dproject.version=%{version} install
+popd
+
 %install
 # jar
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -137,6 +145,12 @@ cp -pr dist/Demo $RPM_BUILD_ROOT%{_datadir}/%{name}
 rm -rf dist/Doc/javadoc
 mv dist/Doc %{name}-manual-%{version}
 
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+install -pm 644 build/maven/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+
+# depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.python:jython-standalone"
 
 # registry
 install -m 644 registry $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -209,6 +223,8 @@ EOF
 %{_datadir}/%{name}/Lib
 %{_datadir}/%{name}/Tools
 %{_datadir}/%{name}/registry
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(-,root,root)
@@ -226,6 +242,9 @@ EOF
 %doc %{_datadir}/%{name}/Demo
 
 %changelog
+* Tue Jun 19 2012 Marek Goldmann <mgoldman at redhat.com> - 2.2.1-9
+- Added Maven depmap
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild