rpms/ant/devel ant.spec,1.92,1.93

[Tom Callaway (spot)]

Author: spot

Update of /cvs/pkgs/rpms/ant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3100

Modified Files:
	ant.spec 
Log Message:
fix repotag


Index: ant.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ant/devel/ant.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ant.spec	21 Feb 2008 02:27:51 -0000	1.92
+++ ant.spec	9 Jul 2008 17:00:49 -0000	1.93
@@ -50,17 +50,16 @@
 %define section  free
 
 %define major_version 1.7
-%define jpprelease 1jpp
 %define cvs_version 1.7.0
 
 Name:           ant
 Version:        1.7.0
-Release:        %{jpprelease}.4%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Ant build tool for java
 Summary(it):    Tool per la compilazione di programmi java
 Summary(fr):    Outil de compilation pour java
-License:        Apache Software License
+License:        ASL 2.0
 URL:            http://ant.apache.org/
 Group:          Development/Build Tools
 Source0:        http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.gz
@@ -96,17 +95,17 @@
 BuildArch:      noarch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes:      ant-optional < %{epoch}:%{version}-%{jpprelease}
-Obsoletes:      ant-optional-full < %{epoch}:%{version}-%{jpprelease}
+Obsoletes:      ant-optional < %{epoch}:%{version}-%{release}
+Obsoletes:      ant-optional-full < %{epoch}:%{version}-%{release}
 # Allow subpackages not in Fedora to be installed from JPackage
-Provides:       %{name} = %{epoch}:%{version}-%{jpprelease}
+Provides:       %{name} = %{epoch}:%{version}-%{release}
 # RHEL3 and FC2
 Obsoletes:      %{name}-libs <= 0:1.5.2, %{name}-core <= 0:1.5.2
-Provides:       %{name}-libs = %{epoch}:%{version}-%{jpprelease}
-Provides:       %{name}-core = %{epoch}:%{version}-%{jpprelease}
+Provides:       %{name}-libs = %{epoch}:%{version}-%{release}
+Provides:       %{name}-core = %{epoch}:%{version}-%{release}
 # FC4
 Obsoletes:      %{name}-jmf <= 1.6.2-3jpp_12fc
-Provides:       %{name}-jmf = %{epoch}:%{version}-%{jpprelease}
+Provides:       %{name}-jmf = %{epoch}:%{version}-%{release}
 
 %if %{gcj_support}
 BuildRequires:          java-gcj-compat-devel
@@ -1369,6 +1368,10 @@
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.0-2
+- drop repotag
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0:1.7.0-1jpp.4
 - Autorebuild for GCC 4.3