[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia.spec, 1.36, 1.37

David Walluck david at ryu.zarb.org
Wed Oct 12 06:20:19 CEST 2011


Update of /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv14074

Modified Files:
	maven-doxia.spec 
Log Message:
- disable bootstrap hacks

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** maven-doxia.spec	12 Oct 2011 04:06:13 -0000	1.36
--- maven-doxia.spec	12 Oct 2011 04:20:16 -0000	1.37
***************
*** 164,168 ****
  export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file://`pwd`/maven2-brew
  export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dproject.build.directory=target -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dmaven2.jpp.depmap.file=%{SOURCE6} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:aggregate
  %else
  mkdir lib
--- 164,168 ----
  export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file://`pwd`/maven2-brew
  export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dproject.build.directory=target -Dmaven.test.skip=true -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dmaven2.jpp.depmap.file=%{SOURCE6} -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy
  %else
  mkdir lib
***************
*** 261,265 ****
  # Install javadocs
  %{__mkdir_p} %{buildroot}%{_javadocdir}/doxia-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/doxia-%{namedversion}
  %{__ln_s} doxia-%{version} %{buildroot}%{_javadocdir}/doxia
  
--- 261,265 ----
  # Install javadocs
  %{__mkdir_p} %{buildroot}%{_javadocdir}/doxia-%{namedversion}
! %{__cp} -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/doxia-%{namedversion} || :
  %{__ln_s} doxia-%{version} %{buildroot}%{_javadocdir}/doxia
  




More information about the JPackage-commits mailing list