From b7016a738a99d1e45a0bb3169973f3d4eaaa56d4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Tue, 11 Feb 2014 22:26:13 +0100
Subject: [PATCH] - up to 1.2.17

---
 java-log4j-version.patch         | 11 -----------
 java-log4j.spec                  | 12 ++++--------
 logging-log4j-sourcetarget.patch | 26 --------------------------
 3 files changed, 4 insertions(+), 45 deletions(-)
 delete mode 100644 java-log4j-version.patch
 delete mode 100644 logging-log4j-sourcetarget.patch

diff --git a/java-log4j-version.patch b/java-log4j-version.patch
deleted file mode 100644
index 507f69d..0000000
--- a/java-log4j-version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- apache-log4j-1.2.16/build.xml.orig	2011-02-12 09:15:02.808694742 +0100
-+++ apache-log4j-1.2.16/build.xml	2011-02-12 09:23:04.688693065 +0100
-@@ -41,7 +41,7 @@
-   <!-- prefixed with "env". -->
-   <property environment="env"/>
- 
--  <property name="version" value="1.2.15"/>
-+  <property name="version" value="1.2.16"/>
- 
-   <!-- The base directory relative to which most targets are built -->
-   <property name="base" value="."/>
diff --git a/java-log4j.spec b/java-log4j.spec
index 1dcc8ca..4e17411 100644
--- a/java-log4j.spec
+++ b/java-log4j.spec
@@ -21,15 +21,13 @@
 Summary:	log4j - logging for Java
 Summary(pl.UTF-8):	log4j - zapis logów dla Javy
 Name:		java-%{srcname}
-Version:	1.2.16
-Release:	2
+Version:	1.2.17
+Release:	1
 License:	Apache v2.0
 Group:		Libraries/Java
-Source0:	http://www.apache.org/dist/logging/log4j/%{version}/apache-%{srcname}-%{version}.tar.gz
-# Source0-md5:	8e331a930d0b56280a1c66a00621b3a3
+Source0:	http://www.apache.org/dist/logging/log4j/%{version}/%{srcname}-%{version}.tar.gz
+# Source0-md5:	8218714e41ee0c6509dcfeafa2e1f53f
 Patch0:		apache-log4j-javadoc.patch
-Patch1:		logging-%{srcname}-sourcetarget.patch
-Patch2:		%{name}-version.patch
 URL:		http://logging.apache.org/log4j/
 BuildRequires:	ant >= 1.6.5
 %{?with_tests:BuildRequires:	ant-junit}
@@ -89,8 +87,6 @@ Dokumentacja API log4j.
 %prep
 %setup -q -n apache-log4j-%{version}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %{__rm} log4j-%{version}.jar
 
diff --git a/logging-log4j-sourcetarget.patch b/logging-log4j-sourcetarget.patch
deleted file mode 100644
index b003db3..0000000
--- a/logging-log4j-sourcetarget.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- apache-log4j-1.2.15/build.xml~	2009-02-03 13:00:14.000000000 +0100
-+++ apache-log4j-1.2.15/build.xml	2009-02-03 13:01:23.000000000 +0100
-@@ -97,8 +97,8 @@
-   <!-- Directory for temporary files. -->
-   <property name="dist.tmp" value="${dist.dir}/tmp"/>
-   
--  <property name="javac.source" value="1.2"/>
--  <property name="javac.target" value="1.1"/>
-+  <property name="javac.source" value="1.3"/>
-+  <property name="javac.target" value="1.3"/>
-   
-   <!--  destination for generated documentation on Apache web host  -->
-   <property name="apache.javadoc_dest" value="/www/logging.apache.org/log4j/docs"/>
---- apache-log4j-1.2.15/tests/build.xml~	2007-08-25 06:09:33.000000000 +0200
-+++ apache-log4j-1.2.15/tests/build.xml	2009-02-03 13:55:14.000000000 +0100
-@@ -52,8 +52,8 @@
-   <property name="tests.source.home" value="./src/java/"/>
-   <property name="excludes" value=""/>
-   
--  <property name="javac.source" value="1.1"/>
--  <property name="javac.target" value="1.1"/>
-+  <property name="javac.source" value="1.3"/>
-+  <property name="javac.target" value="1.3"/>
- 
-   <path id="tests.classpath">
-     <pathelement location="${log4j.jar}"/>
-- 
2.44.0