[google-guice/f19] Revert "Update to upstream version 3.1.4"

[Michal Srb]

commit 1aabeaa499e4f4f1ca01eec1697f66bf9e40cc95
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Apr 24 10:22:41 2013 +0200

    Revert "Update to upstream version 3.1.4"
    
    This reverts commit fdb0ea42fc58ae62aada5a1421255c5b231b9054.
    
    google-guice 3.1.4 has been ported to asm4. Maven requires this
    package, but uses asm3. Reverting this update, because we can't
    be sure that this will work without any surprises.

 .gitignore        |    1 -
 google-guice.spec |   10 ++++------
 sources           |    2 +-
 3 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ccbd389..79fde4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 /guice-2.0-1219.tar.xz
 /guice-3.0-rc2-src.zip
 /google-guice-3.1.3.tar.xz
-/google-guice-3.1.4.tar.xz
diff --git a/google-guice.spec b/google-guice.spec
index bcdb400..f910ffb 100644
--- a/google-guice.spec
+++ b/google-guice.spec
@@ -5,8 +5,8 @@
 %global short_name guice
 
 Name:           google-%{short_name}
-Version:        3.1.4
-Release:        1%{?dist}
+Version:        3.1.3
+Release:        2%{?dist}
 Summary:        Lightweight dependency injection framework for Java 5 and above
 Group:          Development/Libraries
 License:        ASL 2.0
@@ -26,7 +26,6 @@ BuildRequires:  atinject
 BuildRequires:  cglib
 BuildRequires:  guava
 BuildRequires:  slf4j
-BuildRequires:  objectweb-asm4
 
 %if %{with extensions}
 BuildRequires:  hibernate-jpa-2.0-api
@@ -193,7 +192,6 @@ servlet,spring,throwingproviders}" "com.google.inject.extensions:guice- at 1"
 %mvn_file  ":guice-{*}"  %{short_name}/guice- at 1
 %mvn_file  ":sisu-guice" %{short_name}/%{name} %{name}
 %mvn_alias ":sisu-guice" "com.google.inject:guice"
-%mvn_package :extensions-parent guice-extensions
 # Skip tests because of missing dependency (hsqldb-j5).
 %mvn_build -f -s
 
@@ -223,8 +221,8 @@ servlet,spring,throwingproviders}" "com.google.inject.extensions:guice- at 1"
 
 
 %changelog
-* Wed Apr 24 2013 Michal Srb <msrb at redhat.com> - 3.1.4-1
-- Update to upstream version 3.1.4
+* Wed Apr 24 2013 Michal Srb <msrb at redhat.com> - 3.1.3-2
+- Revert update to 3.1.4 (uses asm4)
 
 * Thu Mar 14 2013 Michal Srb <msrb at redhat.com> - 3.1.3-1
 - Update to upstream version 3.1.3
diff --git a/sources b/sources
index 000cdda..e1d2072 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cee412fb7686bef2366539e498873f6f  google-guice-3.1.4.tar.xz
+337721d122a9c0ba3d9815b69d3cf6a1  google-guice-3.1.3.tar.xz