- empty-dep.pom must be named maven2-empty-dep.pom. I have no idea where this name...

[packages/maven.git] / maven.spec

diff --git a/maven.spec b/maven.spec
index d8a4fa8edc07c5d1ae2c2a95c0ace1420392aa5f..043b41b280089fe818ff27e69c534028bb625d1a 100644 (file)
--- a/maven.spec
+++ b/maven.spec
@@ -101,13 +101,18 @@ Patch18:  %{name}-plugins-jpprepolayout.patch
 Patch19:       %{name}-plugins-disableenforcer.patch
 Patch20:       %{name}-commons-cli-1.1.patch
 
+# Patches added by PLD
+Patch100:      %{name}-no-easymock.patch
+
 ### PLDIZED DEPENDENCIES {{{
 ### BRs {{{
 BuildRequires: ant >= 1.6.5
 BuildRequires: ant-junit
 BuildRequires: antlr >= 2.7.4
 BuildRequires: ant-nodeps
+BuildRequires: java(servlet)
 BuildRequires: java-bsh >= 1.3.0
+BuildRequires: java-classworlds >= 1.1
 BuildRequires: java-commons-beanutils >= 1.7.0
 BuildRequires: java-commons-cli >= 1.0
 BuildRequires: java-commons-collections >= 3.1
@@ -120,17 +125,21 @@ BuildRequires:    java-gnu-regexp >= 1.1.4
 BuildRequires: java-httpunit >= 1.6
 BuildRequires: java-jaxen >= 1.1
 BuildRequires: java-jdom >= 1.0
+BuildRequires: java-jsch >= 0.1.20
+BuildRequires: java-jtidy >= 1.0
 BuildRequires: java-junit >= 3.8.2
 BuildRequires: java-oro >= 2.0.8
 BuildRequires: java-plexus-utils >= 1.2
 BuildRequires: java-qdox >= 1.5
 BuildRequires: java-rhino >= 1.5
+BuildRequires: java-velocity >= 1.4
 BuildRequires: java-xalan >= 2.6.0
 BuildRequires: java-xerces >= 2.7.1
 BuildRequires: java-xmlunit
 BuildRequires: java-xom
 %{buildrequires_jdk}
 BuildRequires: jpackage-utils >= 0:1.7.2
+BuildRequires: maven-common-poms
 BuildRequires: rpmbuild(macros) >= 1.557
 BuildRequires: sed >= 4.0
 %if %{with itests}
@@ -143,7 +152,9 @@ BuildRequires:      saxon
 ### Rs {{{
 Requires:      ant >= 1.6.5
 Requires:      antlr >= 2.7.4
+Requires:      java(servlet)
 Requires:      java-bsh >= 1.3.0
+Requires:      java-classworlds >= 1.
 Requires:      java-commons-beanutils >= 1.7.0
 Requires:      java-commons-cli >= 1.0
 Requires:      java-commons-collections >= 3.1
@@ -156,6 +167,8 @@ Requires:   java-gnu-regexp >= 1.1.4
 Requires:      java-httpunit >= 1.6
 Requires:      java-jdom >= 1.0
 Requires:      java-junit >= 3.8.2
+Requires:      java-jsch >= 0.1.20
+Requires:      java-jtidy >= 1.0
 Requires:      java-oro >= 2.0.8
 Requires:      java-plexus-utils >= 1.2
 Requires:      java-qdox >= 1.5
@@ -164,28 +177,23 @@ Requires: java-xalan >= 2.6.0
 Requires:      java-xerces >= 2.7.1
 Requires:      java-xmlunit
 Requires:      java-xom
+Requires:      maven-common-poms
+Requires(post):        java-classworlds >= 1.1
 Requires(post):        java-commons-cli >= 1.0
 Requires(post):        java-commons-lang >= 2.1
 Requires(post):        java-commons-logging >= 1.0.4
 Requires(post):        java-jdom >= 1.0
+Requires(post):        java-jsch >= 0.1.20
 Requires(post):        java-plexus-utils >= 1.2
 Requires(post):        jpackage-utils >= 0:1.7.2
 Requires(postun):      jpackage-utils >= 0:1.7.2
 ### }}}
 ### END OF PLDIZED DEPENDENCIES }}}
 
-### DEPENDENCIES NOT PACKAGED FOR PLD {{{
-BuildRequires: java-velocity >= 1.4
-Requires:              velocity >= 1.4
-### }}}
-
 ### DEPENDENCIES THAT NEEDS INVESTIGATION {{{
 # Is java(mail) enough?
 BuildRequires: glassfish-javamail
 Requires:              glassfish-javamail
-# java(servlet)?
-BuildRequires: tomcat5-servlet-2.4-api
-Requires:              tomcat5-servlet-2.4-api
 # C library??? Or some java bindings?
 BuildRequires: xmlrpc
 Requires:              xmlrpc
@@ -198,12 +206,8 @@ BuildRequires:     aqute-bndlib
 #BuildRequires:        cglib >= 2.1.0
 BuildRequires: checkstyle4 >= 4.1
 BuildRequires: checkstyle4-optional >= 4.1
-BuildRequires: classworlds >= 1.1
 #BuildRequires:        jmock >= 1.0.1
 BuildRequires: jline >= 0.8.1
-BuildRequires: jsch >= 0.1.20
-BuildRequires: jtidy >= 1.0
-BuildRequires: maven2-common-poms >= 1.0-5
 BuildRequires: maven-jxr >= 1.0-2
 BuildRequires: maven-wagon >= 1.0-0.1.b2
 BuildRequires: maven-doxia >= 1.0-0.a9
@@ -271,16 +275,10 @@ BuildRequires:    plexus-resources
 Requires:      aqute-bndlib
 #Requires:     cglib >= 2.1.0
 Requires:      checkstyle4 >= 4.1
-Requires:      classworlds >= 1.
-Requires(post):        classworlds >= 1.1
 #Requires:     tomcat5-parent
 Requires:      jaxen >= 1.1
 #Requires:     jmock >= 1.0.1
 Requires:      jline >= 0.8.1
-Requires:      jsch >= 0.1.20
-Requires(post):        jsch >= 0.1.20
-Requires:      jtidy >= 1.0
-Requires:      maven2-common-poms >= 1.0-5
 Requires:      maven-jxr >= 1.0
 Requires:      maven-wagon >= 1.0-0.1.b2
 Requires(post):        maven-wagon >= 1.0-0.1.b2
@@ -1038,8 +1036,12 @@ sed -i -e "s|__EXTERNAL_REPO_PLACEHOLDER__|file://%{_datadir}/%{name}/repository
 
 # Copy the empty dependency jar/pom in place
 mkdir -p m2_repo/repository/JPP/maven2/default_poms
-cp -p %{SOURCE13} m2_repo/repository/JPP/maven2/default_poms/JPP.maven-empty-dep.pom
+cp -p %{SOURCE13} m2_repo/repository/JPP/maven2/default_poms/JPP.maven2-empty-dep.pom
 cp -p %{SOURCE14} m2_repo/repository/JPP/maven2/empty-dep.jar
+
+# Patches added by PLD
+find -name pom.xml -o -name '*.pom' | xargs sed -i 's#<version>1\.2_Java1\.3</version>#<version>1.2</version>#g'
+%patch100 -p1
 ### }}}
 
 ### build {{{
@@ -1092,7 +1094,7 @@ mkdir -p bootstrap/lib
 ln -sf $(build-classpath jdom) bootstrap/lib/jdom.jar
 export CLASSPATH=$(pwd)/bootstrap/lib/jdom.jar
 export JDOMCLASS=$CLASSPATH
-./bootstrap.sh --prefix=$(pwd)/home  --settings=%{maven_settings_file}
+sh -x ./bootstrap.sh --prefix=$(pwd)/home  --settings=%{maven_settings_file}
 unset CLASSPATH
 
 cd - # cd %{name} }}}