[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/jonas/devel jonas.spec,1.79,1.80



Author: gbenson

Update of /cvs/dist/rpms/jonas/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25122

Modified Files:
	jonas.spec 
Log Message:
Use our new perseus, jorm and medor packages


Index: jonas.spec
===================================================================
RCS file: /cvs/dist/rpms/jonas/devel/jonas.spec,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- jonas.spec	24 Jun 2005 13:03:19 -0000	1.79
+++ jonas.spec	30 Jun 2005 15:34:08 -0000	1.80
@@ -47,7 +47,6 @@
 License:        LGPL
 Group:          Internet/WWW/Servers
 URL:            http://jonas.objectweb.org/
-BuildArch:      noarch
 
 # Source files
 
@@ -158,27 +157,25 @@
 BuildRequires:  jasper5
 
 # Objectweb components
-#BuildRequires:	perseus-cache = 0:1.3.4
+BuildRequires:	perseus-cache = 0:1.3.4
 BuildRequires:	carol = 0:1.8.9.3
-#BuildRequires:	perseus-concurrency = 0:1.4
-#BuildRequires:	perseus-dependency = 0:1.4
+BuildRequires:	perseus-concurrency = 0:1.4
+BuildRequires:	perseus-dependency = 0:1.4
 BuildRequires:	howl-logger = 0:0.1.8
 #BuildRequires:	ishmael = 0:0.1.6
 BuildRequires:	jonathan-jeremie = 0:4.2
 BuildRequires:	jonathan-core = 0:4.1
 BuildRequires:	joram = 0:4.1.5
-#BuildRequires:	jorm = 0:2.4.3
+BuildRequires:	jorm = 0:2.4.3
 BuildRequires:	oldkilim = 0:1.1.3
-#BuildRequires:	jorm-rdb-adapter = 0:2.6
+BuildRequires:	jorm-rdb-adapter = 0:2.6
 BuildRequires:	jotm = 0:2.0.5
-# FIXME with patches?
-#BuildRequires:	medor = 0:1.4.4
-#BuildRequires:	medor-exp = 0:1.4.2
+BuildRequires:	medor = 0:1.4.4
+BuildRequires:	medor-expression = 0:1.4.2
 BuildRequires:	monolog = 0:1.8.6
-# FIXME Why version properties mention 1.0 when there is a 1.2?
 BuildRequires:  objectweb-anttask >= 0:1.0
-#BuildRequires:	perseus-persistence = 0:1.3.4
-#BuildRequires:	perseus-pool = 0:1.3.3
+BuildRequires:	perseus-persistence = 0:1.3.4
+BuildRequires:	perseus-pool = 0:1.3.3
 #BuildRequires:	speedo = 0:1.2.1
 
 # J2EE APIs (mainly under Sun Binary License)
@@ -219,14 +216,14 @@
 # Other packages mentioned in versions.properties
 # FIXME Should be 1.7.3.1
 BuildRequires:	hsqldb >= 0:1.7.3.0
-# The version of JacORB used is patched by ObjectWeb
+# FIXME Need patches
 BuildRequires:	jacorb >= 2.2
 # avalon is actually required by jacorb
-# FIXME We need avalon-framework 4.1.5
+# FIXME Should be 4.1.5
 BuildRequires:  avalon-framework >= 4.1.4
 BuildRequires:  avalon-logkit >= 1.2
 BuildRequires:	jgroups >= 0:2.2.6
-# FIXME Needs newer MX4J
+# FIXME Need patches?
 BuildRequires:	mx4j >= 1:3.0.1
 BuildRequires:	p6spy >= 0:1.3
 # Also from Jakarta
@@ -260,7 +257,6 @@
 BuildRequires:  castor >= 0.9.3.9
 
 # Jakarta Commons _NOT_ mentioned in versions.properties
-# FIXME xml-commons-apis goes into endorsed.
 BuildRequires:	xml-commons-apis >= 0:1.0
 
 # For libgcj only
@@ -301,27 +297,25 @@
 Requires:  jasper5
 
 # Objectweb components
-#Requires:	perseus-cache = 0:1.3.4
+Requires:	perseus-cache = 0:1.3.4
 Requires:	carol = 0:1.8.9.3
-#Requires:	perseus-concurrency = 0:1.4
-#Requires:	perseus-dependency = 0:1.4
+Requires:	perseus-concurrency = 0:1.4
+Requires:	perseus-dependency = 0:1.4
 Requires:	howl-logger = 0:0.1.8
 #Requires:	ishmael = 0:0.1.6
 Requires:	jonathan-jeremie = 0:4.2
 Requires:	jonathan-core = 0:4.1
 Requires:	joram = 0:4.1.5
-#Requires:	jorm = 0:2.4.3
+Requires:	jorm = 0:2.4.3
 Requires:	oldkilim = 0:1.1.3
-#Requires:	jorm-rdb-adapter = 0:2.6
+Requires:	jorm-rdb-adapter = 0:2.6
 Requires:	jotm = 0:2.0.5
-# FIXME with patches?
-#Requires:	medor = 0:1.4.4
-#Requires:	medor-exp = 0:1.4.2
+Requires:	medor = 0:1.4.4
+Requires:	medor-expression = 0:1.4.2
 Requires:	monolog = 0:1.8.6
-# FIXME Why version properties mention 1.0 when there is a 1.2?
 Requires:       objectweb-anttask >= 0:1.0
-#Requires:	perseus-persistence = 0:1.3.4
-#Requires:	perseus-pool = 0:1.3.3
+Requires:	perseus-persistence = 0:1.3.4
+Requires:	perseus-pool = 0:1.3.3
 #Requires:	speedo = 0:1.2.1
 
 # J2EE APIs (mainly under Sun Binary License)
@@ -361,14 +355,14 @@
 # Other packages mentioned in versions.properties
 # FIXME Should be 1.7.3.1
 Requires:	hsqldb >= 0:1.7.3.0
-# The version of JacORB used is patched by ObjectWeb
+# FIXME Need patches
 Requires:	jacorb >= 2.2
 # avalon is actually required by jacorb
-# FIXME We need avalon-framework 4.1.5
+# FIXME Should be 4.1.5
 Requires:  avalon-framework >= 4.1.4
 Requires:  avalon-logkit >= 1.2
 Requires:	jgroups >= 0:2.2.6
-# FIXME Needs newer MX4J
+# FIXME Need patches?
 Requires:	mx4j >= 1:3.0.1-1jpp_2fc
 Requires:	p6spy >= 0:1.3
 # Also from Jakarta
@@ -399,19 +393,18 @@
 Requires:	gif89encoder
 
 # Needed by the JAXR-RI
-Requires:  castor >= 0.9.3.9
+Requires:  	castor >= 0.9.3.9
 
 # Jakarta Commons _NOT_ mentioned in versions.properties
-# FIXME xml-commons-apis goes into endorsed.
 Requires:	xml-commons-apis >= 0:1.0
 
-# For Red Hat only
-Requires: postgresql >= 7.3.4
-Requires: postgresql-server >= 7.3.4
-Requires: postgresql-jdbc >= 7.3.4
-
 # For libgcj only
-Requires: jonathan-rmi >= 3.1-2
+Requires: 	jonathan-rmi >= 3.1-2
+
+# For Red Hat only
+Requires: 	postgresql >= 7.3.4
+Requires: 	postgresql-server >= 7.3.4
+Requires: 	postgresql-jdbc >= 7.3.4
 
 # --------------------------------------------------------------------
 # End Execution dependencies
@@ -477,6 +470,7 @@
 find . -name "*.zip" -exec rm -f {} \;
 #find . -name "*.jar" -exec rm -f {} \;
 #find . -name "*.war" -exec rm -f {} \;
+#find . -name "*.rar" -exec rm -f {} \;
 
 cp %{SOURCE1} .
 cd %{name}
@@ -581,16 +575,17 @@
 pushd externals/commons/jonas
 	find . -mindepth 1 -maxdepth 1 \
                -name "*.jar" \
-               -not -name "*howl*" \
                -exec rm -f {} \;
-#	build-jar-repository . p6spy howl jotm
-	build-jar-repository . p6spy jotm
+	build-jar-repository . p6spy howl-logger jotm
 popd
 
-#pushd externals/commons/jonas/perseus
-#	find . -name "*.jar" -exec rm -f {} \;
-#	build-jar-repository . perseus/ow_perseus_cache perseus/ow_perseus_concurrency perseus/ow_perseus_dependency perseus/ow_perseus_persistence perseus/ow_perseus_connection_holder perseus/ow_perseus_pool
-#popd
+pushd externals/commons/jonas/perseus
+	find . -name "*.jar" -exec rm -f {} \;
+	build-jar-repository . perseus/ow_perseus_cache \
+	    perseus/ow_perseus_concurrency perseus/ow_perseus_dependency \
+ 	    perseus/ow_perseus_persistence perseus/ow_perseus_pool
+# perseus/ow_perseus_connection_holder ?
+popd
 
 pushd externals/commons/jonas/carol
 	find . -name "*.jar" -exec rm -f {} \;
@@ -616,17 +611,19 @@
 	build-jar-repository . regexp java_cup joram/client joram/connector  joram/mom joram/shared
 popd
 
-#pushd externals/commons/jonas/jorm
-#	find . -name "*.jar" \
-#               -exec rm -f {} \;
-#	build-jar-repository . jorm-rdb-adapter/ow_jorm_rdb_adapter jorm/ow_jorm_api jorm/ow_jorm_core jorm/ow_jorm_runtime
-#popd
+pushd externals/commons/jonas/jorm
+	find . -name "*.jar" \
+               -exec rm -f {} \;
+	build-jar-repository . jorm/ow_jorm_rdb_adapter \
+	    jorm/ow_jorm_api jorm/ow_jorm_core jorm/ow_jorm_runtime
+popd
 
-#pushd externals/commons/jonas/medor
-#	find . -name "*.jar" \
-#               -exec rm -f {} \;
-#	build-jar-repository . medor-exp/ow_medor_exp medor/ow_medor medor/ow_medor_clone
-#popd
+pushd externals/commons/jonas/medor
+	find . -name "*.jar" \
+               -exec rm -f {} \;
+	build-jar-repository . medor/ow_medor_exp \
+	    medor/ow_medor medor/ow_medor_clone
+popd
 
 pushd externals/commons/jonas/monolog
 	find . -name "*.jar" -exec rm -f {} \;
@@ -668,14 +665,17 @@
 pushd externals/tools
 	find . -name "*.jar" \
                -not -name "ews*.jar" \
-               -not -name "ow_jorm_compiler*.jar" \
                -not -name "xbean-apache*.jar" \
                -exec rm -f {} \;
 	# externals/tools/velocity-dep-1.4.jar includes also
 	# commons-collections, avalon-logkit and oro
         # collections is in commons;  logkit is in endorsed
-#	build-jar-repository . commons-digester axis/axis-ant carol/ow_carol_cmic monolog/ow_util_log_wrp_velo velocity oro hsqldb ews jorm/ow_jorm_compiler xmlbeans
-	build-jar-repository . commons-digester axis/axis-ant carol/ow_carol_cmic monolog/ow_util_log_wrp_velo velocity oro hsqldb
+#	build-jar-repository . commons-digester axis/axis-ant \
+#	    carol/ow_carol_cmic monolog/ow_util_log_wrp_velo velocity oro \
+#	    hsqldb ews jorm/ow_jorm_compiler xmlbeans
+	build-jar-repository . commons-digester axis/axis-ant \
+	    carol/ow_carol_cmic monolog/ow_util_log_wrp_velo velocity oro \
+	    hsqldb jorm/ow_jorm_compiler
 popd
 
 # FIXME Someone is getting confused with the brackets in the war
@@ -872,9 +872,9 @@
                -exec rm -f {} \;
 popd
 
-#pushd $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus
-#	find . -name "*.jar" -exec rm -f {} \;
-#popd
+pushd $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus
+	find . -name "*.jar" -exec rm -f {} \;
+popd
 
 pushd $RPM_BUILD_ROOT%{libdir}/commons/jonas/carol
 	find . -name "*.jar" -exec rm -f {} \;
@@ -893,13 +893,13 @@
 	find . -name "*.jar" -exec rm -f {} \;
 popd
 
-#pushd $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm
-#	find . -name "*.jar" -exec rm -f {} \;
-#popd
+pushd $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm
+	find . -name "*.jar" -exec rm -f {} \;
+popd
 
-#pushd $RPM_BUILD_ROOT%{libdir}/commons/jonas/medor
-#	find . -name "*.jar" -exec rm -f {} \;
-#popd
+pushd $RPM_BUILD_ROOT%{libdir}/commons/jonas/medor
+	find . -name "*.jar" -exec rm -f {} \;
+popd
 
 pushd $RPM_BUILD_ROOT%{libdir}/commons/jonas/monolog
 	find . -name "*.jar" -exec rm -f {} \;
@@ -977,7 +977,6 @@
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee	jms
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee	jspapi
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee	jta
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee	jts
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee	javamail/imap
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee	javamail/mailapi
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/j2ee	javamail/pop3
@@ -997,12 +996,12 @@
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas	 	jotm
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas	 	p6spy
 
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_cache
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_concurrency
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_dependency
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_persistence
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_cache
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_concurrency
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_dependency
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_persistence
 #build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_connection_holder
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_pool
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/perseus 	perseus/ow_perseus_pool
 
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/carol 	jgroups
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/carol 	carol/ow_carol_core
@@ -1025,14 +1024,14 @@
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/joram	joram/mom
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/joram	joram/shared
 
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm	jorm-rdb-adapter/ow_jorm_rdb_adapter
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm	jorm/ow_jorm_api
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm	jorm/ow_jorm_core
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm	jorm/ow_jorm_runtime
-
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/medor	medor-exp/ow_medor_exp
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/medor	medor/ow_medor
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/medor	medor/ow_medor_clone
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm	jorm/ow_jorm_rdb_adapter
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm	jorm/ow_jorm_api
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm	jorm/ow_jorm_core
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/jorm	jorm/ow_jorm_runtime
+
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/medor	medor/ow_medor_exp
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/medor	medor/ow_medor
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/medor	medor/ow_medor_clone
 
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/monolog	monolog/ow_util_log_helper
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/commons/jonas/monolog	monolog/ow_util_log_api
@@ -1090,7 +1089,7 @@
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/tools		carol/ow_carol_cmic
 build-jar-repository $RPM_BUILD_ROOT%{libdir}/tools		monolog/ow_util_log_wrp_velo
 #build-jar-repository $RPM_BUILD_ROOT%{libdir}/tools		ews
-#build-jar-repository $RPM_BUILD_ROOT%{libdir}/tools		jorm/ow_jorm_compiler
+build-jar-repository $RPM_BUILD_ROOT%{libdir}/tools		jorm/ow_jorm_compiler
 #build-jar-repository $RPM_BUILD_ROOT%{libdir}/tools		xmlxbean
 
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]