[log4j-jboss-logmanager] Upstream release 1.1.0.Final

[Marek Goldmann]

commit 8f82bc5e1dda5759ad31aff4aff61a50182d4cdc
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Jun 9 16:26:44 2014 +0200

    Upstream release 1.1.0.Final

 .gitignore                  |    1 +
 log4j-jboss-logmanager.spec |   15 ++++++++++++---
 sources                     |    2 +-
 3 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8e9d24f..1b101c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /1.0.2.Final.tar.gz
+/1.1.0.Final.tar.gz
diff --git a/log4j-jboss-logmanager.spec b/log4j-jboss-logmanager.spec
index 30e9038..0d848c7 100644
--- a/log4j-jboss-logmanager.spec
+++ b/log4j-jboss-logmanager.spec
@@ -2,8 +2,8 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             log4j-jboss-logmanager
-Version:          1.0.2
-Release:          3%{dist}
+Version:          1.1.0
+Release:          1%{dist}
 Summary:          JBoss Log4j Emulation
 License:          ASL 2.0
 Url:              https://github.com/jboss-logging/log4j-jboss-logmanager
@@ -12,12 +12,17 @@ Source1:          LICENSE
 
 BuildRequires:    jboss-parent
 BuildRequires:    jboss-modules
-BuildRequires:    log4j
 BuildRequires:    jboss-logmanager
 BuildRequires:    jboss-logging
 BuildRequires:    junit
 BuildRequires:    maven-local
 
+%if 0%{?fedora} >= 21
+BuildRequires:    log4j12
+%else
+BuildRequires:    log4j
+%endif
+
 BuildArch:        noarch
 
 %description
@@ -35,6 +40,7 @@ This package contains the API documentation for %{name}.
 cp %{SOURCE1} .
 
 %pom_remove_plugin :maven-shade-plugin
+%pom_xpath_set "pom:dependencies/pom:dependency[pom:artifactId = 'log4j']/pom:version" "12"
 
 %build
 %mvn_build
@@ -50,6 +56,9 @@ cp %{SOURCE1} .
 %doc LICENSE
 
 %changelog
+* Mon Jun 09 2014 Marek Goldmann <mgoldman at redhat.com> - 1.1.0-1
+- Upstream release 1.1.0.Final
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 547fc0a..7999165 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9987ef9fb5ee4f3ea36b4001aa3fe29a  1.0.2.Final.tar.gz
+c071892ad3638194f99a713ef23f3a3c  1.1.0.Final.tar.gz