[Jpackage-commits] dist/maven-doxia/JPP-6 maven-doxia.spec, 1.29, 1.30

David Walluck david at ryu.zarb.org
Wed Oct 12 04:49:34 CEST 2011


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

Modified Files:
	maven-doxia.spec 
Log Message:
- don't build javadoc

Index: maven-doxia.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven-doxia/JPP-6/maven-doxia.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -C 2 -d -r1.29 -r1.30
*** maven-doxia.spec	12 Oct 2011 02:38:38 -0000	1.29
--- maven-doxia.spec	12 Oct 2011 02:49:31 -0000	1.30
***************
*** 192,196 ****
  export ALT_DEPLOYMENT_REPOSITORY=oss-releases::default::file:`pwd`/maven2-brew
  export MAVEN_OPTS="-Xms1g -Xmx1g"
! %{_bindir}/mvn-jpp -e -Dmaven.repo.local=${MAVEN_REPO_LOCAL} -Dmaven2.jpp.depmap.file=%{SOURCE6} -Dmaven.test.skip=true -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy javadoc:aggregate
  %else
  mkdir lib
--- 192,197 ----
  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} -Dmaven.test.skip=true -DaltDeploymentRepository=${ALT_DEPLOYMENT_REPOSITORY} deploy
! #javadoc:aggregate
  %else
  mkdir lib
***************
*** 268,273 ****
  # Install javadocs
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
--- 269,274 ----
  # Install javadocs
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/ || :
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  
  %clean




More information about the JPackage-commits mailing list