From 1da4637283481bc17ffe651d4d991b7369b81fb9 Mon Sep 17 00:00:00 2001 From: Jie Kang Date: Oct 17 2018 18:09:49 +0000 Subject: Update jmc packaging files --- diff --git a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec index a02b97d..8daca93 100644 --- a/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec +++ b/fix-info-plist-maven-plugin/fix-info-plist-maven-plugin.spec @@ -1,12 +1,12 @@ Name: fix-info-plist-maven-plugin -Version: 1.2.0 +Version: 1.2 Release: 1%{?dist} Summary: Small Maven plugin to "fix" the Info.plist file generated by p2 during a Tycho product build License: EPL-1.0 URL: https://github.com/buchen/fix-info-plist-maven-plugin -Source0: fix-info-plist-maven-plugin-1.2.0.tar.gz +Source0: fix-info-plist-maven-plugin-1.2.tar.gz Patch0: 0_update_ddp_version.patch @@ -41,5 +41,5 @@ Small Maven plugin to "fix" the Info.plist file generated by p2 during a Tycho p /usr/share/maven-metadata/%{name}.xml %changelog -* Tue Oct 16 2018 Jie Kang - 1.2.0-1 +* Tue Oct 16 2018 Jie Kang - 1.2-1 - Initial packaging diff --git a/fix-info-plist-maven-plugin/generate_fipmp_tarball.sh b/fix-info-plist-maven-plugin/generate_fipmp_tarball.sh index 52cf98f..d6439a4 100755 --- a/fix-info-plist-maven-plugin/generate_fipmp_tarball.sh +++ b/fix-info-plist-maven-plugin/generate_fipmp_tarball.sh @@ -3,6 +3,5 @@ wget https://github.com/buchen/fix-info-plist-maven-plugin/archive/1.2.tar.gz tar xvf 1.2.tar.gz rm 1.2.tar.gz -mv fix-info-plist-maven-plugin-1.2 fix-info-plist-maven-plugin-1.2.0 -tar czf fix-info-plist-maven-plugin-1.2.0.tar.gz fix-info-plist-maven-plugin-1.2.0/ -rm -r fix-info-plist-maven-plugin-1.2.0 \ No newline at end of file +tar czf fix-info-plist-maven-plugin-1.2.tar.gz fix-info-plist-maven-plugin-1.2/ +rm -r fix-info-plist-maven-plugin-1.2 \ No newline at end of file diff --git a/jmc/6_remove_ide_jdt.patch b/jmc/6_remove_ide_jdt.patch new file mode 100644 index 0000000..3b2cae9 --- /dev/null +++ b/jmc/6_remove_ide_jdt.patch @@ -0,0 +1,30 @@ +# HG changeset patch +# Parent 361c91e54fb1074e7483ec160a4dac6c1675d649 + +diff --git a/application/org.openjdk.jmc.feature.ide/feature.xml b/application/org.openjdk.jmc.feature.ide/feature.xml +--- a/application/org.openjdk.jmc.feature.ide/feature.xml ++++ b/application/org.openjdk.jmc.feature.ide/feature.xml +@@ -65,11 +65,4 @@ + install-size="0" + version="0.0.0" + unpack="false"/> +- +- + +\ No newline at end of file +diff --git a/application/pom.xml b/application/pom.xml +--- a/application/pom.xml ++++ b/application/pom.xml +@@ -79,7 +79,6 @@ + org.openjdk.jmc.flightrecorder.ui + org.openjdk.jmc.greychart + org.openjdk.jmc.greychart.ui +- org.openjdk.jmc.ide.jdt + org.openjdk.jmc.ide.launch + org.openjdk.jmc.ide.ui + org.openjdk.jmc.jdp diff --git a/jmc/7_remove_buchen_repo.patch b/jmc/7_remove_buchen_repo.patch new file mode 100644 index 0000000..67ccb1f --- /dev/null +++ b/jmc/7_remove_buchen_repo.patch @@ -0,0 +1,18 @@ +# HG changeset patch +# Parent 8009a5787a521e312ca103c918f089175bfd758b + +diff --git a/application/org.openjdk.jmc.rcp.product/pom.xml b/application/org.openjdk.jmc.rcp.product/pom.xml +--- a/application/org.openjdk.jmc.rcp.product/pom.xml ++++ b/application/org.openjdk.jmc.rcp.product/pom.xml +@@ -136,11 +136,4 @@ + + ../../target/ + +- +- +- buchen-maven-repo +- http://buchen.github.io/maven-repo +- default +- +- + diff --git a/jmc/jmc.spec b/jmc/jmc.spec index 9db2a30..0f1f1b6 100644 --- a/jmc/jmc.spec +++ b/jmc/jmc.spec @@ -18,20 +18,18 @@ Patch0: 0_remove_twitter.patch Patch1: 1_javamail.patch Patch2: 2_javax.patch Patch3: 3_remove_profiles.patch -Patch4: 4_rename_javax-el.patch -Patch5: 5_remove_localisation.patch - Patch4: 4_remove_localization.patch Patch5: 5_remove_jfx.patch +Patch6: 6_remove_ide_jdt.patch BuildRequires: ant maven-local javapackages-tools tycho tycho-extras icu -BuildRequires: maven-deploy-plugin buildnumber-maven-plugin maven-enforcer-plugin maven-install-plugin maven-site-plugin directory-maven-plugin +BuildRequires: maven-deploy-plugin buildnumber-maven-plugin maven-enforcer-plugin maven-install-plugin maven-site-plugin directory-maven-plugin fix-info-plist-maven-plugin #BuildRequires: glassfish-el glassfish-annotation-api atinject glassfish-jsp-api glassfish-jsp batik batik-css #BuildRequires: apache-commons-codec apache-commons-io apache-commons-jxpath apache-commons-logging #BuildRequires: felix-gogo-command felix-gogo-runtime felix-gogo-shell felix-scr #BuildRequires: httpcomponents-client httpcomponents-core #BuildRequires: lucene-analysis lucene-analyzers-smartcn lucene apiguardian -BuildRequires: eclipse-platform eclipse-jdt eclipse-equinox-osgi eclipse-tests +BuildRequires: eclipse-platform eclipse-equinox-osgi eclipse-tests #BuildRequires: eclipse-jdt eclipse-platform eclipse-ecf-core eclipse-emf-core eclipse-pde eclipse-equinox-osgi eclipse-swt eclipse-tests #BuildRequires: jetty-continuation jetty-http jetty-io jetty-security jetty-server jetty-servlet jetty-util #BuildRequires: hamcrest-core junit junit5 opentest4j sat4j sac xml-commons-apis xz-java @@ -56,18 +54,17 @@ from Java applications running locally or deployed in production environments. %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %pom_disable_module releng %pom_disable_module l10n application %pom_disable_module org.openjdk.jmc.updatesite.ide application %pom_disable_module org.openjdk.jmc.updatesite.rcp application -%pom_disable_module l10n application - %pom_remove_plugin com.github.spotbugs:spotbugs-maven-plugin %build -%mvn_build -- -X +%mvn_build %install %mvn_install