diff --git a/javapackages-tools.changes b/javapackages-tools.changes index 837ad6f..52fa161 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Nov 27 18:36:57 UTC 2018 - Fridrich Strba + +- Modified patch: + * suse-use-libdir.patch + + fix directories for eclipse.conf too + +------------------------------------------------------------------- +Sun Nov 11 15:21:24 UTC 2018 - Fridrich Strba + +- Make the javapackages-local package depend on java-devel. It is + used for package building and this avoids each package to require + java-devel itself. + ------------------------------------------------------------------- Mon Nov 5 09:34:51 UTC 2018 - Fridrich Strba diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 0beec01..d7ee843 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -116,6 +116,7 @@ packaging in Linux distributions %package -n javapackages-local Summary: Non-essential macros and scripts for Java packaging support Group: Development/Languages/Java +Requires: java-devel Requires: javapackages-tools = %{version} Requires: python3-javapackages = %{version} diff --git a/suse-use-libdir.patch b/suse-use-libdir.patch index d8dc87d..63a54da 100644 --- a/suse-use-libdir.patch +++ b/suse-use-libdir.patch @@ -1,16 +1,6 @@ -Date: Sat, 7 Mar 2015 19:25:15 +0100 -Subject: [PATCH] SUSE does store jvm related things in libdir - ---- - configure | 2 ++ - macros.d/macros.jpackage | 12 ++++++------ - 2 files changed, 8 insertions(+), 6 deletions(-) - -Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh -=================================================================== ---- javapackages-5.2.0+git20180620.70fa2258.orig/configure-base.sh -+++ javapackages-5.2.0+git20180620.70fa2258/configure-base.sh -@@ -14,6 +14,7 @@ sysconfdir +--- 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 +@@ -14,6 +14,7 @@ root_sysconfdir rpmconfigdir rpmmacrodir @@ -18,18 +8,69 @@ Index: javapackages-5.2.0+git20180620.70fa2258/configure-base.sh m2home -@@ -51,6 +52,7 @@ test -z "${mandir}" && mandir="${datadir +@@ -51,6 +52,7 @@ test -z "${rundir}" && rundir="${localstatedir}/run" test -z "${sysconfdir}" && sysconfdir="${prefix}/etc" test -z "${root_sysconfdir}" && root_sysconfdir="${prefix}/etc" -+test -z "${libdir}" && rpmconfigdir="${prefix}/lib/" ++test -z "${libdir}" && libdir="${prefix}/lib/" test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" test -z "${rpmmacrodir}" && rpmmacrodir="${rpmconfigdir}/macros.d" -Index: javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-filesystem -=================================================================== ---- javapackages-5.2.0+git20180620.70fa2258.orig/macros.d/macros.javapackages-filesystem -+++ javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-filesystem +--- 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 +@@ -1,7 +1,7 @@ + # Eclipse filesystem configuration file + + # Eclipse platform root directory +-eclipse.root=@{prefix}/lib/eclipse ++eclipse.root=@{libdir}/eclipse + + # Location of architecture-independant dropins + eclipse.dropins.noarch=@{datadir}/eclipse/dropins +@@ -10,10 +10,10 @@ + eclipse.droplets.noarch=@{datadir}/eclipse/droplets + + # Location of architecture-dependant dropins +-eclipse.dropins.archful=@{prefix}/lib/eclipse/dropins ++eclipse.dropins.archful=@{libdir}/eclipse/dropins + + # Location of architecture-dependant droplets +-eclipse.droplets.archful=@{prefix}/lib/eclipse/droplets ++eclipse.droplets.archful=@{libdir}/eclipse/droplets + + # 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 +@@ -45,6 +45,7 @@ + -e "s|@{scl_suffix}|${scl_suffix}|g" \ + -e "s|@{bindir}|${bindir}|g" \ + -e "s|@{datadir}|${datadir}|g" \ ++ -e "s|@{libdir}|${libdir}|g" \ + -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 +@@ -90,11 +90,11 @@ + dir "${mavenpomdir}" + dir "${ivyxmldir}" + dir "${datadir}/maven-metadata" +-dir "${prefix}/lib/eclipse" +-dir "${prefix}/lib/eclipse/features" +-dir "${prefix}/lib/eclipse/plugins" +-dir "${prefix}/lib/eclipse/dropins" +-dir "${prefix}/lib/eclipse/droplets" ++dir "${libdir}/eclipse" ++dir "${libdir}/eclipse/features" ++dir "${libdir}/eclipse/plugins" ++dir "${libdir}/eclipse/dropins" ++dir "${libdir}/eclipse/droplets" + 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 @@ -13,17 +13,17 @@ # # Root directory where all Java VMs/SDK/JREs are installed. @@ -69,3 +110,22 @@ Index: javapackages-5.2.0+git20180620.70fa2258/macros.d/macros.javapackages-file # # 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 +@@ -50,11 +50,11 @@ + dir "%{_ivyxmldir}" \ + dir "%{_sysconfdir}/ivy" \ + dir "%{_datadir}/maven-metadata" \ +- dir "%{_prefix}/lib/eclipse" \ +- dir "%{_prefix}/lib/eclipse/features" \ +- dir "%{_prefix}/lib/eclipse/plugins" \ +- dir "%{_prefix}/lib/eclipse/dropins" \ +- dir "%{_prefix}/lib/eclipse/droplets" \ ++ dir "%{_libdir}/eclipse" \ ++ dir "%{_libdir}/eclipse/features" \ ++ dir "%{_libdir}/eclipse/plugins" \ ++ dir "%{_libdir}/eclipse/dropins" \ ++ dir "%{_libdir}/eclipse/droplets" \ + dir "%{_datadir}/eclipse" \ + dir "%{_datadir}/eclipse/dropins" \ + dir "%{_datadir}/eclipse/droplets" \