From b876f7b17ba5d3ae2c47ba1e351547ffa278d08c Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 2 Oct 2013 17:40:08 +0200
Subject: [PATCH] Update to upstream version 3.3.1

---
 .gitignore                        |  1 +
 google-guice-sisu-guice-noaop.xml | 50 -------------------------------
 javapackages-tools.spec           | 12 ++++----
 sources                           |  2 +-
 4 files changed, 7 insertions(+), 58 deletions(-)
 delete mode 100644 google-guice-sisu-guice-noaop.xml

diff --git a/.gitignore b/.gitignore
index 5e6eead..5766f83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,3 +54,4 @@
 /javapackages-3.2.3.tar.xz
 /javapackages-3.2.4.tar.xz
 /javapackages-3.3.0.tar.xz
+/javapackages-3.3.1.tar.xz
diff --git a/google-guice-sisu-guice-noaop.xml b/google-guice-sisu-guice-noaop.xml
deleted file mode 100644
index a53409a..0000000
--- a/google-guice-sisu-guice-noaop.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="US-ASCII"?>
-<!-- This depmap file was generated by XMvn -->
-<dependencyMap>
-  <requiresJava>1.5</requiresJava>
-  <skipProvides/>
-  <dependency>
-    <maven>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>3.1.3</version>
-      <classifier>no_aop</classifier>
-    </maven>
-    <jpp>
-      <groupId>JPP/guice</groupId>
-      <artifactId>google-guice</artifactId>
-    </jpp>
-  </dependency>
-  <dependency>
-    <maven>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
-      <classifier>no_aop</classifier>
-      <version>3.1.3</version>
-    </maven>
-    <jpp>
-      <groupId>JPP/guice</groupId>
-      <artifactId>google-guice</artifactId>
-    </jpp>
-  </dependency>
-  <autoRequires>
-    <groupId>aopalliance</groupId>
-    <artifactId>aopalliance</artifactId>
-  </autoRequires>
-  <autoRequires>
-    <groupId>cglib</groupId>
-    <artifactId>cglib</artifactId>
-  </autoRequires>
-  <autoRequires>
-    <groupId>com.google.guava</groupId>
-    <artifactId>guava</artifactId>
-  </autoRequires>
-  <autoRequires>
-    <groupId>javax.inject</groupId>
-    <artifactId>javax.inject</artifactId>
-  </autoRequires>
-  <autoRequires>
-    <groupId>org.slf4j</groupId>
-    <artifactId>slf4j-api</artifactId>
-  </autoRequires>
-</dependencyMap>
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index d6d9a81..ecac358 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,5 +1,5 @@
 Name:           javapackages-tools
-Version:        3.3.0
+Version:        3.3.1
 Release:        1%{?dist}
 
 Summary:        Macros and scripts for Java packaging support
@@ -8,9 +8,6 @@ License:        BSD
 URL:            https://fedorahosted.org/javapackages/
 Source0:        https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz
 
-# temporary for rebuild with classifier support
-Source1:        google-guice-sisu-guice-noaop.xml
-
 BuildArch:      noarch
 
 BuildRequires:  jpackage-utils
@@ -107,8 +104,6 @@ pushd python
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 popd
 
-cp %{SOURCE1} %{buildroot}%{_mavendepmapfragdir}/
-
 %check
 pushd python
 %{__python} setup.py test
@@ -123,7 +118,6 @@ popd
 %doc LICENSE
 
 %files -n maven-local -f files-maven
-%{_mavendepmapfragdir}/google-guice-sisu-guice-noaop.xml
 
 %files -n python-javapackages
 %doc LICENSE
@@ -134,6 +128,10 @@ popd
 
 
 %changelog
+* Wed Oct  2 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3.1-1
+- Update to upstream version 3.3.1
+- Remove workaround for sisu-guice no_aop
+
 * Tue Oct 01 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.3.0-1
 - Update to upstream version 3.3.0
 
diff --git a/sources b/sources
index 3d07ae5..5cf5e09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3c04d11c00a4510eb5db91782c353b18  javapackages-3.3.0.tar.xz
+727bae8aa87a9dcdc23910d247a72b69  javapackages-3.3.1.tar.xz