rpms/maven2/devel maven2.spec,1.24,1.25
Andrew Overholt
overholt at fedoraproject.org
Mon Aug 31 14:51:15 UTC 2009
Author: overholt
Update of /cvs/pkgs/rpms/maven2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27222
Modified Files:
maven2.spec
Log Message:
* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.8-1.4
- Move missing dependencies to without_bootstrap blocks.
Index: maven2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/maven2/devel/maven2.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- maven2.spec 26 Aug 2009 14:55:50 -0000 1.24
+++ maven2.spec 31 Aug 2009 14:51:15 -0000 1.25
@@ -46,7 +46,7 @@
Name: %{name}
Version: %{maven_version}
-Release: 1.3%{?dist}
+Release: 1.4%{?dist}
Epoch: 0
Summary: Java project management and project comprehension tool
@@ -62,7 +62,7 @@ Source0: %{name}-src.tar.gz
# tar czf maven2-plugins-0700705-src.tar.gz maven2-plugins
Source2: %{name}-plugins-070705-src.tar.gz
-# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above
+# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above
# has several bugs
# svn export http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.4 maven-javadoc-plugin
# tar czf maven-javadoc-plugin-2.4-src.tar.gz maven-javadoc-plugin
@@ -73,7 +73,7 @@ Source22: maven-javadoc-plugin-2.4-src.t
# The files were originally aquired from: http://repo1.maven.org/maven2/
Source3: m2_pom_repo.tar.gz
-# As with above, these files are from the maven repositories, and are not in
+# As with above, these files are from the maven repositories, and are not in
# cvs/svn
# The files were originally aquired from: http://repo1.maven.org/maven2/
Source4: m2_jar_repo.tar.gz
@@ -83,14 +83,14 @@ Source6: maven2-JPackageRepositor
Source7: maven2-settings.xml
# svn export -r '{2006-03-08}' http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-site-plugin maven-site-plugin
-# tar czf maven2-maven-site-plugin.tar.gz maven-site-plugin
+# tar czf maven2-maven-site-plugin.tar.gz maven-site-plugin
Source8: %{name}-maven-site-plugin.tar.gz
Source9: %{name}-run-it-tests.sh
# svn export http://svn.apache.org/repos/asf/maven/components/tags/maven-2.0.8/maven-model
# cd maven-model
-# mvn -P all-models package
+# mvn -P all-models package
# Find model jar in target/maven-model-2.0.8.jar
Source10: %{name}-model-v3.jar
Source11: %{name}-MavenJPackageDepmap.java
@@ -323,10 +323,10 @@ Requires: modello >= 1.0-0.a8.3
Requires: modello-maven-plugin >= 1.0-0.a8.3
%endif
-Obsoletes: maven2-plugin-jxr <= 0:2.0.4
-Obsoletes: maven2-plugin-surefire <= 0:2.0.4
-Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4
-Obsoletes: maven2-plugin-release <= 0:2.0.4
+Obsoletes: maven2-plugin-jxr <= 0:2.0.4
+Obsoletes: maven2-plugin-surefire <= 0:2.0.4
+Obsoletes: maven2-plugin-surefire-report <= 0:2.0.4
+Obsoletes: maven2-plugin-release <= 0:2.0.4
Requires(post): jpackage-utils >= 0:1.7.2
Requires(postun): jpackage-utils >= 0:1.7.2, /bin/rmdir
@@ -344,7 +344,7 @@ Requires(postun): java-gcj-compat
%endif
%description
-Maven is a software project management and comprehension tool. Based on the
+Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
reporting and documentation from a central piece of information.
@@ -413,10 +413,12 @@ Generates sources from an Antlr grammar.
Summary: Antrun plugin for maven
Group: Development/Build Tools
Requires: ant >= 1.6.5
+%if %{without_bootstrap}
Requires: maven-embedder
+Requires: maven-shared-reporting-impl
+%endif
Requires: maven2 = %{epoch}:%{version}-%{release}
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
-Requires: maven-shared-reporting-impl
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -435,17 +437,17 @@ Requires: maven2 = %{epoch}:%{vers
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
%if %{without_bootstrap}
Requires: modello >= 1.0-0.a8.3
+Requires: maven-shared-archiver
+Requires: jmock >= 1.0.1
+Requires: maven-shared-test-tools
+Requires: maven-shared-repository-builder
+Requires: maven-shared-common-artifact-filters
+Requires: maven-shared-plugin-testing-tools
%endif
Requires: plexus-archiver >= 1.0
Requires: plexus-utils >= 1.2
Requires: maven-shared-file-management >= 1.0
-Requires: maven-shared-archiver
Requires: plexus-container-default
-Requires: maven-shared-repository-builder
-Requires: maven-shared-common-artifact-filters
-Requires: maven-shared-plugin-testing-tools
-Requires: maven-shared-test-tools
-Requires: jmock >= 1.0.1
Requires: jdom >= 1.0
Requires: jaxen >= 1.1
Requires: saxpath
@@ -465,13 +467,13 @@ Summary: Changelog plugin for mav
Group: Development/Build Tools
%if %{without_bootstrap}
Requires: maven-scm
+Requires: maven-shared-reporting-impl
+Requires: maven-doxia-sitetools >= 1.0
%endif
Requires: maven2 = %{epoch}:%{version}-%{release}
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
Requires: maven-doxia >= 1.0-0.a9
-Requires: maven-doxia-sitetools >= 1.0
Requires: maven-scm >= 0:1.0-0.b3.2
-Requires: maven-shared-reporting-impl
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -489,6 +491,8 @@ Group: Development/Build Tools
%if %{without_bootstrap}
Requires: maven-doxia
Requires: maven-doxia-sitetools >= 1.0
+Requires: maven-shared-reporting-impl
+Requires: glassfish-javamail
%endif
Requires: maven2 = %{epoch}:%{version}-%{release}
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
@@ -496,10 +500,8 @@ Requires: velocity
Requires: commons-httpclient
Requires: plexus-velocity >= 1.1.2
Requires: plexus-mail-sender
-Requires: glassfish-javamail
Requires: jakarta-commons-lang
Requires: velocity
-Requires: maven-shared-reporting-impl
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -508,8 +510,8 @@ Requires(postun): java-gcj-compat
%endif
%description plugin-changes
-The Maven Changes Plugin is used to inform users of the changes that have
-occured between different releases of your project.
+The Maven Changes Plugin is used to inform users of the changes that have
+occured between different releases of your project.
%package plugin-checkstyle
Summary: Checkstyle plugin for maven
@@ -521,7 +523,9 @@ Requires(postun): maven2 = %{epoch}:%{ve
Requires: plexus-utils >= 1.2
Requires: plexus-velocity >= 1.1.2
Requires: plexus-resources
+%if %{without_bootstrap}
Requires: maven-shared-reporting-impl
+%endif
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -603,8 +607,10 @@ Requires: plexus-utils >= 1.2
Requires: maven-shared-file-management >= 1.0-4
Requires: junit >= 3.8.2
Requires: plexus-container-default
+%if %{without_bootstrap}
Requires: maven-shared-dependency-analyzer
Requires: maven-shared-dependency-tree
+%endif
%if %{gcj_support}
@@ -657,13 +663,15 @@ Group: Development/Build Tools
Requires: maven2 = %{epoch}:%{version}-%{release}
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
Requires: plexus-utils
+%if %{without_bootstrap}
Requires: maven-shared-plugin-tools-beanshell >= 2.2
Requires: maven-shared-plugin-tools-java >= 2.2
+Requires: maven-shared-plugin-tools-api
+Requires: maven-shared-reporting-impl
+%endif
Requires: commons-httpclient
Requires: jakarta-commons-logging >= 1.0.4
Requires: maven-shared-file-management >= 1.0-4
-Requires: maven-shared-plugin-tools-api
-Requires: maven-shared-reporting-impl
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -672,7 +680,7 @@ Requires(postun): java-gcj-compat
%endif
%description plugin-docck
-The Maven DOCCK Plugin checks that a project complies with the
+The Maven DOCCK Plugin checks that a project complies with the
Plugin Documentation Standard.
@@ -682,7 +690,9 @@ Group: Development/Build Tools
Requires: maven2 = %{epoch}:%{version}-%{release}
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
Requires: plexus-utils >= 1.2
+%if %{without_bootstrap}
Requires: maven-shared-verifier
+%endif
Requires: xmlunit
%if %{gcj_support}
@@ -702,13 +712,15 @@ Requires: maven2 = %{epoch}:%{vers
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
Requires: plexus-utils >= 1.2
Requires: plexus-archiver >= 1.0
-Requires: jmock >= 1.0.1
Requires: jdom >= 1.0
Requires: jaxen >= 1.1
Requires: saxpath
Requires: plexus-interactivity >= 1.0
+%if %{without_bootstrap}
+Requires: jmock >= 1.0.1
Requires: maven-shared-plugin-testing-tools
Requires: maven-shared-test-tools
+%endif
Requires: aqute-bndlib
%if %{gcj_support}
@@ -744,10 +756,10 @@ Requires(postun): maven2 = %{epoch}:%{ve
Requires: jakarta-commons-lang
%if %{without_bootstrap}
Requires: maven-shared
+Requires: maven-enforcer-rule-api
%endif
Requires: plexus-utils
Requires: bsh
-Requires: maven-enforcer-rule-api
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -756,7 +768,7 @@ Requires(postun): java-gcj-compat
%endif
%description plugin-enforcer
-The Maven Enforcer Plugin provides goals to control certain environmental
+The Maven Enforcer Plugin provides goals to control certain environmental
constraints such as Maven Version, JDK version, and OS family.
@@ -785,7 +797,9 @@ Summary: Help plugin for maven
Group: Development/Build Tools
Requires: maven2 = %{epoch}:%{version}-%{release}
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+%if %{without_bootstrap}
Requires: maven-shared-plugin-tools-api
+%endif
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -805,7 +819,9 @@ Requires: maven2 = %{epoch}:%{vers
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
Requires: maven-wagon >= 1.0-0.1.b2
Requires: plexus-utils >= 1.2
+%if %{without_bootstrap}
Requires: jmock >= 1.0.1
+%endif
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -814,7 +830,7 @@ Requires(postun): java-gcj-compat
%endif
%description plugin-idea
-Creates/updates an IDEA workspace for the current project
+Creates/updates an IDEA workspace for the current project
(individual modules are created as IDEA modules).
@@ -854,8 +870,8 @@ Requires(postun): java-gcj-compat
%endif
%description plugin-invoker
-The Maven Invoker Plugin is used to run a set of Maven projects and makes
-sure that each project execution is successful, and optionally verifies
+The Maven Invoker Plugin is used to run a set of Maven projects and makes
+sure that each project execution is successful, and optionally verifies
the output from a given project execution.
%package plugin-jar
@@ -863,7 +879,9 @@ Summary: Jar plugin for maven
Group: Development/Build Tools
Requires: jakarta-commons-lang >= 2.1
Requires: maven2 = %{epoch}:%{version}-%{release}
+%if %{without_bootstrap}
Requires: maven-shared-archiver >= 2.3
+%endif
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
Requires: plexus-utils >= 1.2
@@ -888,7 +906,9 @@ Requires: modello >= 1.0-0.a8.3
%endif
Requires: plexus-archiver >= 1.0
Requires: plexus-utils >= 1.2
+%if %{without_bootstrap}
Requires: maven-shared-reporting-impl
+%endif
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -908,7 +928,9 @@ Requires(postun): maven2 = %{epoch}:%{ve
Requires: plexus-archiver >= 1.0
Requires: plexus-utils >= 1.2
Requires: junit >= 3.8.2
+%if %{without_bootstrap}
Requires: maven-shared-model-converter
+%endif
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -925,9 +947,11 @@ Summary: Plugin plugin for maven
Group: Development/Build Tools
Requires: maven2 = %{epoch}:%{version}-%{release}
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
+%if %{without_bootstrap}
Requires: maven-shared-plugin-tools-beanshell >= 2.2
Requires: maven-shared-plugin-tools-java >= 2.2
Requires: maven-shared-reporting-impl
+%endif
Requires: maven-doxia >= 1.0-0.a9
Requires: plexus-utils >= 1.2
Requires: plexus-container-default
@@ -939,7 +963,7 @@ Requires(postun): java-gcj-compat
%endif
%description plugin-plugin
-Creates a Maven plugin descriptor for any Mojo's found in the source tree,
+Creates a Maven plugin descriptor for any Mojo's found in the source tree,
to include in the JAR.
@@ -953,7 +977,9 @@ Requires: plexus-resources
Requires: pmd >= 3.3
Requires: jaxen >= 1.1
Requires: xom
+%if %{without_bootstrap}
Requires: maven-shared-reporting-impl
+%endif
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -973,13 +999,15 @@ Requires: jakarta-commons-validato
Requires: maven2 = %{epoch}:%{version}-%{release}
Requires(postun): maven2 = %{epoch}:%{version}-%{release}
Requires: plexus-i18n >= 1.0
+%if %{without_bootstrap}
Requires: maven-shared-reporting-impl
Requires: maven-shared-jar
Requires: maven-shared-dependency-tree
+Requires: maven-doxia-sitetools >= 1.0
+%endif
Requires: maven-wagon
Requires: maven-scm >= 0:1.0-0.b3.2
Requires: maven-doxia >= 1.0-0.a9
-Requires: maven-doxia-sitetools >= 1.0
%if %{gcj_support}
BuildRequires: java-gcj-compat-devel
@@ -1167,15 +1195,15 @@ Builds a WAR from the current project.
# Extract the plugins
tar xzf %{SOURCE2}
-# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above
+# We need to replace the javadoc plugin as the 2.3-SNAPSHOT included above
# has several bugs
rm -rf maven2-plugins/maven-javadoc-plugin
pushd maven2-plugins
tar xzf %{SOURCE22}
popd
-# Use an older version of site plugin because newer one requires newer doxia
-# (1.0a8) which is not compatible with the older one (1.0a7) which is needed
+# Use an older version of site plugin because newer one requires newer doxia
+# (1.0a8) which is not compatible with the older one (1.0a7) which is needed
# by other parts of maven
#rm -rf maven2-plugins/maven-site-plugin
#tar xzf %{SOURCE8}
@@ -1252,7 +1280,7 @@ rm -f maven2-plugins/maven-site-plugin/s
rm -f maven2-plugins/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/PrepareReleaseMojoTest.java
# Disabled test because it needs mock
-rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
+rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/testutils/MockManager.java
rm -f maven2/maven-artifact-manager/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java
# extract poms and jars (if any)
@@ -1272,8 +1300,8 @@ ln -s %{_javadir} external_repo/JPP
cp -p %{SOURCE6} maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/JPackageRepositoryLayout.java
cp -p %{SOURCE11} maven2/maven-artifact/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java
-# FIXME: bootstrap-mini has no dependencies, so we copy the file there
-# (for now). Since bootstrap classes are not in the final package, there
+# FIXME: bootstrap-mini has no dependencies, so we copy the file there
+# (for now). Since bootstrap classes are not in the final package, there
# will be no duplicates.
mkdir -p maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/artifact/repository/layout/
cp -p %{SOURCE11} maven2/bootstrap/bootstrap-mini/src/main/java/org/apache/maven/artifact/repository/layout/MavenJPackageDepmap.java
@@ -1321,8 +1349,8 @@ saxon -o maven2/bootstrap/bootstrap-inst
export MAVEN_REPO_LOCAL=`pwd`/%{repo_dir}
export M2_SETTINGS_FILE=%{maven_settings_file}
-# In bootstrap mode, we want it looking at default poms only (controlled via
-# maven2-common-poms). This enables us to change naming structures without
+# In bootstrap mode, we want it looking at default poms only (controlled via
+# maven2-common-poms). This enables us to change naming structures without
# breaking build.
export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven2.ignore.versions -Dmaven2.offline.mode -Dmaven.test.failure.ignore=true -Dmaven2.jpp.depmap.file=%{SOURCE17}"
@@ -1373,13 +1401,13 @@ build-jar-repository -s -p $M2_HOME/lib
pushd maven2-plugins >& /dev/null
# Build the plugin-plugin first, as it is needed to build itself later on
-# NOTE: Build of this plugin for the first time is expected to cause errors.
-# That is why we build it first with -fn . Subsequent builds should not have
-# errors, and if they do, they will be caught when all plugins are built
+# NOTE: Build of this plugin for the first time is expected to cause errors.
+# That is why we build it first with -fn . Subsequent builds should not have
+# errors, and if they do, they will be caught when all plugins are built
# again below. See: http://mail-archives.apache.org/mod_mbox/maven-users/200511.mbox/%3c4374C819.7090609@commonjava.org%3e
(cd maven-plugin-plugin
-$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -npu --no-plugin-registry -fn clean install
+$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -npu --no-plugin-registry -fn clean install
)
%if ! %{NONFREE}
@@ -1389,8 +1417,8 @@ sed -i -e s:"<module>maven-clover-plugin
# Now build everything
# FIXME: Need to build in two stages to get around gcj bug that causes plugin reload to fail
-#$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry -fn verify
-$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry verify
+#$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry -fn verify
+$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry verify
$M2_HOME/bin/mvn -e --batch-mode -s %{maven_settings_file} $MAVEN_OPTS -Dmaven.test.skip=true -npu --no-plugin-registry --fail-at-end jar:jar install:install
popd >& /dev/null
@@ -1411,7 +1439,7 @@ popd >& /dev/null
(cd maven2
# One of the tests (#63) needs tools.jar. Fix the path for it
-sed -i -e s:"<systemPath>\${java.home}/../lib/tools.jar</systemPath>":"<systemPath>$JAVA_HOME/lib/tools.jar</systemPath>":g maven-core-it/it0063/pom.xml
+sed -i -e s:"<systemPath>\${java.home}/../lib/tools.jar</systemPath>":"<systemPath>$JAVA_HOME/lib/tools.jar</systemPath>":g maven-core-it/it0063/pom.xml
(cd integration-tests/maven-core-it-plugin
$M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS org.apache.maven.plugins:maven-plugin-plugin:2.1.1-SNAPSHOT:descriptor org.apache.maven.plugins:maven-resources-plugin:2.2-SNAPSHOT:resources org.apache.maven.plugins:maven-compiler-plugin:2.1-SNAPSHOT:compile org.apache.maven.plugins:maven-jar-plugin:2.1-SNAPSHOT:jar org.apache.maven.plugins:maven-install-plugin:2.2-SNAPSHOT:install
@@ -1439,8 +1467,8 @@ export MAVEN_OPTS=$OLD_MAVEN_OPTS
# Build docs
-# Manual iteration should not be needed, but there is a bug in the javadoc
-# plugin which makes this necessary. See:
+# Manual iteration should not be needed, but there is a bug in the javadoc
+# plugin which makes this necessary. See:
# http://jira.codehaus.org/browse/MJAVADOC-157
(cd maven2
@@ -1452,7 +1480,7 @@ for dir in `find -maxdepth 1 -type d`; d
if [ ! -f $dir/pom.xml ]; then
continue
- fi
+ fi
pushd $dir
$M2_HOME/bin/mvn -s %{maven_settings_file} $MAVEN_OPTS -Dmaven2.usejppjars org.apache.maven.plugins:maven-javadoc-plugin:2.3-SNAPSHOT:javadoc
@@ -1531,7 +1559,7 @@ pushd %{name}
maven-profile \
maven-project \
maven-repository-metadata \
- maven-settings; do
+ maven-settings; do
artifactname=`echo $project | sed -e s:^maven-::g`
cp -p $project/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-$artifactname.pom
@@ -1551,7 +1579,7 @@ popd
# reporting api
cp -p %{name}/maven-reporting/maven-reporting-api/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-reporting-api.pom
%add_to_maven_depmap org.apache.maven.reporting maven-reporting-api %{version} JPP/%{name} reporting-api
-install -m 644 %{name}/maven-reporting/maven-reporting-api/target/*jar $RPM_BUILD_ROOT%{_javadir}/%{name}/reporting-api-%{version}.jar
+install -m 644 %{name}/maven-reporting/maven-reporting-api/target/*jar $RPM_BUILD_ROOT%{_javadir}/%{name}/reporting-api-%{version}.jar
# script, script-ant and script-beanshell
cp -p %{name}/maven-script/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.%{name}-script.pom
@@ -1587,7 +1615,7 @@ pushd maven2-plugins
pluginversion=`ls $targetdir/*jar | awk -F / '{print $NF}' | sed -e s:"^$pluginname-"::g -e s:"\\.jar$"::g`
artifactname=`echo $pluginname | sed -e s:^maven-::g`
- #jar
+ #jar
cp -p $targetdir/*jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/$artifactname-$pluginversion.jar
ln -s $artifactname-$pluginversion.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/$artifactname.jar
@@ -1598,9 +1626,9 @@ pushd maven2-plugins
done
popd
-# g=org.apache.maven.plugins a=maven-plugins needs to be copied manually, as
-# it get's changed to a=plugins (a=plugins and a=maven-plugins is the same
-# file, but the former is needed for compatiblity while newer projects use
+# g=org.apache.maven.plugins a=maven-plugins needs to be copied manually, as
+# it get's changed to a=plugins (a=plugins and a=maven-plugins is the same
+# file, but the former is needed for compatiblity while newer projects use
# the latter)
cp -p maven2-plugins/target/*jar $RPM_BUILD_ROOT%{_datadir}/%{name}/plugins/maven-plugins.jar
cp -p maven2-plugins/pom.xml $RPM_BUILD_ROOT%{_datadir}/%{name}/poms/JPP.maven2.plugins-maven-plugins.pom
@@ -1620,7 +1648,7 @@ install -dm 755 $RPM_BUILD_ROOT%{_javado
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
(cd maven2
- for doc_dir in `find . -type d -name apidocs`; do
+ for doc_dir in `find . -type d -name apidocs`; do
module=`echo $doc_dir | sed -e s:"^\\./"::g -e s:"/target/site/apidocs$"::g`
targetdir=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
install -dm 755 $targetdir
@@ -1629,7 +1657,7 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT
)
(cd maven2-plugins
- for doc_dir in `find . -type d -name apidocs`; do
+ for doc_dir in `find . -type d -name apidocs`; do
module=`echo $doc_dir | sed -e s:"^\\./"::g -e s:"/target/site/apidocs$"::g`
targetdir=$RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
install -dm 755 $targetdir
@@ -1712,7 +1740,7 @@ rm -rf %{_datadir}/%{name}/core/*
%postun
# FIXME: This doesn't always remove the plugins dir. It seems that rpm doesn't
-# honour the Requires(postun) as it should, causing maven to get uninstalled
+# honour the Requires(postun) as it should, causing maven to get uninstalled
# before some plugins are
if [ -d %{_javadir}/%{name} ] ; then rmdir --ignore-fail-on-non-empty %{_javadir}/%{name} >& /dev/null; fi
%update_maven_depmap
@@ -2870,6 +2898,9 @@ fi
%endif
%changelog
+* Mon Aug 31 2009 Alexander Kurtakov <akurtako at redhat.com> 0:2.0.8-1.4
+- Move missing dependencies to without_bootstrap blocks.
+
* Wed Aug 26 2009 Andrew Overholt <overholt at redhat.com> 2.0.8-1.3
- Add missing backport-util-concurrent BR
@@ -2891,7 +2922,7 @@ fi
-- Move misplaced Requires: maven-archiver back to maven2-plugin-jar
-- Add missing Requires: maven-archiver to maven2-plugin-jar
-- Add missing Requires: ant to maven2-plugin-ant
--- Add missing Requires: maven-shared-plugin-tools-beanshell,
+-- Add missing Requires: maven-shared-plugin-tools-beanshell,
maven-shared-plugin-tools-java to maven2-plugin-docck and
maven2-plugin-plugin
-- Add missing Requires: to maven2-plugin-install
@@ -3038,7 +3069,7 @@ fi
- Installer maven-{artifact-ant,embedder,meeper,script}
- From r.apel at r-apel.de:
- Fix maven-site-plugin pom in maven2-jpp-mapping.patch
- - Add maven-shared-file-management to plugin-assembly Requires
+ - Add maven-shared-file-management to plugin-assembly Requires
- Add post/postun Requires for javadoc
* Wed Jul 12 2006 Fernando Nasser <fnasser at redhat.com> - 0:2.0.4-4jpp_1rh
More information about the scm-commits
mailing list