[slf4j] Specify explicit source encoding to fix build with Java 1.7. Remove no longer needed javadoc dir upg

[Ville Skyttä]

commit f2b179705967d3523e6fe350cbed9d68b505cba1
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Fri Jan 13 20:48:31 2012 +0200

    Specify explicit source encoding to fix build with Java 1.7.
    Remove no longer needed javadoc dir upgrade hack.

 slf4j-1.6.1-srcencoding.patch |   13 +++++++++++++
 slf4j.spec                    |   13 +++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)
---
diff --git a/slf4j-1.6.1-srcencoding.patch b/slf4j-1.6.1-srcencoding.patch
new file mode 100644
index 0000000..0129084
--- /dev/null
+++ b/slf4j-1.6.1-srcencoding.patch
@@ -0,0 +1,13 @@
+diff -up slf4j-1.6.1/pom.xml~ slf4j-1.6.1/pom.xml
+--- slf4j-1.6.1/pom.xml~	2012-01-13 20:30:23.188554249 +0200
++++ slf4j-1.6.1/pom.xml	2012-01-13 20:45:05.790659657 +0200
+@@ -30,6 +30,9 @@
+     <slf4j.api.minimum.compatible.version>1.6.0</slf4j.api.minimum.compatible.version>
+     <cal10n.version>0.7.4</cal10n.version>
+     <log4j.version>1.2.16</log4j.version>
++    <!-- Because of a non-ASCII comment in
++         slf4j-api/src/main/java/org/slf4j/helpers/MessageFormatter.java -->
++    <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+   </properties>
+ 
+ 
diff --git a/slf4j.spec b/slf4j.spec
index 91f790f..fa6be2d 100644
--- a/slf4j.spec
+++ b/slf4j.spec
@@ -30,7 +30,7 @@
 
 Name:           slf4j
 Version:        1.6.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Epoch:          0
 Summary:        Simple Logging Facade for Java
 Group:          Development/Libraries
@@ -38,6 +38,7 @@ License:        MIT
 URL:            http://www.slf4j.org/
 Source0:        http://www.slf4j.org/dist/%{name}-%{version}.tar.gz
 Patch0:         %{name}-pom_xml.patch
+Patch1:         %{name}-1.6.1-srcencoding.patch
 Requires(post): jpackage-utils >= 0:1.7.5
 Requires(postun): jpackage-utils >= 0:1.7.5
 BuildRequires:  jpackage-utils >= 0:1.7.5
@@ -97,6 +98,7 @@ Manual for %{name}.
 %prep
 %setup -q
 %patch0 -p0  -b .sav
+%patch1 -p1
 find . -name "*.jar" | xargs rm
 
 sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml
@@ -188,11 +190,6 @@ rm -f target/site/.htaccess
 cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
 %post
 %update_maven_depmap
 
@@ -213,6 +210,10 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %{_docdir}/%{name}-%{version}/site
 
 %changelog
+* Fri Jan 13 2012 Ville Skyttä <ville.skytta at iki.fi> - 0:1.6.1-4
+- Specify explicit source encoding to fix build with Java 1.7.
+- Remove no longer needed javadoc dir upgrade hack.
+
 * Wed Jun 8 2011 Alexander Kurtakov <akurtako at redhat.com> 0:1.6.1-3
 - Build with maven 3.x.