SPECS: jakarta-oro.spec - killed EA - use java-gcj-compat-devel (gjdoc need...

[pawelz]

Author: pawelz                       Date: Thu Feb 12 17:36:26 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- killed EA
- use java-gcj-compat-devel (gjdoc needs Patch0)
- unified

---- Files affected:
SPECS:
   jakarta-oro.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/jakarta-oro.spec
diff -u SPECS/jakarta-oro.spec:1.10 SPECS/jakarta-oro.spec:1.11
--- SPECS/jakarta-oro.spec:1.10	Tue Feb 13 09:06:35 2007
+++ SPECS/jakarta-oro.spec	Thu Feb 12 18:36:21 2009
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+%bcond_without	javadoc		# don't build javadoc
 Summary:	Full regular expressions API
 Summary(pl.UTF-8):	Pełne API do wyrażeń regularnych
 Name:		jakarta-oro
@@ -8,14 +9,13 @@
 Group:		Development/Languages/Java
 Source0:	http://www.apache.org/dist/jakarta/oro/%{name}-%{version}.zip
 # Source0-md5:	af58ac4811ee023b6211446eb7b7fff2
+Patch0:		%{name}-buildfix.patch
 URL:		http://jakarta.apache.org/oro/
 BuildRequires:	ant >= 1.5
-BuildRequires:	jdk
+BuildRequires:	java-gcj-compat-devel
 BuildRequires:	jpackage-utils
 BuildRequires:	rpmbuild(macros) >= 1.300
-Requires:	jre
 BuildArch:	noarch
-ExclusiveArch:	i586 i686 pentium3 pentium4 athlon %{x8664} noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -55,14 +55,18 @@
 
 %prep
 %setup -q
-find . -name "*.jar" -exec rm -f {} \;
-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
+%patch0 -p1
 
 %build
 unset CLASSPATH || :
-export JAVA_HOME="%{java_home}"
-%ant -Dfinal.name=oro jar javadocs
+
+%ant clean
+%ant -Dfinal.name=oro -Dbuild.compiler=extJavac jar
+
+%if %{with javadoc}
+export SHELL=/bin/sh
+%ant javadocs
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -72,18 +76,25 @@
 ln -sf oro-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/oro.jar
 
 cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post javadoc
+ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+
 %files
 %defattr(644,root,root,755)
 %doc COMPILE ISSUES README TODO CHANGES CONTRIBUTORS LICENSE STYLE
 %{_javadir}/*.jar
 
+%if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%doc %{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 
@@ -92,6 +103,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2009/02/12 17:36:21  pawelz
+- killed EA
+- use java-gcj-compat-devel (gjdoc needs Patch0)
+- unified
+
 Revision 1.10  2007/02/13 08:06:35  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jakarta-oro.spec?r1=1.10&r2=1.11&f=u