[takari-local-repository] Fix dependency scopes

[Mikolaj Izdebski]

commit 727f34cda36a087e572758b81a9911490043cf77
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Sun Aug 31 15:23:00 2014 +0200

    Fix dependency scopes
    
    - Don't remove sisu-maven-plugin from POM

 takari-local-repository-dependency-scopes.patch |   42 +++++++++++++++++++++++
 takari-local-repository.spec                    |   27 +++++----------
 2 files changed, 51 insertions(+), 18 deletions(-)
---
diff --git a/takari-local-repository-dependency-scopes.patch b/takari-local-repository-dependency-scopes.patch
new file mode 100644
index 0000000..8d0be6e
--- /dev/null
+++ b/takari-local-repository-dependency-scopes.patch
@@ -0,0 +1,42 @@
+--- pom.xml~	2014-08-31 15:05:01.238709483 +0200
++++ pom.xml	2014-08-31 15:07:25.181943545 +0200
+@@ -43,25 +43,21 @@
+       <groupId>io.takari</groupId>
+       <artifactId>takari-filemanager</artifactId>
+       <version>0.7.0</version>
+-      <scope>provided</scope>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.aether</groupId>
+       <artifactId>aether-api</artifactId>
+       <version>${aetherVersion}</version>
+-      <scope>provided</scope>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.aether</groupId>
+       <artifactId>aether-spi</artifactId>
+       <version>${aetherVersion}</version>
+-      <scope>provided</scope>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.aether</groupId>
+       <artifactId>aether-impl</artifactId>
+       <version>${aetherVersion}</version>
+-      <scope>provided</scope>
+       <exclusions>
+         <exclusion>
+           <groupId>org.eclipse.aether</groupId>
+@@ -73,13 +69,11 @@
+       <groupId>org.slf4j</groupId>
+       <artifactId>slf4j-api</artifactId>
+       <version>1.7.5</version>
+-      <scope>provided</scope>
+     </dependency>
+     <dependency>
+       <groupId>com.google.guava</groupId>
+       <artifactId>guava</artifactId>
+       <version>14.0.1</version>
+-      <scope>provided</scope>
+     </dependency>
+     <dependency>
+       <groupId>org.eclipse.aether</groupId>
diff --git a/takari-local-repository.spec b/takari-local-repository.spec
index 149d7d6..55d3825 100644
--- a/takari-local-repository.spec
+++ b/takari-local-repository.spec
@@ -3,32 +3,25 @@
 
 Name:           takari-local-repository
 Version:        0.10.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Takari :: Local Repository
 
 License:        EPL
 URL:            https://github.com/takari/%{name}
 Source0:        https://github.com/takari/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
 Source1:        eclipse-1.0.txt
+Patch0:         takari-local-repository-dependency-scopes.patch
 BuildArch:      noarch
 Obsoletes:      tesla-concurrent-localrepo <= 0.0.3-2
 
-BuildRequires: mvn(edu.umd.cs:multithreadedtc)
+BuildRequires: mvn(com.googlecode.multithreadedtc:multithreadedtc)
 BuildRequires: mvn(org.codehaus.plexus:plexus-component-annotations)
 BuildRequires: mvn(org.eclipse.aether:aether-test-util)
 BuildRequires: mvn(io.takari:takari-filemanager)
 BuildRequires: mvn(junit:junit)
+BuildRequires: mvn(org.sonatype.plugins:sisu-maven-plugin)
 BuildRequires: maven-local
 
-# Some dependencies are marked with scope "provided" in POM, so no Requires autogenerated
-Requires:      mvn(io.takari:takari-filemanager)
-Requires:      mvn(org.eclipse.aether:aether-api)
-Requires:      mvn(org.eclipse.aether:aether-spi)
-Requires:      mvn(org.eclipse.aether:aether-impl)
-Requires:      mvn(org.slf4j:slf4j-api)
-Requires:      mvn(com.google.guava:guava)
-Requires:      mvn(org.codehaus.plexus:plexus-component-annotations)
-
 %description
 This extension for Aether contains a synchronization context that
 employs OS-level file locks to enable safe concurrent access to the
@@ -44,18 +37,12 @@ API documentation for %{name}.
 
 %prep
 %setup -q -n %{name}-%{commit}
+%patch0 -p0
 cp %{SOURCE1} .
 
 # Doesn't really need the parent and it's not packaged
 %pom_remove_parent
 
-# Fedora has multithreadedtc with a differend gid
-%pom_remove_dep com.googlecode.multithreadedtc:multithreadedtc
-%pom_add_dep edu.umd.cs:multithreadedtc
-
-# sisu-maven-plugin is retired in Fedora
-%pom_remove_plugin org.sonatype.plugins:sisu-maven-plugin
-
 %build
 # Tests currently fail because they expect an older version of aether
 %mvn_build -f
@@ -71,6 +58,10 @@ cp %{SOURCE1} .
 %doc eclipse-1.0.txt
 
 %changelog
+* Sun Aug 31 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10.2-3
+- Fix dependency scopes
+- Don't remove sisu-maven-plugin from POM
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild