[Jpackage-commits] dist/maven2/devel maven2.spec,1.61,1.62

David Walluck david at ryu.zarb.org
Tue Oct 11 00:14:38 CEST 2011


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

Modified Files:
	maven2.spec 
Log Message:
- switch some build-jar-repository calls to build-classpath calls
- fix file list in bootstrap mode


Index: maven2.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/maven2/devel/maven2.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -C 2 -d -r1.61 -r1.62
*** maven2.spec	10 Oct 2011 21:43:18 -0000	1.61
--- maven2.spec	10 Oct 2011 22:14:36 -0000	1.62
***************
*** 473,488 ****
  
  (cd %{buildroot}%{_datadir}/%{name}/lib
!   %{_bindir}/build-jar-repository -s -p . jdom
  )
  
  (cd %{buildroot}%{_datadir}/%{name}/boot
!   %{_bindir}/build-jar-repository -s -p . classworlds
  )
  
  %if ! %{bootstrap}
  (cd %{buildroot}%{_datadir}/%{name}/lib
!   %{_bindir}/build-jar-repository -s -p . backport-util-concurrent jsch commons-cli commons-httpclient commons-codec nekohtml maven-shared/reporting-api maven-doxia/logging-api maven-doxia/sink-api \
  maven-wagon/file maven-wagon/http maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external plexus/container-default \
! plexus/interactivity-api plexus/interpolation plexus/utils slf4j/api slf4j/nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2
  )
  %endif
--- 473,488 ----
  
  (cd %{buildroot}%{_datadir}/%{name}/lib
!   %{__ln_s} `build-classpath jdom` jdom.jar
  )
  
  (cd %{buildroot}%{_datadir}/%{name}/boot
!   %{__ln_s} `build-classpath classworlds` classworlds.jar
  )
  
  %if ! %{bootstrap}
  (cd %{buildroot}%{_datadir}/%{name}/lib
!   for i in backport-util-concurrent jsch commons-cli commons-httpclient commons-codec nekohtml maven-shared/reporting-api maven-doxia/logging-api maven-doxia/sink-api \
  maven-wagon/file maven-wagon/http maven-wagon/http-lightweight maven-wagon/http-shared maven-wagon/provider-api maven-wagon/ssh maven-wagon/ssh-common maven-wagon/ssh-external plexus/container-default \
! plexus/interactivity-api plexus/interpolation plexus/utils slf4j/api slf4j/nop plexus/plexus-cipher plexus/plexus-sec-dispatcher xerces-j2; do %{__ln_s} `build-classpath ${i}`; done
  )
  %endif
***************
*** 560,563 ****
--- 560,564 ----
  %{_javadir}/%{name}/uber.jar
  %dir %{_datadir}/%{name}/lib
+ %if !%{bootstrap}
  %{_datadir}/%{name}/lib/backport-util-concurrent.jar
  %{_datadir}/%{name}/lib/commons-cli.jar
***************
*** 587,590 ****
--- 588,592 ----
  %{_datadir}/%{name}/lib/slf4j_nop.jar
  %{_datadir}/%{name}/lib/xerces-j2.jar
+ %endif
  %{_datadir}/%{name}/lib/maven-%{version}-uber.jar
  %{_datadir}/%{name}/poms
***************
*** 603,606 ****
--- 605,610 ----
  - BuildRequires: zip in bootstrap mode
  - fix patch macros (for mdv)
+ - switch some build-jar-repository calls to build-classpath calls
+ - fix file list in bootstrap mode
  
  * Mon Jul 18 2011 David Walluck <dwalluck at redhat.com> 2.2.1-23




More information about the JPackage-commits mailing list