From c8e5c34cd7b0a2c616d9f974a97f9b16ea26ef6e Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Tue, 19 Jun 2012 11:25:06 +0200
Subject: [PATCH] Remove RPM bug workaround

---
 apache-commons-net.spec | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/apache-commons-net.spec b/apache-commons-net.spec
index 8d4513f..b0f8cc5 100644
--- a/apache-commons-net.spec
+++ b/apache-commons-net.spec
@@ -11,8 +11,10 @@ Group:          Development/Libraries
 URL:            http://commons.apache.org/%{base_name}/
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  java-devel >= 1:1.6.0
+
+BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
+BuildRequires:  maven
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-changes-plugin
 BuildRequires:  maven-surefire-provider-junit
@@ -20,12 +22,13 @@ BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  maven-plugin-build-helper
 BuildRequires:  apache-commons-parent
 
-Requires:       java >= 1:1.6.0
-Requires:       jpackage-utils >= 0:1.7.2
+Requires:       java
+Requires:       jpackage-utils
 
 Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < 0:2.0-3
 
+
 %description
 This is an Internet protocol suite Java library originally developed by
 ORO, Inc.  This version supports Finger, Whois, TFTP, Telnet, POP3, FTP,
@@ -62,7 +65,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
 
-
 # pom
 install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
@@ -73,11 +75,6 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
-%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} || :
-
 %files
 %doc LICENSE.txt NOTICE.txt
 %{_javadir}/*
@@ -91,6 +88,7 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 %changelog
 * Tue Jun 19 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1-1
 - Update to upstream 3.1
+- Remove RPM bug workaround
 
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild