rpms/mx4j/devel mx4j-caucho-build.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 mx4j-bz133180.patch, 1.1, 1.2 mx4j.spec, 1.25, 1.26 sources, 1.5, 1.6 mx4j-docbook-style.patch, 1.1, NONE mx4j-jetty.patch, 1.1, NONE mx4j-redhat-build.patch, 1.1, NONE

Mon Jun 20 11:38:42 UTC 2005

Author: gbenson

Update of /cvs/dist/rpms/mx4j/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17511

Modified Files:
	.cvsignore mx4j-bz133180.patch mx4j.spec sources 
Added Files:
	mx4j-caucho-build.patch 
Removed Files:
	mx4j-docbook-style.patch mx4j-jetty.patch 
	mx4j-redhat-build.patch 
Log Message:
Sync with RHAPS for 3.0.1-1jpp

mx4j-caucho-build.patch:
 build.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE mx4j-caucho-build.patch ---
--- mx4j/build/build.xml.orig	Thu Dec 23 20:05:06 2004
+++ mx4j/build/build.xml	Thu Dec 23 20:06:16 2004
@@ -306,9 +306,9 @@
          <exclude name="mx4j/tools/remote/**" unless="jaas.present"/>
          <exclude name="mx4j/tools/remote/rmi/SSL*" unless="jdk14.present"/>
          <exclude name="mx4j/tools/remote/http/jetty/**" unless="jetty.present"/>
-         <exclude name="mx4j/tools/remote/caucho/**" unless="jdk14.present"/>
-         <exclude name="mx4j/tools/remote/**/hessian/**" unless="jdk14.present"/>
-         <exclude name="mx4j/tools/remote/**/burlap/**" unless="jdk14.present"/>
+         <exclude name="mx4j/tools/remote/caucho/**"/>
+         <exclude name="mx4j/tools/remote/**/hessian/**"/>
+         <exclude name="mx4j/tools/remote/**/burlap/**"/>
          <classpath>
             <path refid="classpath"/>
             <pathelement location="${core.classes.dir}"/>


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Apr 2005 13:25:52 -0000	1.7
+++ .cvsignore	20 Jun 2005 11:38:38 -0000	1.8
@@ -1,4 +1,4 @@
-mx4j-2.1.0-src.tar.gz
-mx4j-2.1.0
+mx4j-3.0.1-src.tar.gz
+mx4j-3.0.1
 i386
 *.src.rpm

mx4j-bz133180.patch:
 build.xml |    4 ++++
 1 files changed, 4 insertions(+)

Index: mx4j-bz133180.patch
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j-bz133180.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mx4j-bz133180.patch	20 Jun 2005 11:11:25 -0000	1.1
+++ mx4j-bz133180.patch	20 Jun 2005 11:38:38 -0000	1.2
@@ -26,19 +26,3 @@
  
        <jar jarfile="${rjmx-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
           <fileset dir="${core.classes.dir}">
-@@ -338,6 +342,7 @@
-          </classpath>
-       </javac>
- 
-+<!--
-       <rmic base="${tools.classes.dir}" classpathref="classpath" debug="yes" stubversion="1.2">
-          <include name="mx4j/tools/adaptor/rmi/RMIAdaptor.*" unless="releasing"/>
-          <include name="mx4j/tools/connector/rmi/RemoteNotificationListenerImpl.*" unless="releasing"/>
-@@ -352,6 +357,7 @@
-             <path refid="classpath"/>
-          </classpath>
-       </rmic>
-+-->
- 
-       <jar jarfile="${tools.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
-          <fileset dir="${core.classes.dir}">


Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mx4j.spec	20 Jun 2005 10:46:38 -0000	1.25
+++ mx4j.spec	20 Jun 2005 11:38:38 -0000	1.26
@@ -1,6 +1,6 @@
 %define name        mx4j
-%define version     2.1.0
-%define release     1jpp_9fc
+%define version     3.0.1
+%define release     1jpp_0fc
 %define section     free
 
 Name:           %{name}
@@ -16,11 +16,10 @@
 Patch0:         mx4j-javaxssl.patch
 Patch2:         mx4j-build.patch
 Patch3:         mx4j-docbook.patch
-Patch4:         mx4j-docbook-style.patch
-Patch5:         mx4j-redhat-build.patch
-Patch6:         mx4j-bz158968.patch
+Patch5:         mx4j-caucho-build.patch
+Patch6:         mx4j-bz133180.patch
 Url:            http://mx4j.sourceforge.net/
-BuildRequires:  jpackage-utils > 0:1.5
+BuildRequires:  jpackage-utils > 0:1.5.38
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-trax, ant-junit
 BuildRequires:	jaf
@@ -37,7 +36,7 @@
 BuildRequires:  xdoclet
 BuildRequires:  axis >= 0:1.1
 BuildRequires:  wsdl4j
-BuildRequires:	jakarta-commons-discovery
+BuildRequires:  jakarta-commons-discovery
 BuildRequires:  docbook-dtds >= 1.0
 BuildRequires:  docbook-style-xsl >= 1.61
 BuildRequires:  xml-commons-resolver
@@ -92,7 +91,6 @@
 %patch0 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %patch5 -p1
 %patch6 -p1
 
@@ -120,7 +118,7 @@
 %build
 export ANT_OPTS="-Djava.security.manager -Djava.security.policy=$(pwd)/build/mx4j-build.policy"
 export CLASSPATH=$(build-classpath activation javamail/mailapi javamail/smtp \
-   jetty4 jython jakarta-commons-logging xml-commons-apis bcel jsse jaas jce \
+   jython jakarta-commons-logging xml-commons-apis bcel jsse jaas jce \
    log4j jaxp_transform_impl axis/axis axis/jaxrpc axis/saaj \
    xml-commons-resolver xdoclet/xdoclet xdoclet/xdoclet-jmx-module \
    xdoclet/xdoclet-mx4j-module)
@@ -163,8 +161,6 @@
    done
 popd
 
-touch $RPM_BUILD_ROOT%{_javadir}/jmxri.jar # for %ghost
-
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
@@ -196,7 +192,6 @@
 
 %files
 %defattr(-,root,root)
-%ghost %{_javadir}/jmxri.jar
 %{_javadir}/%{name}
 %attr(0755,root,root) %{_libdir}/lib*.jar.so
 %{_libdir}/*/*/%{name}-%{version}.db
@@ -232,25 +227,32 @@
 * Fri Apr 29 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_5fc
 - BC-compile the combined jarfile.
 
+* Fri Apr 22 2005 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-1jpp
+- Upgrade to 3.0.1
+
 * Thu Apr 21 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_4fc
-- Revert previous two changes.
+- Revert my previous two changes.
 
 * Thu Apr 21 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_3fc
 - Bump priority of alternative to avoid problems on upgrade.
 
+* Wed Apr 20 2005 Fernando Nasser <fnasser at redhat.com> 0:2.1.0-1jpp
+- Upgrade to 2.1.0
+- Do not build caucho part because of version incompatibilities
+
 * Mon Mar 14 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_2fc
 - Install mx4j.jar as the jmxri.jar alternative instead of
   mx4j-jmx.jar.  From Anthony Green <green at redhat.com>.
 
+* Tue Mar 08 2005 Ralph Apel <r.apel at r-apel.de> 0:2.0.1-3jpp
+- Drop spurious Requires: junit
+
 * Mon Mar  7 2005 Gary Benson <gbenson at redhat.com> 0:2.1.0-1jpp_1fc
 - Build into Fedora.
 
 * Thu Dec 23 2004 Fernando Nasser <fnasser at redhat.com> 0:2.1.0-1jpp_1rh
 - Merge with upstream for upgrade
 
-* Thu Dec 23 2004 Fernando Nasser <fnasser at redhat.com> 0:2.1.0-1jpp
-- Upgrade to 2.1.0
-
 * Wed Oct 27 2004 Fernando Nasser <fnasser at redhat.com> 0:2.0.1-2jpp_1rh
 - Merge with upstream for upgrade to 2.0.1
 - Correctly specify CatalogManager.properties as a source file


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Jan 2005 12:19:46 -0000	1.5
+++ sources	20 Jun 2005 11:38:38 -0000	1.6
@@ -1 +1 @@
-e5b0a056d25cee4bb7708a97715336b4  mx4j-2.1.0-src.tar.gz
+eb5c08c4281aeb94c08ead7091b23dde  mx4j-3.0.1-src.tar.gz


--- mx4j-docbook-style.patch DELETED ---


--- mx4j-jetty.patch DELETED ---


--- mx4j-redhat-build.patch DELETED ---


