Changeset 20004

Show
Ignore:
Timestamp:
04/26/07 08:11:52 (2 years ago)
Author:
patrick
Message:

MF20 r20003: Make another effort to handle the Java run-time dependency.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/branches/2.2/release/vrjuggler.spec

    r19863 r20004  
    1717%define vrjuggler_release %{global_release}%{?dist} 
    1818 
    19 # JDK 1.5.0 is the lowest version with native support for the x86_64 
    20 # architecture. 
    21 %ifarch x86_64 
    22 %define min_jdk 1.5.0 
     19%define have_java %(if [ -x $JDK_HOME/bin/javac ] ; then echo 1; else echo 0; fi) 
     20 
     21%if %have_java 
     22   %define java_ver %(java -version 2>&1 | grep 'version' | sed -e 's/.*"\\([1-9]\\.[0-9]*\\.[0-9][0-9]*\\).*/\\1/') 
     23   %if "%java_ver" == "1.5.0" 
     24      %define java_pkg jre 
     25   %else 
     26      %define java_pkg jdk 
     27   %endif 
     28   %define java_req Requires: %java_pkg >= %java_ver 
    2329%else 
    24 %define min_jdk 1.4.2 
     30%define java_req 
    2531%endif 
    2632 
    …… 
    4248 
    4349%define have_omniorb %(if [ -x /usr/bin/omniidl ] ; then echo 1; else echo 0; fi) 
    44 %define have_java %(if [ -x $JDK_HOME/bin/javac ] ; then echo 1; else echo 0; fi) 
    4550%define have_audiere %(if [ -x /usr/bin/audiere-config ] ; then echo 1; else echo 0; fi) 
    4651%define have_openal %(if [ -x /usr/bin/openal-config ] ; then echo 1; else echo 0; fi) 
    …… 
    144149URL: http://www.vrjuggler.org/tweek/ 
    145150Group: Development/Java 
    146 Requires: jdk >= %{min_jdk} 
     151%java_req 
    147152Provides: tweek-java-jni = %{tweek_version}-%{tweek_release} 
    148153AutoReqProv: no 
    …… 
    158163URL: http://www.vrjuggler.org/tweek/ 
    159164Group: Development/Java 
    160 Requires: jdk >= %{min_jdk} 
     165%java_req 
    161166Requires: tweek-java-jni = %{tweek_version}-%{tweek_release} 
    162167Provides: tweek-java = %{tweek_version}-%{tweek_release} 
    …… 
    218223URL: http://www.vrjuggler.org/jccl/ 
    219224Group: Development/Java 
    220 Requires: jdk >= %{min_jdk} 
     225%java_req 
    221226Requires: tweek-java = %{tweek_version}-%{tweek_release} 
    222227Provides: jccl-java = %{jccl_version}-%{jccl_release} 
    …… 
    234239URL: http://www.vrjuggler.org/jccl/ 
    235240Group: Development/C++ 
    236 Requires: jdk >= %{min_jdk} 
     241%java_req 
    237242Requires: tweek-java = %{tweek_version}-%{tweek_release} 
    238243Provides: jccl-rtrc-plugin-java = %{jccl_version}-%{jccl_release} 
    …… 
    418423URL: http://www.vrjuggler.org/vrjuggler/ 
    419424Group: Development/Java 
    420 Requires: jdk >= %{min_jdk} 
     425%java_req 
    421426Requires: tweek-java = %{tweek_version}-%{tweek_release} 
    422427Requires: jccl-java = %{jccl_version}-%{jccl_release} 
     428Requires: jccl-rtrc-plugin-java = %{jccl_version}-%{jccl_release} 
    423429Provides: vrjconfig = %{vrjuggler_version}-%{vrjuggler_release} 
    424430 
    …… 
    448454URL: http://www.vrjuggler.org/vrjuggler/ 
    449455Group: Development/Java 
    450 Requires: jdk >= %{min_jdk} 
     456%java_req 
    451457Requires: tweek-java = %{tweek_version}-%{tweek_release} 
    452458Provides: vrjuggler-perf-plugin-java = %{vrjuggler_version}-%{vrjuggler_release} 
    …… 
    879885 
    880886%changelog 
    881 * Thu Mar 15 2007 Patrick Hartling 
     887* Wed Apr 25 2007 Patrick Hartling <patrick at infiscape dot com> 
     888- Improve Java version requirement. 
     889- Add jccl-rtrc-plugin-java as a requirement for vrjconfig. 
     890 
     891* Thu Mar 15 2007 Patrick Hartling <patrick at infiscape dot com> 
    882892- Depend on jdk instead of j2sdk. 
    883893