[Jpackage-commits] rpms/free/ant ant.spec,1.28,1.29

jpackage jpackage at ryu.zarb.org
Mon Feb 16 21:53:54 CET 2009


Update of /home/projects/jpackage/cvs/rpms/free/ant
In directory ryu.zarb.org:/tmp/5SJ0U3lTYw/rpms/free/ant

Modified Files:
	ant.spec 
Log Message:
1.7.1-9.jpp6

Index: ant.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/ant/ant.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -C 2 -d -r1.28 -r1.29
*** ant.spec	16 Feb 2009 19:43:54 -0000	1.28
--- ant.spec	16 Feb 2009 20:53:51 -0000	1.29
***************
*** 59,63 ****
  Name:           ant
  Version:        1.7.1
! Release:        8%{?dist}
  Epoch:          0
  Summary:        Ant build tool for java
--- 59,63 ----
  Name:           ant
  Version:        1.7.1
! Release:        9%{?dist}
  Epoch:          0
  Summary:        Ant build tool for java
***************
*** 80,84 ****
  Source11:       http://repo1.maven.org/maven2/org/apache/ant/ant-commons-logging/1.7.1/ant-commons-logging-1.7.1.pom
  Source12:       http://repo1.maven.org/maven2/org/apache/ant/ant-commons-net/1.7.1/ant-commons-net-1.7.1.pom
! #Source13:       http://repo1.maven.org/maven2/org/apache/ant/ant-jai/1.7.1/ant-jai-1.7.1.pom
  Source14:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bcel/1.7.1/ant-apache-bcel-1.7.1.pom
  Source15:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-log4j/1.7.1/ant-apache-log4j-1.7.1.pom
--- 80,84 ----
  Source11:       http://repo1.maven.org/maven2/org/apache/ant/ant-commons-logging/1.7.1/ant-commons-logging-1.7.1.pom
  Source12:       http://repo1.maven.org/maven2/org/apache/ant/ant-commons-net/1.7.1/ant-commons-net-1.7.1.pom
! #Source13:      http://repo1.maven.org/maven2/org/apache/ant/ant-jai/1.7.1/ant-jai-1.7.1.pom
  Source14:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-bcel/1.7.1/ant-apache-bcel-1.7.1.pom
  Source15:       http://repo1.maven.org/maven2/org/apache/ant/ant-apache-log4j/1.7.1/ant-apache-log4j-1.7.1.pom
***************
*** 123,134 ****
  %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! Obsoletes:	ant-optional < %{epoch}:%{version}-%{release}
  Provides:       ant-optional = %{epoch}:%{version}-%{release}
  Obsoletes:      ant-optional-full < %{epoch}:%{version}-%{release}
  Provides:       ant-optional-full = %{epoch}:%{version}-%{release}
  # Allow subpackages not in RHEL to be installed from JPackage
! Provides:	%{name} = %{epoch}:%{version}-%{release}
  # RHUG
! Obsoletes:	ant-devel < %{epoch}:%{version}-%{release}
  Provides:       ant-devel = %{epoch}:%{version}-%{release}
  # Mandriva
--- 123,134 ----
  %endif
  BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
! Obsoletes:      ant-optional < %{epoch}:%{version}-%{release}
  Provides:       ant-optional = %{epoch}:%{version}-%{release}
  Obsoletes:      ant-optional-full < %{epoch}:%{version}-%{release}
  Provides:       ant-optional-full = %{epoch}:%{version}-%{release}
  # Allow subpackages not in RHEL to be installed from JPackage
! Provides:       %{name} = %{epoch}:%{version}-%{release}
  # RHUG
! Obsoletes:      ant-devel < %{epoch}:%{version}-%{release}
  Provides:       ant-devel = %{epoch}:%{version}-%{release}
  # Mandriva
***************
*** 140,147 ****
  Provides:       %{name}-core = %{epoch}:%{version}-%{release}
  %if %{gcj_support}
! BuildRequires:		java-gcj-compat-devel
  %endif
  
! Requires(post):   jpackage-utils >= 0:1.7.5
  Requires(postun): jpackage-utils >= 0:1.7.5
  
--- 140,147 ----
  Provides:       %{name}-core = %{epoch}:%{version}-%{release}
  %if %{gcj_support}
! BuildRequires:  java-gcj-compat-devel
  %endif
  
! Requires(post): jpackage-utils >= 0:1.7.5
  Requires(postun): jpackage-utils >= 0:1.7.5
  
***************
*** 203,207 ****
  Provides:       ant-trax = %{epoch}:%{version}-%{release}
  # The ant-xalan jar has been merged into the ant-trax one
! Obsoletes:	ant-xalan2 < %{epoch}:%{version}-%{release}
  Provides:       ant-xalan2 = %{epoch}:%{version}-%{release}
  
--- 203,207 ----
  Provides:       ant-trax = %{epoch}:%{version}-%{release}
  # The ant-xalan jar has been merged into the ant-trax one
! Obsoletes:      ant-xalan2 < %{epoch}:%{version}-%{release}
  Provides:       ant-xalan2 = %{epoch}:%{version}-%{release}
  
***************
*** 326,330 ****
  Provides:       ant-apache-bcel = %{epoch}:%{version}-%{release}
  Provides:       ant-jakarta-bcel = %{epoch}:%{version}-%{release}
! Obsoletes:	ant-jakarta-bcel < %{epoch}:%{version}-%{release}
  
  %description apache-bcel
--- 326,330 ----
  Provides:       ant-apache-bcel = %{epoch}:%{version}-%{release}
  Provides:       ant-jakarta-bcel = %{epoch}:%{version}-%{release}
! Obsoletes:      ant-jakarta-bcel < %{epoch}:%{version}-%{release}
  
  %description apache-bcel
***************
*** 342,346 ****
  Provides:       ant-apache-log4j = %{epoch}:%{version}-%{release}
  Provides:       ant-jakarta-log4j = %{epoch}:%{version}-%{release}
! Obsoletes:	ant-jakarta-log4j < %{epoch}:%{version}-%{release}
  
  %description apache-log4j
--- 342,346 ----
  Provides:       ant-apache-log4j = %{epoch}:%{version}-%{release}
  Provides:       ant-jakarta-log4j = %{epoch}:%{version}-%{release}
! Obsoletes:      ant-jakarta-log4j < %{epoch}:%{version}-%{release}
  
  %description apache-log4j
***************
*** 358,362 ****
  Provides:       ant-apache-oro = %{epoch}:%{version}-%{release}
  Provides:       ant-jakarta-oro = %{epoch}:%{version}-%{release}
! Obsoletes:	ant-jakarta-oro < %{epoch}:%{version}-%{release}
  
  %description apache-oro
--- 358,362 ----
  Provides:       ant-apache-oro = %{epoch}:%{version}-%{release}
  Provides:       ant-jakarta-oro = %{epoch}:%{version}-%{release}
! Obsoletes:      ant-jakarta-oro < %{epoch}:%{version}-%{release}
  
  %description apache-oro
***************
*** 374,378 ****
  Provides:       ant-apache-regexp = %{epoch}:%{version}-%{release}
  Provides:       ant-jakarta-regexp = %{epoch}:%{version}-%{release}
! Obsoletes:	ant-jakarta-regexp < %{epoch}:%{version}-%{release}
  
  %description apache-regexp
--- 374,378 ----
  Provides:       ant-apache-regexp = %{epoch}:%{version}-%{release}
  Provides:       ant-jakarta-regexp = %{epoch}:%{version}-%{release}
! Obsoletes:      ant-jakarta-regexp < %{epoch}:%{version}-%{release}
  
  %description apache-regexp
***************
*** 1320,1323 ****
--- 1320,1326 ----
  
  %changelog
+ * Mon Feb 16 2009 David Walluck <dwalluck at redhat.com> 0:1.7.1-9
+ - fix mixed-use-of-spaces-and-tabs
+ 
  * Mon Feb 16 2009 David Walluck <dwalluck at redhat.com> 0:1.7.1-8
  - add repolib




More information about the JPackage-commits mailing list