diff --git a/eclipse-usage.spec b/eclipse-usage.spec index 90a58ff..54109b4 100644 --- a/eclipse-usage.spec +++ b/eclipse-usage.spec @@ -1,18 +1,16 @@ -%global gittag jbosstools-%{version}.Final +%global gittag %{version}.AM1 Name: eclipse-usage -Version: 4.4.1 -Release: 3%{?dist} +Version: 4.4.3 +Release: 0.1%{?dist} Summary: Usage reporting plug-ins for Eclipse License: EPL and ASL 2.0 URL: http://tools.jboss.org/ # Generate tarball with: ./get-jbosstools.sh -Source0: %{gittag}.tar.xz +Source0: jbosstools-%{gittag}.tar.xz Source1: get-jbosstools.sh -Patch0: rpm-usage.patch - BuildArch: noarch BuildRequires: tycho @@ -24,10 +22,7 @@ BuildRequires: maven-plugin-build-helper Usage reporting plug-ins for Eclipse. %prep -%setup -q -n %{gittag} -pushd jbosstools-base -%patch0 -p1 -popd +%setup -q -n jbosstools-%{gittag} # Fix whitespace error in xml declaration sed -i -e '1s/\t//' jbosstools-build/parent/pom.xml @@ -60,6 +55,7 @@ chmod -x jbosstools-base/foundation/features/org.jboss.tools.foundation.license. %build pushd jbosstools-build +sed -i -e 's/%{version}\.AM./%{gittag}/' parent/pom.xml %mvn_build -j -- install -f parent/pom.xml popd @@ -72,6 +68,9 @@ popd %license jbosstools-base/foundation/features/org.jboss.tools.foundation.license.feature/license.html %changelog +* Tue Jan 17 2017 Mat Booth - 4.4.3-1 +- Update to latest release + * Wed Oct 26 2016 Mat Booth - 4.4.1-3 - Augment the product ID instead of the distro name diff --git a/get-jbosstools.sh b/get-jbosstools.sh index be8564f..52a4a71 100755 --- a/get-jbosstools.sh +++ b/get-jbosstools.sh @@ -1,6 +1,6 @@ #!/usr/bin/bash -gittag="jbosstools-4.4.1.Final" +gittag="jbosstools-4.4.3.AM1" MODULES="jbosstools-base \ jbosstools-build" diff --git a/rpm-usage.patch b/rpm-usage.patch deleted file mode 100644 index a13c20c..0000000 --- a/rpm-usage.patch +++ /dev/null @@ -1,111 +0,0 @@ -diff --git a/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/EclipseUserAgent.java b/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/EclipseUserAgent.java -index 770aa3e..acd5c42 100644 ---- a/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/EclipseUserAgent.java -+++ b/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/googleanalytics/eclipse/EclipseUserAgent.java -@@ -10,6 +10,8 @@ - ******************************************************************************/ - package org.jboss.tools.usage.googleanalytics.eclipse; - -+import java.io.File; -+import java.net.URL; - import java.text.MessageFormat; - - import org.eclipse.core.runtime.IProduct; -@@ -135,7 +137,12 @@ public class EclipseUserAgent implements IEclipseUserAgent { - } - - public String getApplicationName() { -- return getApplicationBundle().getSymbolicName(); -+ String pkgs = getInstalledPkgs(); -+ if (pkgs != null && !pkgs.isEmpty()) { -+ return getApplicationBundle().getSymbolicName() + "|" + pkgs; -+ } else { -+ return getApplicationBundle().getSymbolicName(); -+ } - } - - public String getApplicationVersion() { -@@ -149,6 +156,33 @@ public class EclipseUserAgent implements IEclipseUserAgent { - } - - /** -+ * Gets the list of packages installed by the OS's package management -+ * system. OS packages (RPMs, DEBs, whatever) that we want to track -+ * installation of, should install marker files into ${eclipse_home}/.pkgs -+ * to be detected here. -+ * -+ * @return a comma delimited string -+ */ -+ private String getInstalledPkgs() { -+ StringBuilder pkgs = new StringBuilder(); -+ URL installLoc = Platform.getInstallLocation().getURL(); -+ File pkgDir = new File(installLoc.getFile(), ".pkgs"); -+ if (pkgDir.isDirectory()) { -+ File[] files = pkgDir.listFiles(); -+ for (int i = 0; i < files.length; i++) { -+ if (files[i].isFile()) { -+ if (pkgs.length() > 0) { -+ pkgs.append("," + files[i].getName()); -+ } else { -+ pkgs.append(files[i].getName()); -+ } -+ } -+ } -+ } -+ return pkgs.toString(); -+ } -+ -+ /** - * Returns the bundle that launched the application that this class runs in. - * - * @return the defining bundle -diff --git a/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java b/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java -index c2b21a1..22bb957 100644 ---- a/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java -+++ b/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/PreferencesMessages.java -@@ -26,6 +26,7 @@ public class PreferencesMessages extends NLS { - public static String UsageReportPreferencePage_OperatingSystem; - public static String UsageReportPreferencePage_OperatingSystemVersion; - public static String UsageReportPreferencePage_LinuxDistro; -+ public static String UsageReportPreferencePage_InstalledPkgs; - public static String UsageReportPreferencePage_ProductId; - public static String UsageReportPreferencePage_ProductOwner; - public static String UsageReportPreferencePage_ProductVersion; -diff --git a/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java b/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java -index 6335b60..315b1fc 100644 ---- a/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java -+++ b/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/UsageReportPreferencePage.java -@@ -90,8 +90,9 @@ public class UsageReportPreferencePage extends FieldEditorPreferencePage impleme - builder.append(StringUtils.getLineSeparator()); - - IEclipseUserAgent eclipseUserAgent = eclipseEnvironment.getEclipseUserAgent(); -+ String appName[] = eclipseUserAgent.getApplicationName().split("\\|", 2); - appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_ProductId, -- eclipseUserAgent.getApplicationName(), builder, styles); -+ appName[0], builder, styles); - - appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_ProductVersion, - eclipseUserAgent.getApplicationVersion(), builder, styles); -@@ -105,6 +106,10 @@ public class UsageReportPreferencePage extends FieldEditorPreferencePage impleme - appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_LinuxDistro, - eclipseEnvironment.getUserDefined(), builder, styles); - } -+ if (appName.length > 1) { -+ appendLabeledValue(PreferencesMessages.UsageReportPreferencePage_InstalledPkgs, -+ appName[1], builder, styles); -+ } - builder.append(StringUtils.getLineSeparator()); - - // JVM -diff --git a/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties b/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties -index a0579f9..fb05fac 100644 ---- a/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties -+++ b/usage/plugins/org.jboss.tools.usage/src/org/jboss/tools/usage/internal/preferences/messages.properties -@@ -20,6 +20,7 @@ UsageReportPreferencePage_NumberOfUsageHits=Number of usage-hits\: - UsageReportPreferencePage_OperatingSystem=Operating system\: - UsageReportPreferencePage_OperatingSystemVersion=Operating system version\: - UsageReportPreferencePage_LinuxDistro=Linux Distro\: -+UsageReportPreferencePage_InstalledPkgs=Installed packages\: - - UsageReportPreferencePage_JvmName=JVM name\: - UsageReportPreferencePage_JvmVersion=JVM version\: diff --git a/sources b/sources index e4112bd..ca95f56 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2e1e033ccf94e55a9c076297d42d833e jbosstools-4.4.1.Final.tar.xz +SHA512 (jbosstools-4.4.3.AM1.tar.xz) = 460fe48720c19beefe70f2ae4ae9a601a50932c84d3f6931db23710c15e3598c6d9e9903b01664072587e7a9c0052ca2aed1593eaa8cfedb5e96790335c2c4c0