[eclipse-eclemma] Update to latest upstream release
Mat Booth
mbooth at fedoraproject.org
Tue Jun 17 13:54:16 UTC 2014
commit 1d1a33fdf46596060b7e64b52b3d299924fc2aa7
Author: Mat Booth <mat.booth at redhat.com>
Date: Tue Jun 17 14:53:42 2014 +0100
Update to latest upstream release
- Patch to build against Luna
- Fix FTBFS rhbz #1106194
.gitignore | 3 +
eclipse-eclemma-build-luna.patch | 61 +++++++++++++++++++++++++++
eclipse-eclemma-fix-jacoco-dependency.patch | 26 -----------
eclipse-eclemma.spec | 39 +++++++++--------
sources | 2 +-
5 files changed, 85 insertions(+), 46 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b37a94c..aedee55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@ eclemma-v2.1.2.tar.gz
/v2.1.4
/v2.2.0.tar.gz
/noarch
+/*.src.rpm
+/.build-*.log
/.project
/master.zip
/eclemma-master.tar.bz2
@@ -18,3 +20,4 @@ eclemma-v2.1.2.tar.gz
/v2.2.1.tar.gz
/eclemma-2.2.1
/eclemma-2.3.0.tar.gz
+/v2.3.1.tar.gz
diff --git a/eclipse-eclemma-build-luna.patch b/eclipse-eclemma-build-luna.patch
new file mode 100644
index 0000000..e680c7a
--- /dev/null
+++ b/eclipse-eclemma-build-luna.patch
@@ -0,0 +1,61 @@
+--- com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/core/ScopeUtils.java.orig 2014-06-17 14:31:38.964558781 +0100
++++ com.mountainminds.eclemma.core/src/com/mountainminds/eclemma/core/ScopeUtils.java 2014-06-17 14:32:25.265817797 +0100
+@@ -107,8 +107,8 @@
+ public static Set<IPackageFragmentRoot> getConfiguredScope(
+ final ILaunchConfiguration configuration) throws CoreException {
+ final Set<IPackageFragmentRoot> all = getOverallScope(configuration);
+- final List<?> selection = configuration.getAttribute(
+- ICoverageLaunchConfigurationConstants.ATTR_SCOPE_IDS, (List<?>) null);
++ final List<String> selection = configuration.getAttribute(
++ ICoverageLaunchConfigurationConstants.ATTR_SCOPE_IDS, (List<String>) null);
+ if (selection == null) {
+ final DefaultScopeFilter filter = new DefaultScopeFilter(
+ EclEmmaCorePlugin.getInstance().getPreferences());
+@@ -166,4 +166,4 @@
+ return filtered;
+ }
+
+-}
+\ No newline at end of file
++}
+--- com.mountainminds.eclemma.core.test/src/com/mountainminds/eclemma/internal/core/SessionManagerTest.java.orig 2014-06-17 14:34:58.448365462 +0100
++++ com.mountainminds.eclemma.core.test/src/com/mountainminds/eclemma/internal/core/SessionManagerTest.java 2014-06-17 14:36:06.806270687 +0100
+@@ -499,17 +499,17 @@
+ return 0;
+ }
+
+- public List<?> getAttribute(String attributeName,
++ public List<String> getAttribute(String attributeName,
+ @SuppressWarnings("rawtypes") List defaultValue) throws CoreException {
+ return null;
+ }
+
+- public Set<?> getAttribute(String attributeName,
++ public Set<String> getAttribute(String attributeName,
+ @SuppressWarnings("rawtypes") Set defaultValue) throws CoreException {
+ return null;
+ }
+
+- public Map<?, ?> getAttribute(String attributeName,
++ public Map<String, String> getAttribute(String attributeName,
+ @SuppressWarnings("rawtypes") Map defaultValue) throws CoreException {
+ return null;
+ }
+@@ -519,7 +519,7 @@
+ return null;
+ }
+
+- public Map<?, ?> getAttributes() throws CoreException {
++ public Map<String, Object> getAttributes() throws CoreException {
+ return null;
+ }
+
+@@ -547,7 +547,7 @@
+ return null;
+ }
+
+- public Set<?> getModes() throws CoreException {
++ public Set<String> getModes() throws CoreException {
+ return null;
+ }
+
diff --git a/eclipse-eclemma.spec b/eclipse-eclemma.spec
index 1d81f54..a0f3686 100644
--- a/eclipse-eclemma.spec
+++ b/eclipse-eclemma.spec
@@ -1,27 +1,29 @@
%global install_loc %{_datadir}/eclipse/dropins/eclemma
Name: eclipse-eclemma
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
Summary: Java code coverage tool plugin for Eclipse
Group: Development/Tools
License: EPL and ASL 2.0
URL: http://www.eclemma.org
-Source0: eclemma-%{version}.tar.gz
+Source0: https://github.com/jacoco/eclemma/archive/v%{version}.tar.gz
+
+Patch0: eclipse-eclemma-build-luna.patch
BuildArch: noarch
BuildRequires: java-devel
BuildRequires: javapackages-tools
BuildRequires: eclipse-pde >= 1:4.2.0
-BuildRequires: jacoco >= 0.7.0
+BuildRequires: jacoco >= 0.7.1
BuildRequires: maven-local
BuildRequires: tycho
BuildRequires: tycho-extras
BuildRequires: feclipse-maven-plugin
BuildRequires: maven-plugin-build-helper
Requires: eclipse-jdt >= 1:4.2.0
-Requires: jacoco >= 0.7.0
-Requires: objectweb-asm
+Requires: jacoco >= 0.7.1
+Requires: objectweb-asm >= 5.0.1
%description
EclEmma is a Java code coverage tool for Eclipse based on the EMMA Java
@@ -31,8 +33,9 @@ editors.
%prep
%setup -q -n eclemma-%{version}
-#git does not handle empty folders - but this one is necessary
+%patch0
+#git does not handle empty folders - but this one is necessary
mkdir -p com.mountainminds.eclemma.asm/src
rm -fr com.mountainminds.eclemma.debug.ui.compatibility/src/org/eclipse/debug/ui/actions/RelaunchLastAction.java
find -name '*.class' -exec rm -f '{}' \;
@@ -41,17 +44,11 @@ find -name '*.jar' -exec rm -f '{}' \;
%pom_remove_plugin :jacoco-maven-plugin com.mountainminds.eclemma.build/pom.xml
%pom_remove_dep org.jacoco: com.mountainminds.eclemma.build/pom.xml
-mkdir -p .m2/p2/repo-sdk/plugins
-pushd .m2/p2/repo-sdk/plugins
- ln -t . -s /usr/share/java/jacoco/*
-popd
-
# Relax version requirement on jacoco
-sed -i /jacoco/s/0.6.4/0.7.0/ `find -name *.MF`
-
+sed -i /jacoco/s/0.7.2/0.8.0/ `find -name *.MF`
%build
-mvn-rpmbuild clean install -DskipTychoVersionCheck -Dimplicit-target -DskipTests
+xmvn -o clean verify -Dimplicit-target -DskipTests
%install
install -d -m 755 %{buildroot}/%{install_loc}
@@ -68,16 +65,15 @@ cat > pom.xml << EOF
</project>
EOF
popd
-mvn-rpmbuild -f temp/pom.xml org.fedoraproject:feclipse-maven-plugin:install \
- -DsourceRepo=../com.mountainminds.eclemma.site/target/repository -DtargetLocation=%{buildroot}%{install_loc}/eclipse
-
+xmvn -o -f temp/pom.xml org.fedoraproject:feclipse-maven-plugin:install \
+ -DsourceRepo=../com.mountainminds.eclemma.site/target/repository -DtargetLocation=%{buildroot}%{install_loc}/eclipse
pushd %{buildroot}/%{install_loc}/eclipse/plugins
rm -fr org.jacoco*
ln -s %{_javadir}/jacoco/org.jacoco.agent.jar
ln -s %{_javadir}/jacoco/org.jacoco.core.jar
ln -s %{_javadir}/jacoco/org.jacoco.report.jar
- ln -s %{_javadir}/objectweb-asm4/asm-all.jar
+ ln -s %{_javadir}/objectweb-asm/asm-all.jar
popd
%files
@@ -87,6 +83,11 @@ popd
%{install_loc}
%changelog
+* Tue Jun 17 2014 Mat Booth <mat.booth at redhat.com> - 2.3.1-1
+- Update to latest upstream release
+- Patch to build against Luna
+- Fix FTBFS rhbz #1106194
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
diff --git a/sources b/sources
index c876852..d62a87a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7799ef461c4d8be34bb0dd7d8832cba5 eclemma-2.3.0.tar.gz
+89f8892fcf935232a05c96d9efcebfe7 v2.3.1.tar.gz
More information about the scm-commits
mailing list