[Jpackage-commits] dist/directory-naming/devel directory-naming.spec, 1.2, 1.3

jpackage-guest jpackage-guest at ryu.zarb.org
Thu Feb 5 08:34:04 CET 2009


Update of /home/projects/jpackage/cvs/dist/directory-naming/devel
In directory ryu.zarb.org:/tmp/cvs-serv30808

Modified Files:
	directory-naming.spec 
Log Message:
Import from dbhole's maven 2.0.8 packages

Index: directory-naming.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/directory-naming/devel/directory-naming.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** directory-naming.spec	6 Jan 2009 07:11:53 -0000	1.2
--- directory-naming.spec	5 Feb 2009 07:34:01 -0000	1.3
***************
*** 29,37 ****
  #
  
! %define gcj_support 1
  
  Name:           directory-naming
  Version:        0.8
! Release:        1jpp.1%{?dist}
  Epoch:          0
  Summary:        Directory Naming
--- 29,37 ----
  #
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  Name:           directory-naming
  Version:        0.8
! Release:        2%{?dist}
  Epoch:          0
  Summary:        Directory Naming
***************
*** 57,60 ****
--- 57,61 ----
  BuildRequires:  hsqldb
  BuildRequires:  junit
+ BuildRequires:  ant-junit
  BuildRequires:  jakarta-commons-beanutils
  BuildRequires:  jakarta-commons-collections
***************
*** 131,135 ****
  CLASSPATH=$CLASSPATH:$(pwd)/naming-management/target/classes:$(pwd)/naming-management/target/test-classes
  CLASSPATH=$CLASSPATH:$(pwd)/naming-resources/target/classes:$(pwd)/naming-resources/target/test-classes
! ant -Dbuild.sysclasspath=only jar javadoc
  
  %install
--- 132,153 ----
  CLASSPATH=$CLASSPATH:$(pwd)/naming-management/target/classes:$(pwd)/naming-management/target/test-classes
  CLASSPATH=$CLASSPATH:$(pwd)/naming-resources/target/classes:$(pwd)/naming-resources/target/test-classes
! 
! #FIXME failed to create task or type setproxy
! for f in $(find . -name build.xml); do
!     sed -i "s|<setproxy>|<!-- <setproxy> -->|g" $f
!     sed -i "s|</setproxy>|<!-- </setproxy> -->|g" $f
! done;
! 
! #sed -i "s|<setproxy>|<!-- <setproxy> -->|g" naming-core/build.xml
! #sed -i "s|</setproxy>|<!-- </setproxy> -->|g" naming-core/build.xml
! 
! #sed -i "s|<setproxy>|<!-- <setproxy> -->|g" naming-core/build.xml
! #sed -i "s|</setproxy>|<!-- </setproxy> -->|g" naming-core/build.xml
! 
! 
! export OPT_JAR_LIST="junit ant/ant-junit"
! 
! #ant -Dbuild.sysclasspath=only jar javadoc
! ant jar javadoc
  
  %install
***************
*** 204,207 ****
--- 222,228 ----
  
  %changelog
+ * Thu Feb 05 2009 Yong Yang <yyang at redhat.com> 0.8-2
+ - Initial building on JPP6
+ 
  * Wed Apr 09 2008 Deepak Bhole <dbhole at redhat.com> 0.8-1jpp.1
  - Import from jpp, remove maven (1.x) build, update per Fedora guidelines




More information about the JPackage-commits mailing list