[log4j12] fix conflict rhbz#1114135

[gil]

commit 75f8bee5562f57fde7d705db27f37d337237b523
Author: gil <puntogil at libero.it>
Date:   Thu Jul 10 13:16:41 2014 +0200

    fix conflict rhbz#1114135

 log4j12.spec |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/log4j12.spec b/log4j12.spec
index a61d2ce..76ad968 100644
--- a/log4j12.spec
+++ b/log4j12.spec
@@ -8,7 +8,7 @@ License:       ASL 2.0
 URL:           http://logging.apache.org/log4j/1.2/
 Source0:       https://github.com/apache/log4j/archive/v%{archiversion}.tar.gz
 
-Source1:       %{name}.catalog
+Source1:       log4j.catalog
 
 Patch0:        0001-logfactor5-changed-userdir.patch
 Patch1:        0009-Fix-tests.patch
@@ -23,7 +23,7 @@ BuildRequires: mvn(oro:oro)
 BuildRequires: mvn(junit:junit)
 
 BuildRequires: maven-local
-Obsoletes:     %{name} <= 0:1.2.17-14
+Obsoletes:     log4j <= 0:1.2.17-14
 BuildArch:     noarch
 
 %description
@@ -152,7 +152,7 @@ fi
 
 %changelog
 * Thu Jul 10 2014 gil cattaneo <puntogil at libero.it> 1.2.17-5
-- fix conflict with log4j rhbz#1114135
+- fix conflict rhbz#1114135
 
 * Wed Jun 18 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.2.17-4
 - Add compat version 1.2.12 (used by velocity and xbean)