From fa15dd93f0c8b395d42d017f1765a2ffc6c4af5f67987187426828c3d1ecca67 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 Jul 2020 07:08:45 +0000 Subject: [PATCH 1/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=71 --- 5.3.0.tar.gz | 3 --- 5.3.1.tar.gz | 3 +++ javapackages-tools.spec | 2 +- suse-use-libdir.patch | 27 ++++++++++++++------------- 4 files changed, 18 insertions(+), 17 deletions(-) delete mode 100644 5.3.0.tar.gz create mode 100644 5.3.1.tar.gz diff --git a/5.3.0.tar.gz b/5.3.0.tar.gz deleted file mode 100644 index 3833f95..0000000 --- a/5.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73803877c26b3e6c0440b2e1e4d78a5fadf63782a62374df400b8badb1de3046 -size 155460 diff --git a/5.3.1.tar.gz b/5.3.1.tar.gz new file mode 100644 index 0000000..47da8bd --- /dev/null +++ b/5.3.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c2cbead4299ae4e4d0303f5f3d132754f06fd7e6d07526cea3cf992af2d15aa +size 155512 diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 3d3ac6a..fb78286 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -27,7 +27,7 @@ Name: javapackages-tools-%{flavor} %else Name: javapackages-tools %endif -Version: 5.3.0 +Version: 5.3.1 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause diff --git a/suse-use-libdir.patch b/suse-use-libdir.patch index 63a54da..fc86999 100644 --- a/suse-use-libdir.patch +++ b/suse-use-libdir.patch @@ -1,5 +1,5 @@ ---- javapackages-5.3.0/configure-base.sh 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/configure-base.sh 2018-11-28 06:33:58.811049137 +0100 +--- javapackages-5.3.1/configure-base.sh 2019-06-14 12:26:27.000000000 +0200 ++++ javapackages-5.3.1/configure-base.sh 2020-07-16 09:04:37.316453132 +0200 @@ -14,6 +14,7 @@ root_sysconfdir rpmconfigdir @@ -16,8 +16,9 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d" ---- javapackages-5.3.0/etc/eclipse.conf 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/etc/eclipse.conf 2018-11-28 06:33:58.811049137 +0100 +diff -urEbwB javapackages-5.3.1/etc/eclipse.conf javapackages-5.3.1/etc/eclipse.conf +--- javapackages-5.3.1/etc/eclipse.conf 2019-06-14 12:26:27.000000000 +0200 ++++ javapackages-5.3.1/etc/eclipse.conf 2020-07-16 09:04:37.316453132 +0200 @@ -1,7 +1,7 @@ # Eclipse filesystem configuration file @@ -40,8 +41,8 @@ # Comma-separated list of directories searched for external bundles eclipse.bundles=@{javadir},@{jnidir} ---- javapackages-5.3.0/expand.sh 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/expand.sh 2018-11-28 06:33:58.811049137 +0100 +--- javapackages-5.3.1/expand.sh 2019-06-14 12:26:27.000000000 +0200 ++++ javapackages-5.3.1/expand.sh 2020-07-16 09:04:37.316453132 +0200 @@ -45,6 +45,7 @@ -e "s|@{scl_suffix}|${scl_suffix}|g" \ -e "s|@{bindir}|${bindir}|g" \ @@ -50,8 +51,8 @@ -e "s|@{javaconfdir}|${javaconfdir}|g" \ -e "s|@{javadir}|${javadir}|g" \ -e "s|@{jnidir}|${jnidir}|g" \ ---- javapackages-5.3.0/install 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/install 2018-11-28 06:36:39.927862680 +0100 +--- javapackages-5.3.1/install 2019-06-14 12:26:27.000000000 +0200 ++++ javapackages-5.3.1/install 2020-07-16 09:04:37.316453132 +0200 @@ -90,11 +90,11 @@ dir "${mavenpomdir}" dir "${ivyxmldir}" @@ -69,8 +70,8 @@ dir "${datadir}/eclipse" dir "${datadir}/eclipse/dropins" dir "${datadir}/eclipse/droplets" ---- javapackages-5.3.0/macros.d/macros.javapackages-filesystem 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/macros.d/macros.javapackages-filesystem 2018-11-28 06:33:58.811049137 +0100 +--- javapackages-5.3.1/macros.d/macros.javapackages-filesystem 2019-06-14 12:26:27.000000000 +0200 ++++ javapackages-5.3.1/macros.d/macros.javapackages-filesystem 2020-07-16 09:05:34.448792440 +0200 @@ -13,17 +13,17 @@ # # Root directory where all Java VMs/SDK/JREs are installed. @@ -96,7 +97,7 @@ # # Root directory for all common architecture dependent parts of Java VM/SDK/JRE's # --%_jvmcommonlibdir %{_prefix}/lib/jvm-commmon +-%_jvmcommonlibdir %{_prefix}/lib/jvm-common +%_jvmcommonlibdir %{_libdir}/jvm-commmon # @@ -110,8 +111,8 @@ # # Root directory where all javadoc is installed. Also already in RH macros. ---- javapackages-5.3.0/macros.d/macros.scl-java-template 2018-08-06 17:09:06.000000000 +0200 -+++ javapackages-5.3.0/macros.d/macros.scl-java-template 2018-11-28 06:34:48.631301258 +0100 +--- javapackages-5.3.1/macros.d/macros.scl-java-template 2019-06-14 12:26:27.000000000 +0200 ++++ javapackages-5.3.1/macros.d/macros.scl-java-template 2020-07-16 09:04:37.320453154 +0200 @@ -50,11 +50,11 @@ dir "%{_ivyxmldir}" \ dir "%{_sysconfdir}/ivy" \ From 1ae4d74f2d0848fb867cbbbd211c94267185bf30b72b114aa535f7063eb117f4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 Jul 2020 07:26:48 +0000 Subject: [PATCH 2/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=72 --- javapackages-tools.changes | 13 ++++++++ javapackages-tools.spec | 2 ++ useless-plugins.patch | 65 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 useless-plugins.patch diff --git a/javapackages-tools.changes b/javapackages-tools.changes index b87b482..143ee12 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Thu Jul 16 07:23:37 UTC 2020 - Fridrich Strba + +- Upgrade to version 5.3.1 +- Modified patch: + * suse-use-libdir.patch + + rediff to changed context +- Added patch: + * useless-plugins.patch + + upstream patch to skip plugins that are useless during rpm + build +- Define _rpmmacrodir for distributions that don't have it + ------------------------------------------------------------------- Tue May 5 12:32:03 UTC 2020 - Dominique Leuenberger diff --git a/javapackages-tools.spec b/javapackages-tools.spec index fb78286..9914392 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -42,6 +42,8 @@ Patch1: python-optional.patch #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did # Avoid generating unresolvable requires Patch2: suse-no-epoch.patch +#PATCH-FIX-UPSTREM: Avoid requiring maven plugins useless for rpm build +Patch3: useless-plugins.patch BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: perl diff --git a/useless-plugins.patch b/useless-plugins.patch new file mode 100644 index 0000000..c81af75 --- /dev/null +++ b/useless-plugins.patch @@ -0,0 +1,65 @@ +--- javapackages-5.3.1/configs/configuration.xml 2019-06-14 12:26:27.000000000 +0200 ++++ javapackages-5.3.1/configs/configuration.xml 2020-07-16 09:18:03.085645130 +0200 +@@ -4,6 +4,62 @@ + + /usr/share/maven-metadata + ++ ++ ++ ++ org.codehaus.mojo ++ animal-sniffer-maven-plugin ++ ++ ++ org.apache.maven.plugins ++ maven-enforcer-plugin ++ ++ ++ ++ org.codehaus.moj ++ findbugs-maven-plugin ++ ++ ++ com.github.spotbug ++ spotbugs-maven-plugin ++ ++ ++ org.apache.maven.plugins ++ maven-checkstyle-plugin ++ ++ ++ org.apache.maven.plugins ++ maven-pmd-plugin ++ ++ ++ ++ org.jacoco ++ jacoco-maven-plugin ++ ++ ++ org.eluder.coveralls ++ coveralls-maven-plugin ++ ++ ++ org.codehaus.mojo ++ cobertura-maven-plugin ++ ++ ++ ++ org.apache.rat ++ apache-rat-plugin ++ ++ ++ ++ org.apache.maven.plugins ++ maven-gpg-plugin ++ ++ ++ ++ org.sonatype.plugins ++ nexus-staging-maven-plugin ++ ++ + + + usr/share/maven-metadata From 53d35edecc54beb0accb0614bc015de5e3d1dea7d519ec29e91c2ec844843f8f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 Jul 2020 07:27:51 +0000 Subject: [PATCH 3/5] Accepting request 821236 from Java:Factory _rpmmacrodir OBS-URL: https://build.opensuse.org/request/show/821236 OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=73 --- javapackages-tools.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 9914392..4af55d9 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -16,6 +16,7 @@ # +%{!?_rpmmacrodir:%global _rpmmacrodir %{_rpmconfigdir}/macros.d} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "extras" %bcond_without python From af5bf5a82fe9a83eae9c66cfbb6fb30f9c846cb1be91b6ad8198b5a45d07be65 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 Jul 2020 10:20:30 +0000 Subject: [PATCH 4/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=74 --- javapackages-tools.changes | 4 ---- javapackages-tools.spec | 2 -- 2 files changed, 6 deletions(-) diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 143ee12..4ea7a71 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -5,10 +5,6 @@ Thu Jul 16 07:23:37 UTC 2020 - Fridrich Strba - Modified patch: * suse-use-libdir.patch + rediff to changed context -- Added patch: - * useless-plugins.patch - + upstream patch to skip plugins that are useless during rpm - build - Define _rpmmacrodir for distributions that don't have it ------------------------------------------------------------------- diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 4af55d9..31b995f 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -43,8 +43,6 @@ Patch1: python-optional.patch #PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did # Avoid generating unresolvable requires Patch2: suse-no-epoch.patch -#PATCH-FIX-UPSTREM: Avoid requiring maven plugins useless for rpm build -Patch3: useless-plugins.patch BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: perl From f9325caf96aec8684163bb4c8f2f1fec4f60f51107e45f035acb2478e1bece8d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 16 Jul 2020 10:21:32 +0000 Subject: [PATCH 5/5] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=75 --- useless-plugins.patch | 65 ------------------------------------------- 1 file changed, 65 deletions(-) delete mode 100644 useless-plugins.patch diff --git a/useless-plugins.patch b/useless-plugins.patch deleted file mode 100644 index c81af75..0000000 --- a/useless-plugins.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- javapackages-5.3.1/configs/configuration.xml 2019-06-14 12:26:27.000000000 +0200 -+++ javapackages-5.3.1/configs/configuration.xml 2020-07-16 09:18:03.085645130 +0200 -@@ -4,6 +4,62 @@ - - /usr/share/maven-metadata - -+ -+ -+ -+ org.codehaus.mojo -+ animal-sniffer-maven-plugin -+ -+ -+ org.apache.maven.plugins -+ maven-enforcer-plugin -+ -+ -+ -+ org.codehaus.moj -+ findbugs-maven-plugin -+ -+ -+ com.github.spotbug -+ spotbugs-maven-plugin -+ -+ -+ org.apache.maven.plugins -+ maven-checkstyle-plugin -+ -+ -+ org.apache.maven.plugins -+ maven-pmd-plugin -+ -+ -+ -+ org.jacoco -+ jacoco-maven-plugin -+ -+ -+ org.eluder.coveralls -+ coveralls-maven-plugin -+ -+ -+ org.codehaus.mojo -+ cobertura-maven-plugin -+ -+ -+ -+ org.apache.rat -+ apache-rat-plugin -+ -+ -+ -+ org.apache.maven.plugins -+ maven-gpg-plugin -+ -+ -+ -+ org.sonatype.plugins -+ nexus-staging-maven-plugin -+ -+ - - - usr/share/maven-metadata