From 93e72093fed3282071ab20331dc8897c0650f4fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 13 Jan 2012 21:23:06 +0200 Subject: [PATCH] Crosslink with local JDK API docs. --- slf4j-1.6.1-crosslink.patch | 16 ++++++++++++++++ slf4j.spec | 9 ++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 slf4j-1.6.1-crosslink.patch diff --git a/slf4j-1.6.1-crosslink.patch b/slf4j-1.6.1-crosslink.patch new file mode 100644 index 0000000..d276b20 --- /dev/null +++ b/slf4j-1.6.1-crosslink.patch @@ -0,0 +1,16 @@ +diff -up slf4j-1.6.1/pom.xml~ slf4j-1.6.1/pom.xml +--- slf4j-1.6.1/pom.xml~ 2012-01-13 20:54:56.336392307 +0200 ++++ slf4j-1.6.1/pom.xml 2012-01-13 21:05:50.590098336 +0200 +@@ -145,9 +145,11 @@ + + true + org.slf4j.migrator:org.slf4j.migrator.* ++ false ++ false + + +- http://java.sun.com/j2se/1.5.0/docs/api ++ /usr/share/javadoc/java + + + diff --git a/slf4j.spec b/slf4j.spec index fa6be2d..e5b68bb 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -30,7 +30,7 @@ Name: slf4j Version: 1.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 0 Summary: Simple Logging Facade for Java Group: Development/Libraries @@ -39,6 +39,7 @@ 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 +Patch2: %{name}-1.6.1-crosslink.patch Requires(post): jpackage-utils >= 0:1.7.5 Requires(postun): jpackage-utils >= 0:1.7.5 BuildRequires: jpackage-utils >= 0:1.7.5 @@ -84,6 +85,8 @@ API implementation, e.g. Log4jLoggerAdapter or JDK14LoggerAdapter.. Group: Documentation Summary: Javadoc for %{name} Requires: jpackage-utils +BuildRequires: java-javadoc +Requires: java-javadoc %description javadoc API documentation for %{name}. @@ -99,6 +102,7 @@ Manual for %{name}. %setup -q %patch0 -p0 -b .sav %patch1 -p1 +%patch2 -p1 find . -name "*.jar" | xargs rm sed -i -e "s|ant<|org.apache.ant<|g" integration/pom.xml @@ -210,6 +214,9 @@ install -m 644 LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/ %{_docdir}/%{name}-%{version}/site %changelog +* Fri Jan 13 2012 Ville Skyttä - 0:1.6.1-5 +- Crosslink with local JDK API docs. + * Fri Jan 13 2012 Ville Skyttä - 0:1.6.1-4 - Specify explicit source encoding to fix build with Java 1.7. - Remove no longer needed javadoc dir upgrade hack.