rpms/mx4j/devel mx4j.spec,1.58,1.59

[fedora-cvs-commits at redhat.com]

Author: dbhole

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

Modified Files:
	mx4j.spec 
Log Message:

- Make tests conditional
- Add missing requirements




Index: mx4j.spec
===================================================================
RCS file: /cvs/dist/rpms/mx4j/devel/mx4j.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- mx4j.spec	24 Aug 2006 22:05:50 -0000	1.58
+++ mx4j.spec	25 Aug 2006 23:05:07 -0000	1.59
@@ -28,15 +28,19 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define _gcj_support 1
+%define _without_tests 1
+
+%define with_tests %{!?_without_tests:1}%{?_without_tests:0}
+%define without_tests %{?_without_tests:1}%{!?_without_tests:0}
 
+%define _gcj_support 1
 %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
 
 %define section     free
 
 Name:           mx4j
 Version:        3.0.1
-Release:        6jpp.1
+Release:        6jpp.2
 Epoch:		1
 Summary:        Open source implementation of JMX Java API
 License:        Apache License
@@ -56,7 +60,6 @@
 BuildRequires:  ant >= 0:1.6
 BuildRequires:  ant-trax
 BuildRequires:	ant-apache-resolver
-#BuildRequires:  ant-junit
 BuildRequires:	jaf
 BuildRequires:	javamail >= 0:1.2-5jpp
 BuildRequires:	log4j >= 0:1.2.7
@@ -65,7 +68,6 @@
 BuildRequires:  bcel >= 0:5.0
 BuildRequires:	jsse >= 0:1.0.2-6jpp
 BuildRequires:	jce >= 0:1.2.2
-#BuildRequires:	junit >= 0:3.7.1
 BuildRequires:  coreutils
 BuildRequires:  xjavadoc
 BuildRequires:  xdoclet
@@ -77,11 +79,23 @@
 BuildRequires:  xml-commons-resolver
 BuildRequires:  xml-commons
 BuildRequires:  xerces-j2
-#BuildRequires:  xmlunit
+%if %{with_tests}
+BuildRequires:  ant-junit
+BuildRequires:	burlap >= 3.0.8
+BuildRequires:	caucho-services
+BuildRequires:	hessian >= 3.0.8
+BuildRequires:	junit >= 0:3.7.1
+BuildRequires:  xmlunit
+%endif
 %if ! %{gcj_support}
 Buildarch:      noarch
 %endif
-Requires:       /usr/sbin/update-alternatives
+Requires(pre):	/bin/rm
+Requires(post):       /usr/sbin/update-alternatives
+Requires(postun):       /usr/sbin/update-alternatives
+Requires:	burlap >= 3.0.8
+Requires:	caucho-services
+Requires:	hessian >= 3.0.8
 Requires:	jaf
 Requires:	javamail >= 0:1.2-5jpp
 Requires:	log4j >= 0:1.2.7
@@ -111,6 +125,8 @@
 Group:          Development/Documentation
 Summary:        Javadoc for %{name}
 Obsoletes:      openjmx-javadoc
+Requires(post):   /bin/rm,/bin/ln
+Requires(postun): /bin/rm
 
 %description javadoc
 Javadoc for %{name}.
@@ -143,8 +159,13 @@
 cp %{_sourcedir}/CatalogManager.properties %{_builddir}/%{name}-%{version}/build/
 
 pushd lib
-#   ln -sf $(build-classpath junit) .
-#   ln -sf $(build-classpath xmlunit) .
+%if %{with_tests}
+   ln -sf $(build-classpath junit) .
+   ln -sf $(build-classpath xmlunit) .
+   ln -sf $(build-classpath burlap) .
+   ln -sf $(build-classpath caucho-services) .
+   ln -sf $(build-classpath hessian) .
+%endif
    ln -sf $(build-classpath xml-commons-apis) xml-apis.jar
    ln -sf $(build-classpath xerces-j2) xercesImpl.jar
    ln -sf $(build-classpath xalan-j2) xalan.jar
@@ -176,8 +197,11 @@
 export OPT_JAR_LIST="ant/ant-junit junit xmlunit ant/ant-trax jaxp_transform_impl ant/ant-apache-resolver xml-commons-resolver"
 
 cd build
-# ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
+%if %{with_tests}
+ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools tests-report javadocs docs
+%else
 ant -Dbuild.sysclasspath=first compile.jmx compile.rjmx compile.tools javadocs docs
+%endif
 
 %install
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -228,6 +252,15 @@
 	/usr/sbin/update-alternatives --remove jmxri %{_javadir}/%{name}/%{name}-jmx.jar
 fi
 
+%post javadoc
+rm -f %{_javadocdir}/%{name}
+ln -s %{name}-%{version} %{_javadocdir}/%{name}
+
+%postun javadoc
+if [ "$1" = "0" ]; then
+    rm -f %{_javadocdir}/%{name}
+fi
+
 %if %{gcj_support}
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -256,6 +289,10 @@
 %doc dist/docs/*
 
 %changelog
+* Fri Aug 25 2006 Deepak Bhole <dbhole at redhat.com> 0:3.0.1-6jpp.2
+- Make tests conditional
+- Add missing requirements
+
 * Fri Aug 18 2006 Fernando Nasser <fnasser at redhat.com> 0:3.0.1-6jpp.1
 - Merge with upstream
 - Fixed build file to correctly resolve dtds.