packages: openfire/openfire.spec - it looks like openfire cannot be built w...

[paszczus]

Author: paszczus                     Date: Mon May  4 09:13:16 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- it looks like openfire cannot be built with gcj so backing to java-sun
- fixed description
- some TODO removed

---- Files affected:
packages/openfire:
   openfire.spec (1.14 -> 1.15) 

---- Diffs:

================================================================
Index: packages/openfire/openfire.spec
diff -u packages/openfire/openfire.spec:1.14 packages/openfire/openfire.spec:1.15
--- packages/openfire/openfire.spec:1.14	Mon May  4 10:39:19 2009
+++ packages/openfire/openfire.spec	Mon May  4 11:13:11 2009
@@ -1,16 +1,8 @@
 # $Revision$, $Date$
 #
 # TODO:
-# - PLDize init script
 # - PLDize at all...
-# - see %desc, does it really include jre?
 # - missing service restarts in post?
-# Conditional build:
-%if "%{pld_release}" == "ti"
-%bcond_without	java_sun	# build with gcj
-%else
-%bcond_with	java_sun	# build with java-sun
-%endif
 #
 %define		ver	%(echo %{version} | tr . _)
 Summary:	Openfire XMPP Server
@@ -28,14 +20,13 @@
 BuildRequires:	ant
 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-sun
 Buildrequires:	java-mail
 BuildRequires:	java-commons-lang
 BuildRequires:	java-commons-logging
 BuildRequires:	java-jdom
-BuildRequires:	rpm >= 4.4.9-56
+BuildRequires:	java-qdox
 BuildRequires:	tomcat-jasper
 Requires:	java-sun
 Requires:	java-sun-jre-X11
@@ -47,8 +38,6 @@
 the XMPP (Jabber) protocol. It has great performance, is easy to setup
 and use, and delivers an innovative feature set.
 
-This particular release includes a bundled JRE.
-
 %prep
 %setup -q -n %{name}_src
 cp %{SOURCE1} .
@@ -161,6 +150,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2009/05/04 09:13:11  paszczus
+- it looks like openfire cannot be built with gcj so backing to java-sun
+- fixed description
+- some TODO removed
+
 Revision 1.14  2009/05/04 08:39:19  glen
 - and so on
 
================================================================

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