From fbddd597b5089e49bc72b21aefc2559eeaf4c46c7b61f37788298772c8349477 Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Mon, 30 Jun 2014 20:50:08 +0000
Subject: [PATCH] Accepting request 238906 from Java:packages

FWD Java:packages fixes

OBS-URL: https://build.opensuse.org/request/show/238906
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/oro?expand=0&rev=15
---
 oro.changes |  6 ++++++
 oro.spec    | 51 ++++++++++++++++++++-------------------------------
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/oro.changes b/oro.changes
index 79d1534..8104d8a 100644
--- a/oro.changes
+++ b/oro.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jun 27 12:01:25 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner
+- Add support for SLE11 again.
+
 -------------------------------------------------------------------
 Tue Mar 30 11:34:33 UTC 2010 - mvyskocil@suse.cz
 
diff --git a/oro.spec b/oro.spec
index 03f4eb3..dd90580 100644
--- a/oro.spec
+++ b/oro.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package oro (Version 2.0.8)
+# spec file for package oro
 #
-# Copyright (c) 2010 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
@@ -15,27 +15,23 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-# icecream 0
 
-
-Name:           oro
-BuildRequires:  ant java2-devel-packages xml-commons-apis
 %define name		oro
 %define full_name	jakarta-%{name}
-%define version		2.0.8
-%define release		2jpp
-%define section		free
+Name:           oro
 Version:        2.0.8
-Release:        271
+Release:        0
 Summary:        Full regular expressions API
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-Source0:        %{full_name}-%{version}.tar.gz
 Url:            http://jakarta.apache.org/oro/
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Source0:        %{full_name}-%{version}.tar.gz
+BuildRequires:  ant
+BuildRequires:  java2-devel-packages
+BuildRequires:  xml-commons-apis
 Provides:       %{full_name} = %{version}-%{release}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The Jakarta-ORO Java classes are a set of text-processing Java classes
@@ -48,13 +44,9 @@ 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.
 
-
-
 %package javadoc
-License:        Apache-2.0
-PreReq:         coreutils
-Group:          Development/Libraries/Java
 Summary:        Javadoc for oro
+Group:          Development/Libraries/Java
 Provides:       %{full_name}-javadoc = %{version}-%{release}
 
 %description javadoc
@@ -70,8 +62,6 @@ participate in their development under the Jakarta Project.
 
 This package contains the javadoc documentation for ORO.
 
-
-
 %prep
 %setup -q -n %{full_name}-%{version}
 # remove all binary libs
@@ -81,22 +71,21 @@ for dir in `find . -type d -name CVS`; do rm -rf $dir; done
 for file in `find . -type f -name .cvsignore`; do rm -rf $file; done
 
 %build
-ant -Dfinal.name=%{name} jar javadocs
+ant \
+	-Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+	-Dfinal.name=%{name} jar javadocs
 
 %install
 #jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in oro*.jar; do ln -sf ${jar} jakarta-${jar}; done)
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 %{name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+(cd %{buildroot}%{_javadir} && for jar in oro*.jar; do ln -sf ${jar} jakarta-${jar}; done)
 #javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
 rm -rf docs/api
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root)
 %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE