packages: openfire/openfire.spec - trying to use as many system libs as we ...

[paszczus]

Author: paszczus                     Date: Mon May  4 07:04:53 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- trying to use as many system libs as we can...
- BuildArch: noarch
- building plugins fails for now

---- Files affected:
packages/openfire:
   openfire.spec (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/openfire/openfire.spec
diff -u packages/openfire/openfire.spec:1.11 packages/openfire/openfire.spec:1.12
--- packages/openfire/openfire.spec:1.11	Sun May  3 11:58:08 2009
+++ packages/openfire/openfire.spec	Mon May  4 09:04:48 2009
@@ -3,6 +3,13 @@
 # TODO:
 # - PLDize init script
 # - PLDize at all...
+# Conditional build:
+%if "%{pld_release}" == "ti"
+%bcond_without	java_sun	# build with gcj
+%else
+%bcond_with	java_sun	# build with java-sun
+%endif
+#
 Summary:	Openfire XMPP Server
 Name:		openfire
 Version:	3.6.4
@@ -16,9 +23,20 @@
 Group:		Applications/Communications
 URL:		http://www.igniterealtime.org/
 BuildRequires:	ant
-BuildRequires:	java-sun
+BuildRequires:	java-commons-el
+BuildRequires:	java-commons-httpclient
+%{!?with_java_sun:BuildRequires:        java-gcj-compat-devel}
+BuildRequires:	java-servletapi5
+%{?with_java_sun:BuildRequires: java-sun}
+Buildrequires:	java-mail
+BuildRequires:	java-commons-lang
+BuildRequires:	java-commons-logging
+BuildRequires:	java-jdom
+BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	tomcat-jasper
 Requires:	java-sun
 Requires:	java-sun-jre-X11
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -37,8 +55,10 @@
 %endif
 
 %build
+required_jars="ant commons-httpclient commons-el commons-lang commons-logging jasper-compiler jasper-runtime jdom jsp-api mail servletapi5 qdox"
 cd build
-%ant openfire
+CLASSPATH=lib/ant-jive-edition.jar:lib/ant-contrib.jar:lib/ant-subdirtask.jar:lib/xmltask.jar:lib/pack200task.jar:lib/merge/mina-core.jar:lib/merge/mina-filter-compression.jar:lib/merge/mina-filter-ssl.jar:lib/merge/dom4j.jar:lib/merge/xpp3.jar:lib/merge/proxool.jar:lib/merge/stringprep.jar:lib/merge/jetty.jar:lib/merge/jetty-util.jar:lib/merge/jetty-sslengine.jar:lib/merge/jzlib.jar:lib/merge/jstun-0.6.1.jar:lib/merge/shaj.jar:lib/dist/jdic.jar:lib/i4jruntime.jar:lib/merge/jmdns.jar:lib/dist/bouncycastle.jar:lib/merge/rome.jar:lib/merge/rome-fetcher.jar:lib/merge/jstl.jar:lib/merge/dbutil.jar:$(build-classpath $required_jars)
+%ant openfire -Dbuild.sysclasspath=only
 %ant -Dplugin=search plugin
 cd ..
 
@@ -103,7 +123,7 @@
 %{_datadir}/openfire/lib/*.jar
 %dir %{_datadir}/openfire/logs
 %dir %{_datadir}/openfire/plugins
-%{_datadir}/openfire/plugins/search.jar
+#%{_datadir}/openfire/plugins/search.jar
 %dir %{_datadir}/openfire/plugins/admin
 %{_datadir}/openfire/plugins/admin/*
 %dir %{_datadir}/openfire/resources
@@ -138,6 +158,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.12  2009/05/04 07:04:48  paszczus
+- trying to use as many system libs as we can...
+- BuildArch: noarch
+- building plugins fails for now
+
 Revision 1.11  2009/05/03 09:58:08  paszczus
 - updated to 3.6.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openfire/openfire.spec?r1=1.11&r2=1.12&f=u