rpms/emma/devel emma.spec,1.2,1.3

[Tom Callaway (spot)]

Author: spot

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

Modified Files:
	emma.spec 
Log Message:
fix repotag


Index: emma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/emma/devel/emma.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emma.spec	7 Jul 2008 20:31:16 -0000	1.2
+++ emma.spec	9 Jul 2008 18:32:48 -0000	1.3
@@ -28,15 +28,17 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%define shortver 2.0
+
 Summary:        Code Coverage Tool
 Name:           emma
-Version:        2.0
-Release:        0.5312.2jpp.4%{?dist}
+Version:        %{shortver}.5312
+Release:        1%{?dist}
 Epoch:          0
 Group:          Development/Tools
 License:        CPL
 URL:            http://emma.sourceforge.net/
-Source0:        emma-2.0.5312-src.zip
+Source0:        http://downloads.sourceforge.net/emma/%{name}-%{version}-src.zip
 Source1:        emma-2.0.5312.pom
 Source2:        emma_ant-2.0.5312.pom
 # These are hacks until we get the source for the timestamping class
@@ -81,7 +83,7 @@
 %{summary}.
 
 %prep
-%setup -q -n %{name}-%{version}.5312
+%setup -q
 cp -p %{SOURCE3} .
 cp -p %{SOURCE4} .
 
@@ -102,13 +104,13 @@
 rm -rf $RPM_BUILD_ROOT
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 dist/%{name}.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+               $RPM_BUILD_ROOT%{_javadir}/%{name}-%{shortver}.jar
 install -m 644 dist/%{name}_ant.jar \
-               $RPM_BUILD_ROOT%{_javadir}/%{name}_ant-%{version}.jar
+               $RPM_BUILD_ROOT%{_javadir}/%{name}_ant-%{shortver}.jar
 %add_to_maven_depmap emma emma %{version} JPP %{name}
 %add_to_maven_depmap emma emma_ant %{version} JPP %{name}_ant
 
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{shortver}.jar; do ln -sf ${jar} `echo $jar| sed  "s|-%{shortver}||g"`; done)
 
 # poms
 install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
@@ -142,6 +144,10 @@
 %doc %{_javadocdir}/%{name}*
 
 %changelog
+* Wed Jul  9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.5312-1
+- drop repotag
+- fix version, release to be sane
+
 * Mon Jul 07 2008 Andrew Overholt <overholt at redhat.com> 2.0-0.5312.2jpp.4
 - Remove requirement on maven2 as jpackage-utils now owns the maven POMs
   and fragments directories.