From 08b1e21a79da4e34c0375825c9fe8f00266d4d891c03faa9cb54f15f7dbeec90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 8 Jul 2014 10:56:34 +0000
Subject: [PATCH] - Do not depend on ant-nodeps.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javahelp2?expand=0&rev=9
---
 javahelp2.changes |  5 +++++
 javahelp2.spec    | 21 ++++++---------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/javahelp2.changes b/javahelp2.changes
index fef76fe..ce2e3a0 100644
--- a/javahelp2.changes
+++ b/javahelp2.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jul  8 10:56:25 UTC 2014 - tchvatal@suse.com
+
+- Do not depend on ant-nodeps.
+
 -------------------------------------------------------------------
 Tue Sep 10 11:34:03 UTC 2013 - mvyskocil@suse.com
 
diff --git a/javahelp2.spec b/javahelp2.spec
index fc58fce..4e1e2d4 100644
--- a/javahelp2.spec
+++ b/javahelp2.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package javahelp2
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,7 @@
 #
 
 
-%define oname			javahelp
-%define section			free
-
+%define oname   javahelp
 Name:           javahelp2
 Version:        2.0.05
 Release:        0
@@ -32,17 +30,16 @@ Source1:        %{name}-jhindexer.sh
 Source2:        %{name}-jhsearch.sh
 Source3:        %{oname}-%{version}.pom
 Source4:        https://javahelp.dev.java.net/license.txt
-BuildArch:      noarch
-PreReq:         javapackages-tools
-Requires:       geronimo-jsp-2_0-api
-Requires:       geronimo-servlet-2_4-api
 BuildRequires:  ant >= 1.6.5
 BuildRequires:  ant-nodeps
 BuildRequires:  geronimo-jsp-2_0-api
 BuildRequires:  geronimo-servlet-2_4-api
 BuildRequires:  java-devel >= 1.5.0
 BuildRequires:  javapackages-tools
+Requires:       geronimo-jsp-2_0-api
+Requires:       geronimo-servlet-2_4-api
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 JavaHelp software is a full-featured, platform-independent, extensible
@@ -51,8 +48,6 @@ help in applets, components, applications, operating systems, and
 devices. Authors can also use the JavaHelp software to deliver online
 documentation for the Web and corporate Intranet.
 
-
-
 %package manual
 Summary:        Java online help system
 Group:          Development/Libraries/Java
@@ -64,8 +59,6 @@ help in applets, components, applications, operating systems, and
 devices. Authors can also use the JavaHelp software to deliver online
 documentation for the Web and corporate Intranet.
 
-
-
 %package javadoc
 Summary:        Java online help system
 Group:          Development/Libraries/Java
@@ -77,10 +70,8 @@ help in applets, components, applications, operating systems, and
 devices. Authors can also use the JavaHelp software to deliver online
 documentation for the Web and corporate Intranet.
 
-
-
 %prep
-%setup -q 
+%setup -q
 # fix files perms
 chmod -R go=u-w *
 # remove windows files