diff --git a/maven-dependency-plugin.spec b/maven-dependency-plugin.spec index c43273d..8041b45 100644 --- a/maven-dependency-plugin.spec +++ b/maven-dependency-plugin.spec @@ -1,6 +1,6 @@ Name: maven-dependency-plugin Version: 2.8 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Plugin to manipulate, copy and unpack local and remote artifacts Group: Development/Libraries @@ -14,12 +14,11 @@ Patch1: %{name}-commons-io.patch Patch2: %{name}-core.patch # Removed exception catching as it has already been done # (not upstreamable) -Patch4: %{name}-removed-exception-catching.patch +Patch3: %{name}-removed-exception-catching.patch BuildArch: noarch BuildRequires: maven-local -BuildRequires: mvn(classworlds:classworlds) BuildRequires: mvn(commons-collections:commons-collections) BuildRequires: mvn(commons-lang:commons-lang) BuildRequires: mvn(junit:junit) @@ -29,7 +28,6 @@ BuildRequires: mvn(org.apache.maven.doxia:doxia-site-renderer) BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-harness) BuildRequires: mvn(org.apache.maven.plugin-testing:maven-plugin-testing-tools) BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugins) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-api) BuildRequires: mvn(org.apache.maven.reporting:maven-reporting-impl) BuildRequires: mvn(org.apache.maven.shared:file-management) @@ -51,9 +49,6 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-interpolation) BuildRequires: mvn(org.codehaus.plexus:plexus-io) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -Obsoletes: maven2-plugin-dependency <= 0:2.0.8 -Provides: maven2-plugin-dependency = 1:%{version}-%{release} - %description The dependency plugin provides the capability to manipulate @@ -74,7 +69,7 @@ Summary: API documentation for %{name} %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch4 -p1 +%patch3 -p1 sed -i \ 's:org.codehaus.classworlds.ClassRealm:org.codehaus.plexus.classworlds.realm.ClassRealm:' \ @@ -96,6 +91,9 @@ sed -i \ %doc LICENSE NOTICE %changelog +* Wed Jun 11 2014 Alexander Kurtakov 2.8-4 +- Fix building by dropping useless BRs. + * Sat Jun 07 2014 Fedora Release Engineering - 2.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild