[Jpackage-commits] dist/dwr/JPP-5 dwr.spec,1.1,1.2

jpackage jpackage at ryu.zarb.org
Sun Feb 1 20:23:17 CET 2009


Update of /home/projects/jpackage/cvs/dist/dwr/JPP-5
In directory ryu.zarb.org:/tmp/cvs-serv5019

Modified Files:
	dwr.spec 
Log Message:
build with java5 only

Index: dwr.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/dwr/JPP-5/dwr.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** dwr.spec	1 Feb 2009 19:08:18 -0000	1.1
--- dwr.spec	1 Feb 2009 19:23:15 -0000	1.2
***************
*** 44,49 ****
  Patch:          dwr-2.0.5-to138-StrutsCreator.patch
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel = 0:1.5.0
! BuildRequires:  java-devel = 0:1.4.2
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  junit >= 0:3.8.1
--- 44,49 ----
  Patch:          dwr-2.0.5-to138-StrutsCreator.patch
  BuildRequires:  jpackage-utils >= 0:1.7.5
! BuildRequires:  java-devel >= 0:1.5.0
! #BuildRequires:  java-devel = 0:1.4.2
  BuildRequires:  ant >= 0:1.6.5
  BuildRequires:  junit >= 0:3.8.1
***************
*** 70,74 ****
  BuildRequires:  xwork
  
! Requires:  java >= 0:1.4.2
  Requires:  backport-util-concurrent
  Requires:  bsf
--- 70,74 ----
  BuildRequires:  xwork
  
! Requires:  java >= 0:1.5.0
  Requires:  backport-util-concurrent
  Requires:  bsf
***************
*** 151,158 ****
  mkdir -p web/WEB-INF/lib
  ant \
-     -Djava.13.home=%{_jvmdir}/java-1.4.2 \
      -Djava.15.home=%{_jvmdir}/java-1.5.0 \
      files
  
  %install
  rm -rf $RPM_BUILD_ROOT
--- 151,159 ----
  mkdir -p web/WEB-INF/lib
  ant \
      -Djava.15.home=%{_jvmdir}/java-1.5.0 \
      files
  
+ #   -Djava.13.home=%{_jvmdir}/java-1.4.2 \
+ 
  %install
  rm -rf $RPM_BUILD_ROOT
***************
*** 211,215 ****
  
  %changelog
! * Wed Jan 21 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.0.5-1.jpp5
  - 2.0.5
  
--- 212,216 ----
  
  %changelog
! * Mon Feb 02 2009 Ralph Apel <r.apel at r-apel.de> - 0:2.0.5-1.jpp5
  - 2.0.5
  




More information about the JPackage-commits mailing list