From 6479c32ae5f8f0caf7d2be4a000a529e21fafbbd Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: Mon, 21 Feb 2011 15:41:48 +0200
Subject: [PATCH] Fix merge review comments.

---
 jakarta-oro.spec | 53 ++++++++++++++++++++----------------------------
 1 file changed, 22 insertions(+), 31 deletions(-)

diff --git a/jakarta-oro.spec b/jakarta-oro.spec
index d5db5db..fc10829 100644
--- a/jakarta-oro.spec
+++ b/jakarta-oro.spec
@@ -28,25 +28,23 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define base_name		oro
+%global base_name oro
 
 Name:           jakarta-oro
 Version:        2.0.8
-Release:        8%{?dist}
-Epoch:		0
+Release:        9%{?dist}
+Epoch:          0
 Summary:        Full regular expressions API
 License:        ASL 1.1
-Group:          Development/Java
-Source0:        %{name}-%{version}.tar.gz
+Group:          Development/Libraries
+Source0:        http://archive.apache.org/dist/jakarta/oro/%{name}-%{version}.tar.gz
 Source1:        MANIFEST.MF
 Patch1:         %{name}-build-xml.patch
 URL:            http://jakarta.apache.org/oro
 BuildRequires:  jpackage-utils > 1.6
 BuildRequires:  ant
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-buildroot
-Provides:       oro = %{epoch}:%{version}-%{release}
-Obsoletes:      oro <= 0:2.0.8
+Requires:       jpackage-utils
 
 %description
 The Jakarta-ORO Java classes are a set of text-processing Java classes
@@ -54,26 +52,17 @@ that provide Perl5 compatible regular expressions, AWK-like regular
 expressions, glob expressions, and utility classes for performing
 substitutions, splits, filtering filenames, etc. This library is the
 successor to the OROMatcher, AwkTools, PerlTools, and TextTools
-libraries from ORO, Inc. (www.oroinc.com). They have been donated to the
-Jakarta Project by Daniel Savarese (www.savarese.org), the copyright
-holder of the ORO libraries. Daniel will continue to participate in
-their development under the Jakarta Project.
+libraries from ORO, Inc. (www.oroinc.com). 
 
 %package javadoc
-Group:          Development/Java
+Group:          Documentation
 Summary:        Javadoc for %{name}
-Provides:       oro-javadoc = %{epoch}:%{version}-%{release}
-Obsoletes:      oro-javadoc <= 0:2.0.8
-#BuildRequires:  java-javadoc
-# for /bin/rm and /bin/ln
-Requires(post):  coreutils
-Requires(postun): coreutils
+Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{name}-%{version}
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
@@ -90,17 +79,17 @@ ant -Dfinal.name=%{base_name} jar javadocs
 %install
 #jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{base_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}-%{version}.jar %{base_name}-%{version}.jar)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+install -m 644 %{base_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+(cd $RPM_BUILD_ROOT%{_javadir} && ln -sf %{name}.jar %{base_name}.jar)
 #javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 rm -rf docs/api
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+%pre javadoc
+# workaround for rpm bug, can be removed in F-18
+[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
+rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
 %files
 %defattr(-,root,root)
@@ -109,10 +98,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(-,root,root)
-%doc %{_javadocdir}/%{name}-%{version}
-%doc %{_javadocdir}/%{name}
+%doc LICENSE
+%{_javadocdir}/%{name}
 
 %changelog
+* Mon Feb 21 2011 Alexander Kurtakov <akurtako@redhat.com> 0:2.0.8-9
+- Fix merge review comments.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:2.0.8-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
@@ -207,4 +199,3 @@ rm -rf $RPM_BUILD_ROOT
 
 * Sun Jan 14 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 2.0.1-1mdk
 - first Mandrake release
-