[jacoco/f21] added premain-class to agent.rt.jar
jiri vanek
jvanek at fedoraproject.org
Mon Oct 13 12:05:53 UTC 2014
commit ec8699efe0912680ea98646740ae1c200306cdcb
Author: Jiri Vanek <jvanek at redhat.com>
Date: Mon Oct 13 14:05:38 2014 +0200
added premain-class to agent.rt.jar
EnchancedManifest.mf | 3 +++
jacoco.spec | 15 ++++++++++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/EnchancedManifest.mf b/EnchancedManifest.mf
new file mode 100644
index 0000000..fb315f3
--- /dev/null
+++ b/EnchancedManifest.mf
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Premain-Class: org.jacoco.agent.rt.internal.PreMain
+
diff --git a/jacoco.spec b/jacoco.spec
index 3d99faa..9a9cd26 100644
--- a/jacoco.spec
+++ b/jacoco.spec
@@ -2,12 +2,13 @@
Name: jacoco
Version: 0.7.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Java Code Coverage for Eclipse
Group: System Environment/Libraries
License: EPL
URL: http://www.eclemma.org/jacoco/
Source0: https://github.com/jacoco/jacoco/archive/v%{version}.tar.gz
+Source1: EnchancedManifest.mf
Patch0: removeUselessBuildParts.patch
@@ -70,6 +71,14 @@ A Jacoco plugin for maven.
dos2unix org.jacoco.doc/docroot/doc/.resources/doc.css
+# workaround missing premain in agent.rt RH1151442. Not sure where to fix this in build.
+# TODO, fix in build itself
+# 'all' have already premain, 'sources' don't need.
+a=`find org.jacoco.agent.rt/target/ | grep jar | grep -v -e sources -e all`
+for x in $a ; do
+jar -umf %{SOURCE1} $x
+done;
+
%install
%mvn_install
@@ -88,6 +97,10 @@ echo %{name} %{name}/org.jacoco.ant > %{buildroot}%{_sysconfdir}/ant.d/%{name}
%files javadoc -f .mfiles-javadoc
%changelog
+* Sat Oct 11 2014 Jiri Vanek <jvanek at redhat.com> 0.7.2-2
+- added premain-class to agent.rt.jar
+- RH1151442
+
* Mon Sep 15 2014 Alexander Kurtakov <akurtako at redhat.com> 0.7.2-1
- Update to upstream 0.7.2.
More information about the scm-commits
mailing list