From f3b2ed55083d1469a486c87e0a0d9febdd1f0818 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Thu, 27 May 2010 07:02:26 +0000 Subject: [PATCH] - Add missing requires. - Drop modello patches not needed anymore. --- maven-plugin-tools.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/maven-plugin-tools.spec b/maven-plugin-tools.spec index 54a394c..be8448b 100644 --- a/maven-plugin-tools.spec +++ b/maven-plugin-tools.spec @@ -1,6 +1,6 @@ Name: maven-plugin-tools Version: 2.6 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Maven Plugin Tools Group: Development/Libraries @@ -10,19 +10,17 @@ Epoch: 0 #svn export http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.6 maven-plugin-tools-2.6 #tar caf maven-plugin-tools-2.6.tar.xz maven-plugin-tools-2.6/ Source0: %{name}-%{version}.tar.xz -Patch0: old-modello.patch -Patch1: old-modello-2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch BuildRequires: java-devel >= 1:1.6.0 -BuildRequires: maven2-plugin-install +BuildRequires: maven-install-plugin BuildRequires: maven-compiler-plugin -BuildRequires: maven2-plugin-resources -BuildRequires: maven2-plugin-jar +BuildRequires: maven-resources-plugin +BuildRequires: maven-jar-plugin BuildRequires: maven2-plugin-source -BuildRequires: maven2-plugin-plugin +BuildRequires: maven-plugin-plugin BuildRequires: plexus-maven-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-doxia-sitetools @@ -121,6 +119,8 @@ Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-java Requires: %{name}-model Requires: %{name}-beanshell +Requires: maven-doxia-sitetools +Requires: maven-shared-reporting-impl Obsoletes: maven2-plugin-plugin < 0:%{version}-%{release} Provides: maven2-plugin-plugin = 0:%{version}-%{release} @@ -131,8 +131,7 @@ plugin registry, the artifact metadata and a generic help goal. %prep %setup -q -%patch0 -%patch1 +rm -fr src/site/site.xml %build export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository @@ -264,6 +263,10 @@ rm -rf %{buildroot} %{_javadir}/%{name}/plugin* %changelog +* Thu May 27 2010 Alexander Kurtakov 0:2.6-5 +- Add missing requires. +- Drop modello patches not needed anymore. + * Wed May 19 2010 Alexander Kurtakov 0:2.6-4 - Fix plugin-tools-java obsoletes.