[Jpackage-commits] dist/ant/JPP-6 ant.spec,1.56,1.57

David Walluck david at ryu.zarb.org
Wed Dec 1 22:46:30 CET 2010


Update of /home/projects/jpackage/cvs/dist/ant/JPP-6
In directory ryu.zarb.org:/tmp/cvs-serv24834

Modified Files:
	ant.spec 
Log Message:
- fix GCJ support option
- add unversioned javadoc dir symlink
- fix repolib dir ownership


Index: ant.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/ant/JPP-6/ant.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -C 2 -d -r1.56 -r1.57
*** ant.spec	7 Oct 2010 05:34:29 -0000	1.56
--- ant.spec	1 Dec 2010 21:46:28 -0000	1.57
***************
*** 35,38 ****
--- 35,39 ----
  
  %bcond_with bootstrap
+ %bcond_with gcj_support
  %bcond_without repolib
  
***************
*** 47,51 ****
  %define repodirsrc %{repodir}/src
  
! %define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
  
  %define with_manifest_only 0
--- 48,56 ----
  %define repodirsrc %{repodir}/src
  
! %if %with gcj_support
! %define gcj_support 1
! %else
! %define gcj_support 0
! %endif
  
  %define with_manifest_only 0
***************
*** 59,63 ****
  Name:           ant
  Version:        1.8.1
! Release:        3%{?dist}
  Epoch:          0
  Summary:        Ant build tool for java
--- 64,68 ----
  Name:           ant
  Version:        1.8.1
! Release:        4%{?dist}
  Epoch:          0
  Summary:        Ant build tool for java
***************
*** 106,110 ****
  #rap#Patch4:         apache-ant-bug43114.patch
  
! BuildRequires:  jpackage-utils >= 0:5.0.0
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  jaxp_transform_impl
--- 111,115 ----
  #rap#Patch4:         apache-ant-bug43114.patch
  
! BuildRequires:  jpackage-utils
  BuildRequires:  java-devel >= 0:1.6.0
  BuildRequires:  jaxp_transform_impl
***************
*** 461,464 ****
--- 466,470 ----
  Summary:        Javadoc for %{name}
  Group:          Development/Documentation
+ Requires:       jpackage-utils
  
  %description javadoc
***************
*** 668,671 ****
--- 674,678 ----
  mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
  cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
  %endif
  
***************
*** 1272,1275 ****
--- 1279,1283 ----
  %defattr(0644,root,root,0755)
  %{_javadocdir}/%{name}-%{version}
+ %{_javadocdir}/%{name}
  %endif
  %endif
***************
*** 1278,1281 ****
--- 1286,1290 ----
  %files repolib
  %defattr(0644,root,root,0755)
+ %dir %{_javadir}
  %{_javadir}/repository.jboss.com
  %endif
***************
*** 1284,1287 ****
--- 1293,1301 ----
  
  %changelog
+ * Wed Dec 01 2010 David Walluck <dwalluck at redhat.com> 0:1.8.0-4
+ - fix GCJ support option
+ - add unversioned javadoc dir symlink
+ - fix repolib dir ownership
+ 
  * Thu Oct 07 2010 Ralph Apel <r.apel at r-apel.de> 0:1.8.1-3
  - reduce jpackage-utils BR to 1.7.5 ;-)




More information about the JPackage-commits mailing list