SPECS: jmx.spec - scsl sources are not publicly available, so move...

[qboosh]

Author: qboosh                       Date: Sun Dec 16 02:06:50 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- scsl sources are not publicly available, so moved to bcond
- jmxtools.jar moved to -tools subpackage, so it can be used with jmx included in JRE

---- Files affected:
SPECS:
   jmx.spec (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: SPECS/jmx.spec
diff -u SPECS/jmx.spec:1.18 SPECS/jmx.spec:1.19
--- SPECS/jmx.spec:1.18	Tue Apr 24 00:17:23 2007
+++ SPECS/jmx.spec	Sun Dec 16 03:06:44 2007
@@ -1,6 +1,10 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_with	scsl	# use SCSL-licensed sources (which need registration)
+#
 %include	/usr/lib/rpm/macros.java
-%define		_ver	%(echo %{version} | tr . _)
+%define		fver	%(echo %{version} | tr . _)
 Summary:	Java Management Extensions
 Summary(pl.UTF-8):	Rozszerzenia zarządzania do Javy
 Name:		jmx
@@ -9,12 +13,17 @@
 License:	restricted, non-distributable (Sun Community Source License - see URL)
 Group:		Development/Languages/Java
 # download through forms from http://java.sun.com/products/JavaManagement/download.html
-Source0:	%{name}-%{_ver}-scsl.zip
-# NoSource0-md5:	de1a800156998f4ef98bcdef4421f312
+Source0:	%{name}-%{fver}-ri.zip
+# NoSource0-md5:	2775b37b00b4da79115b222737b6df9c
+NoSource:	0
+%if %{with scsl}
+Source1:	%{name}-%{fver}-scsl.zip
+# NoSource1-md5:	de1a800156998f4ef98bcdef4421f312
+NoSource:	1
+%endif
 Patch0:		%{name}-build.patch
 URL:		http://java.sun.com/products/JavaManagement/
-NoSource:	0
-BuildRequires:	ant
+%{?with_scsl:BuildRequires:	ant}
 BuildRequires:	jdk >= 1.4
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
@@ -42,18 +51,38 @@
 %description javadoc -l pl.UTF-8
 Dokumentacja do Java Management Extensions.
 
+%package tools
+Summary:	JMX additional classes (com.sun.jdmk in jmxtools.jar)
+Summary(pl.UTF-8):	Dodatkowe klasy JMX (com.sun.jdmk w jmxtools.jar)
+Group:		Development/Languages/Java
+# loose dep to allow using with other JMX implementations (e.g. included in JRE)
+Requires:	jmx >= 1.2.1
+
+%description tools
+JMX additional classes (com.sun.jdmk in jmxtools.jar).
+
+%description tools -l pl.UTF-8
+Dodatkowe klasy JMX (com.sun.jdmk w jmxtools.jar).
+
 %prep
-%setup -q -n %{name}-%{_ver}-src
+%if %{with scsl}
+%setup -q -n %{name}-%{fver}-src -T -b1
 %patch0 -p1
+%else
+%setup -q -n %{name}-%{fver}-bin
+%endif
 
+%if %{with scsl}
 %build
 export LC_ALL=en_US # source not in ASCII
 %ant
+%endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_javadir}
-install build/lib/jmxri.jar $RPM_BUILD_ROOT%{_javadir}/jmxri-%{version}.jar
+
+install %{?with_scsl:build/}lib/jmxri.jar $RPM_BUILD_ROOT%{_javadir}/jmxri-%{version}.jar
 install lib/jmxtools.jar $RPM_BUILD_ROOT%{_javadir}/jmxtools-%{version}.jar
 ln -s jmxri-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jmxri.jar
 ln -s jmxtools-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jmxtools.jar
@@ -73,8 +102,9 @@
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{README_SRC.txt,RELEASE_NOTES.txt}
-%{_javadir}/*.jar
+%doc doc/{README_SRC.txt,RELEASE_NOTES.txt} LICENSE.html
+%{_javadir}/jmxri-%{version}.jar
+%{_javadir}/jmxri.jar
 %{_examplesdir}/%{name}-%{version}
 
 %files javadoc
@@ -82,12 +112,22 @@
 %{_javadocdir}/%{name}-%{version}
 %ghost %{_javadocdir}/%{name}
 
+%files tools
+%defattr(644,root,root,755)
+%doc doc/{README_SRC.txt,RELEASE_NOTES.txt} LICENSE.html
+%{_javadir}/jmxtools-%{version}.jar
+%{_javadir}/jmxtools.jar
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2007-12-16 02:06:44  qboosh
+- scsl sources are not publicly available, so moved to bcond
+- jmxtools.jar moved to -tools subpackage, so it can be used with jmx included in JRE
+
 Revision 1.18  2007-04-23 22:17:23  glen
 - add md5
 - unify java package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jmx.spec?r1=1.18&r2=1.19&f=u