rpms/eclipse-eclemma/devel eclipse-eclemma.spec, 1.3, 1.4 get-eclemma.sh, 1.1, 1.2 eclipse-eclemma-unjar-2.patch, 1.1, 1.2

[Alexander Kurtakov]

Author: akurtakov

Update of /cvs/pkgs/rpms/eclipse-eclemma/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26453/devel

Modified Files:
	eclipse-eclemma.spec get-eclemma.sh 
	eclipse-eclemma-unjar-2.patch 
Log Message:
Update to 1.4.1.


Index: eclipse-eclemma.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-eclemma/devel/eclipse-eclemma.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- eclipse-eclemma.spec	23 Mar 2009 16:13:19 -0000	1.3
+++ eclipse-eclemma.spec	15 May 2009 10:45:53 -0000	1.4
@@ -2,8 +2,8 @@
 %define install_loc  %{_datadir}/eclipse/dropins/eclemma
 
 Name:      eclipse-eclemma
-Version:   1.3.2
-Release:   5%{?dist}
+Version:   1.4.1
+Release:   1%{?dist}
 Summary:   Java code coverage tool plugin for Eclipse
 Group:     Development/Tools
 License:   EPL and ASL 2.0
@@ -40,8 +40,10 @@ editors.
 %prep
 %setup -q -n eclemma-%{version}
 %patch0
+pushd com.mountainminds.eclemma.core
 %patch1
-rm com.mountainminds.eclemma.core/emma.jar
+rm emma.jar
+popd
 build-jar-repository -s -p com.mountainminds.eclemma.core emma.jar
 cp -rp %{SOURCE2} .
 
@@ -71,6 +73,9 @@ rm -rf %{buildroot}
 %{install_loc}
 
 %changelog
+* Fri May 15 2009 Alexander Kurtakov <akurtako at redhat.com> 1.4.1-1
+- Update to new upstream version and updated patch1.
+
 * Mon Mar 23 2009 Alexander Kurtakov <akurtako at redhat.com> 1.3.2-5
 - Rebuild to not ship p2 context.xml.
 


Index: get-eclemma.sh
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-eclemma/devel/get-eclemma.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- get-eclemma.sh	4 Dec 2008 03:21:20 -0000	1.1
+++ get-eclemma.sh	15 May 2009 10:45:53 -0000	1.2
@@ -1,6 +1,6 @@
 #!/bin/sh
 NAME="eclemma"
-VERSION="1.3.2"
+VERSION="1.4.1"
 
 mkdir $NAME-$VERSION
 pushd $NAME-$VERSION >/dev/null

eclipse-eclemma-unjar-2.patch:

Index: eclipse-eclemma-unjar-2.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-eclemma/devel/eclipse-eclemma-unjar-2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- eclipse-eclemma-unjar-2.patch	4 Dec 2008 03:21:20 -0000	1.1
+++ eclipse-eclemma-unjar-2.patch	15 May 2009 10:45:53 -0000	1.2
@@ -1,50 +1,15 @@
-Index: com.mountainminds.eclemma.core/META-INF/MANIFEST.MF
+### Eclipse Workspace Patch 1.0
+#P com.mountainminds.eclemma.core
+Index: build.properties
 ===================================================================
---- com.mountainminds.eclemma.core/META-INF/MANIFEST.MF	(revision 465)
-+++ com.mountainminds.eclemma.core/META-INF/MANIFEST.MF	(working copy)
-@@ -13,8 +13,8 @@
-  org.eclipse.debug.core,
-  org.eclipse.jdt.core,
-  org.eclipse.jdt.launching
--Bundle-ClassPath: .,
-- emma.jar
-+Bundle-ClassPath: emma.jar,
-+ eclemma-core.jar
- Bundle-Activator: com.mountainminds.eclemma.internal.core.EclEmmaCorePlugin
- Eclipse-AutoStart: true
- 
-Index: com.mountainminds.eclemma.core/.classpath
-===================================================================
---- com.mountainminds.eclemma.core/.classpath	(revision 465)
-+++ com.mountainminds.eclemma.core/.classpath	(working copy)
-@@ -1,8 +1,9 @@
--<?xml version="1.0" encoding="UTF-8"?>
--<classpath>
--	<classpathentry kind="src" path="src"/>
--	<classpathentry exported="true" kind="lib" path="emma.jar"/>
--	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
--	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
--	<classpathentry kind="output" path="bin"/>
--</classpath>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<classpath>
-+	<classpathentry kind="src" path="src"/>
-+	<classpathentry exported="true" kind="lib" path="eclemma-core.jar"/>
-+	<classpathentry exported="true" kind="lib" path="emma.jar"/>
-+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-+	<classpathentry kind="output" path="bin"/>
-+</classpath>
-Index: com.mountainminds.eclemma.core/build.properties
-===================================================================
---- com.mountainminds.eclemma.core/build.properties	(revision 465)
-+++ com.mountainminds.eclemma.core/build.properties	(working copy)
-@@ -1,11 +1,13 @@
+--- build.properties	(revision 557)
++++ build.properties	(working copy)
+@@ -1,4 +1,3 @@
 -source.. = src/
  output.. = bin/
  bin.includes = META-INF/,\
--               .,\
-                plugin.xml,\
+                .,\
+@@ -6,6 +5,10 @@
                 .options,\
                 plugin.properties,\
                 emma.jar,\
@@ -56,3 +21,37 @@ Index: com.mountainminds.eclemma.core/bu
 +jars.compile.order = eclemma-core.jar
 +source.eclemma-core.jar = src/
 +output.eclemma-core.jar = bin/
+Index: .classpath
+===================================================================
+--- .classpath	(revision 557)
++++ .classpath	(working copy)
+@@ -1,8 +1,9 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <classpath>
+-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+-	<classpathentry kind="src" path="src"/>
+-	<classpathentry kind="lib" path="emma.jar"/>
+-	<classpathentry kind="output" path="bin"/>
++       <classpathentry kind="src" path="src"/>
++       <classpathentry exported="true" kind="lib" path="eclemma-core.jar"/>
++       <classpathentry exported="true" kind="lib" path="emma.jar"/>
++       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
++       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
++       <classpathentry kind="output" path="bin"/>
+ </classpath>
+Index: META-INF/MANIFEST.MF
+===================================================================
+--- META-INF/MANIFEST.MF	(revision 557)
++++ META-INF/MANIFEST.MF	(working copy)
+@@ -13,8 +13,8 @@
+  org.eclipse.debug.core,
+  org.eclipse.jdt.core,
+  org.eclipse.jdt.launching
+-Bundle-ClassPath: .,
+- emma.jar
++Bundle-ClassPath: emma.jar,
++ eclemma-core.jar
+ Bundle-Activator: com.mountainminds.eclemma.internal.core.EclEmmaCorePlugin
+ Eclipse-AutoStart: true
+