diff --git a/maven-enforcer-depmap.xml b/maven-enforcer-depmap.xml
index 428f93b..71ded20 100644
--- a/maven-enforcer-depmap.xml
+++ b/maven-enforcer-depmap.xml
@@ -1,16 +1,15 @@
- org.apache.maven.shared
- maven-plugin-testing-harness
+ org.codehaus.plexus
+ plexus-container-default
1.1
- JPP/maven-plugin-testing
- maven-plugin-testing-harness
+ JPP/plexus
+ container-default
1.1
-
diff --git a/maven-enforcer.spec b/maven-enforcer.spec
index 32ed3b4..16d689f 100644
--- a/maven-enforcer.spec
+++ b/maven-enforcer.spec
@@ -2,7 +2,7 @@
Name: maven-enforcer
Version: 1.0
-Release: 0.1.b2%{?dist}
+Release: 0.2.b2%{?dist}
Summary: Maven Enforcer
Group: Development/Libraries
@@ -13,7 +13,6 @@ URL: http://maven.apache.org/enforcer
Source0: enforcer-%{project_version}.tar.xz
Source1: %{name}-depmap.xml
Patch0: fix-site.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -21,24 +20,25 @@ BuildRequires: java-devel >= 1:1.6.0
BuildRequires: maven2
BuildRequires: maven-plugin-plugin
-BuildRequires: maven2-plugin-assembly
-BuildRequires: plexus-maven-plugin
+BuildRequires: maven-assembly-plugin
BuildRequires: maven-compiler-plugin
-BuildRequires: maven2-plugin-install
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven2-plugin-resources
BuildRequires: maven-doxia
BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-surefire-maven-plugin
-BuildRequires: maven-surefire-provider-junit
+BuildRequires: maven-doxia-tools
+BuildRequires: maven-install-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-jar-plugin
BuildRequires: maven-plugin-testing-harness
BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-resources-plugin
BuildRequires: maven-site-plugin
-BuildRequires: maven-doxia-tools
+BuildRequires: maven-shared-reporting-impl
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit
BuildRequires: tomcat6
-Requires: maven2
+BuildRequires: plexus-maven-plugin
+BuildRequires: plexus-containers-component-javadoc
+Requires: maven2
Requires: jpackage-utils
Requires: java
Requires(post): jpackage-utils
@@ -61,7 +61,7 @@ Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
%description api
-This component provides the generic interfaces needed to
+This component provides the generic interfaces needed to
implement custom rules for the maven-enforcer-plugin.
%package rules
@@ -89,61 +89,51 @@ This component contains the standard Enforcer Rules.
%setup -q -n enforcer-%{project_version}
%patch0
+# fix old dep on javadoc taglet
+sed -i 's:plexus-javadoc:plexus-component-javadoc:' pom.xml
+
%build
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mvn-jpp \
-e \
- -Dmaven2.jpp.mode=true \
-Dmaven.repo.local=$MAVEN_REPO_LOCAL \
-Dmaven2.jpp.depmap.file=%{SOURCE1} \
-Dmaven.test.failure.ignore=true \
- install javadoc:javadoc
+ install javadoc:aggregate
%install
-rm -rf %{buildroot}
-
# jars
install -d -m 0755 %{buildroot}%{_javadir}/%{name}
install -m 644 enforcer-api/target/enforcer-api-%{project_version}.jar \
- %{buildroot}%{_javadir}/%{name}/enforcer-api-%{project_version}.jar
+ %{buildroot}%{_javadir}/%{name}/enforcer-api.jar
install -m 644 enforcer-rules/target/enforcer-rules-%{project_version}.jar \
- %{buildroot}%{_javadir}/%{name}/enforcer-rules-%{project_version}.jar
+ %{buildroot}%{_javadir}/%{name}/enforcer-rules.jar
install -m 644 maven-enforcer-plugin/target/maven-enforcer-plugin-%{project_version}.jar \
- %{buildroot}%{_javadir}/%{name}/plugin-%{project_version}.jar
-
-(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{project_version}*; \
- do ln -sf ${jar} `echo $jar| sed "s|-%{project_version}||g"`; done)
+ %{buildroot}%{_javadir}/%{name}/plugin.jar
# poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer %{project_version} JPP %{name}
install -pm 644 enforcer-api/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-enforcer-api.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-enforcer-api.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer-api %{project_version} JPP/%{name} enforcer-api
install -pm 644 enforcer-rules/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-enforcer-rules.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-enforcer-rules.pom
%add_to_maven_depmap org.apache.maven.enforcer enforcer-rules %{project_version} JPP/%{name} enforcer-rules
install -pm 644 maven-enforcer-plugin/pom.xml \
- $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-plugin.pom
+ $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-plugin.pom
%add_to_maven_depmap org.apache.maven.plugins maven-enforcer-plugin %{project_version} JPP/%{name} plugin
# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-
-for dir in *enforcer*; do
- install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir
- cp -pr $dir/target/site/apidocs/* \
- %{buildroot}%{_javadocdir}/%{name}-%{version}/$dir/
-done
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-ln -s %{name}-%{version} \
- $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%post
%update_maven_depmap
@@ -151,8 +141,11 @@ ln -s %{name}-%{version} \
%postun
%update_maven_depmap
-%clean
-%{__rm} -rf %{buildroot}
+%pre javadoc
+# workaround for rpm bug, can be removed in F-17
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
+
%files
%defattr(-,root,root,-)
@@ -162,7 +155,6 @@ ln -s %{name}-%{version} \
%files javadoc
%defattr(-,root,root,-)
-%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}
%files api
@@ -178,6 +170,11 @@ ln -s %{name}-%{version} \
%{_javadir}/%{name}/plugin*
%changelog
+* Mon Dec 13 2010 Stanislav Ochotnicky - 1.0-0.2.b2
+- Fix FTBFS (#631388)
+- Use new maven plugin names
+- Versionless jars & javadocs
+
* Wed May 19 2010 Alexander Kurtakov 1.0-0.1.b2
- Initial package