[springframework-retry] Update to upstream version 1.1.0

[Michal Srb]

commit 3a0f352134d4a52e075fb59a0722725bbd5cc8c5
Author: Michal Srb <msrb at redhat.com>
Date:   Fri Jun 13 08:33:46 2014 +0200

    Update to upstream version 1.1.0

 .gitignore                 |    1 +
 sources                    |    3 +--
 springframework-retry.spec |   20 +++++++-------------
 3 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 49e6af3..993c6d6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /LICENSE-2.0.txt
 /1.0.3.RELEASE.tar.gz
+/1.1.0.RELEASE.tar.gz
diff --git a/sources b/sources
index 5ad3cc5..d19e4d2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-3b83ef96387f14655fc854ddc3c6bd57  LICENSE-2.0.txt
-b37eda3d9055c4b92b18e0053f475834  1.0.3.RELEASE.tar.gz
+57fedd31eb71cd10d32cb9fdbf5424d6  1.1.0.RELEASE.tar.gz
diff --git a/springframework-retry.spec b/springframework-retry.spec
index 43f7ea4..a42386d 100644
--- a/springframework-retry.spec
+++ b/springframework-retry.spec
@@ -1,16 +1,13 @@
 %global short_name spring-retry
 
 Name:           springframework-retry
-Version:        1.0.3
-Release:        4%{?dist}
+Version:        1.1.0
+Release:        1%{?dist}
 Summary:        Abstraction around retrying failed operations
 
-# License is specified in pom file
-# pull request: https://github.com/spring-projects/spring-retry/pull/9
 License:        ASL 2.0
 URL:            https://github.com/spring-projects/spring-retry
 Source0:        https://github.com/spring-projects/%{short_name}/archive/%{version}.RELEASE.tar.gz
-Source1:        http://www.apache.org/licenses/LICENSE-2.0.txt
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
@@ -44,12 +41,6 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{short_name}-%{version}.RELEASE
 
-cp %{SOURCE1} LICENSE.txt
-
-%pom_xpath_remove "pom:extension[pom:artifactId[text()='org.springframework.build.aws.maven']]"
-%pom_remove_plugin :com.springsource.bundlor.maven
-%pom_remove_plugin :maven-jar-plugin
-
 # This can be removed when rhbz#1019083 is fixed for F20
 %pom_remove_dep org.aspectj:aspectjrt
 %pom_add_dep org.aspectj:aspectjweaver:test
@@ -64,11 +55,14 @@ cp %{SOURCE1} LICENSE.txt
 
 %files -f .mfiles
 %dir %{_javadir}/%{name}
-%doc LICENSE.txt
+%doc LICENSE-2.0.txt
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%doc LICENSE-2.0.txt
 
 %changelog
+* Fri Jun 13 2014 Michal Srb <msrb at redhat.com> - 1.1.0-1
+- Update to upstream version 1.1.0
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild