[Jpackage-commits] dist/maven2/JPP-6 maven2.spec,1.13,1.14

jpackage jpackage at ryu.zarb.org
Sat Dec 4 12:12:26 CET 2010


Update of /home/projects/jpackage/cvs/dist/maven2/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv19049

Modified Files:
	maven2.spec 
Log Message:
solve conflict with velocity, velocity14

Index: maven2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/JPP-6/maven2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -C 2 -d -r1.13 -r1.14
*** maven2.spec	4 Dec 2010 10:39:50 -0000	1.13
--- maven2.spec	4 Dec 2010 11:12:24 -0000	1.14
***************
*** 214,218 ****
  BuildRequires:    saxon-scripts
  BuildRequires:    saxpath
! BuildRequires:    velocity >= 1.4
  BuildRequires:    xerces-j2 >= 2.7.1
  BuildRequires:    xalan-j2 >= 2.6.0
--- 214,219 ----
  BuildRequires:    saxon-scripts
  BuildRequires:    saxpath
! BuildRequires:    velocity14
! BuildRequires:    velocity > 1.4
  BuildRequires:    xerces-j2 >= 2.7.1
  BuildRequires:    xalan-j2 >= 2.6.0




More information about the JPackage-commits mailing list