SPECS: java-oro.spec - renamed from jakarta-oro - include java rpm macros -...

[pawelz]

Author: pawelz                       Date: Wed Apr  1 16:20:06 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- renamed from jakarta-oro
- include java rpm macros
- jdk bconds

---- Files affected:
SPECS:
   java-oro.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/java-oro.spec
diff -u SPECS/java-oro.spec:1.13 SPECS/java-oro.spec:1.14
--- SPECS/java-oro.spec:1.13	Mon Mar 30 07:41:12 2009
+++ SPECS/java-oro.spec	Wed Apr  1 18:20:01 2009
@@ -1,8 +1,18 @@
 # $Revision$, $Date$
 %bcond_without	javadoc		# don't build javadoc
+
+%if "%{pld_release}" == "ti"
+%bcond_without java_sun        # build with gcj
+%else
+%bcond_with    java_sun        # build with java-sun
+%endif
+
+%include        /usr/lib/rpm/macros.java
+
+%define         srcname         commons-net
 Summary:	Full regular expressions API
 Summary(pl.UTF-8):	Pełne API do wyrażeń regularnych
-Name:		jakarta-oro
+Name:		java-oro
 Version:	2.0.8
 Release:	3
 License:	Apache v2.0
@@ -12,8 +22,10 @@
 Patch0:		%{name}-buildfix.patch
 URL:		http://jakarta.apache.org/oro/
 BuildRequires:	ant >= 1.5
-BuildRequires:	java-gcj-compat-devel
+%{!?with_java_sun:BuildRequires:        java-gcj-compat-devel}
+%{?with_java_sun:BuildRequires: java-sun}
 BuildRequires:	jpackage-utils
+BuildRequires:  rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,7 +49,7 @@
 podstawień, podziałów, filtrowania nazw plików itp. Ta biblioteka jest
 następcą bibliotek OROMatcher, AwkTools, PerlTools i TextTools firmy
 ORO Inc. (http://www.oroinc.com/). Zostały podarowane projektowi
-Jakarta przez DAniela Savarese (http://www.savarese.org/), właściciela
+Jakarta przez Daniela Savarese (http://www.savarese.org/), właściciela
 praw autorskich do bibliotek ORO. Daniel będzie nadal udzielał się
 przy rozwoju tych bibliotek w projekcie Jakarta.
 
@@ -61,28 +73,23 @@
 unset CLASSPATH || :
 
 %ant clean
-%ant -Dfinal.name=oro -Dbuild.compiler=extJavac jar
-
-%if %{with javadoc}
-export SHELL=/bin/sh
-%ant javadocs
-%endif
+%ant -Dfinal.name=oro jar %{?with_javadoc:javadocs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{name}-%{version}}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{srcname}-%{version}}
 
 cp oro.jar $RPM_BUILD_ROOT%{_javadir}/oro-%{version}.jar
 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
+cp -R docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post javadoc
-ln -nfs %{name}-%{version} %{_javadocdir}/%{name}
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
 
 %files
 %defattr(644,root,root,755)
@@ -92,8 +99,8 @@
 %if %{with javadoc}
 %files javadoc
 %defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -103,6 +110,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2009/04/01 16:20:01  pawelz
+- renamed from jakarta-oro
+- include java rpm macros
+- jdk bconds
+
 Revision 1.13  2009/03/30 05:41:12  pawelz
 - G: Libraries/Java
 
================================================================

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