[Jpackage-commits] dist/plexus-containers/devel plexus-containers.spec, 1.6, 1.7

jpackage-guest jpackage-guest at ryu.zarb.org
Wed Feb 4 10:16:28 CET 2009


Update of /home/projects/jpackage/cvs/dist/plexus-containers/devel
In directory ryu.zarb.org:/tmp/cvs-serv23825

Modified Files:
	plexus-containers.spec 
Log Message:
fix building with ant

Index: plexus-containers.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/plexus-containers/devel/plexus-containers.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** plexus-containers.spec	14 Jan 2009 08:23:36 -0000	1.6
--- plexus-containers.spec	4 Feb 2009 09:16:25 -0000	1.7
***************
*** 33,37 ****
  # If you don't want to build with maven, and use straight ant instead,
  # give rpmbuild option '--without maven'
! 
  %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
--- 33,37 ----
  # If you don't want to build with maven, and use straight ant instead,
  # give rpmbuild option '--without maven'
! %define _without_maven 1
  %define with_maven %{!?_without_maven:1}%{?_without_maven:0}
  %define without_maven %{?_without_maven:1}%{!?_without_maven:0}
***************
*** 43,47 ****
  Name:           %{parent}-%{subname}
  Version:        1.0
! Release:        0.1.a34.1jpp.2%{?dist}
  Epoch:          0
  Summary:        Containers for Plexus
--- 43,47 ----
  Name:           %{parent}-%{subname}
  Version:        1.0
! Release:        0.1.a34.2%{?dist}
  Epoch:          0
  Summary:        Containers for Plexus
***************
*** 119,122 ****
--- 119,123 ----
  Requires:       plexus-containers-component-annotations
  Requires:       plexus-utils
+ Provides:	plexus-containers-component-api = %{epoch}:%{version}-%{release}
  
  %description container-default
***************
*** 246,254 ****
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
  cp -pr plexus-component-annotations/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
  
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default-%{version}
  
- # annotationdocs while building with ant
  cp -pr plexus-container-default/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default-%{version}
  
--- 247,260 ----
  # javadoc
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
+ %if %{with_maven}
  cp -pr plexus-component-annotations/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
+ %else
+ # directory name is annotationsdocs while building with ant
+ ls -l plexus-component-annotations/target/site/
+ cp -pr plexus-component-annotations/target/site/annotationsdocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-component-annotations-%{version}
+ %endif
  
  install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default-%{version}
  
  cp -pr plexus-container-default/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{parent}-containers-container-default-%{version}
  
***************
*** 349,352 ****
--- 355,362 ----
  
  %changelog
+ * Wed Feb 04 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.2
+ - fix bulding with ant
+ - temporarily buid with ant
+ 
  * Wed Jan 14 2009 Yong Yang <yyang at redhat.com> - 1.0-0.1.a34.1jpp.2
  - re-build with maven




More information about the JPackage-commits mailing list