- 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 b77ffd93cd5c5c0768665a4607afbfe71bf350ac..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
@@ -127,6 +132,7 @@ 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
@@ -146,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
@@ -170,6 +178,7 @@ 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
@@ -181,18 +190,10 @@ 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
@@ -205,7 +206,6 @@ 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: maven-jxr >= 1.0-2
@@ -275,8 +275,6 @@ 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
@@ -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 {{{