Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2020-07-17 20:44:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new.3592 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "javapackages-tools" Fri Jul 17 20:44:17 2020 rev:23 rq:821264 version:5.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2020-05-07 15:06:39.691859347 +0200 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new.3592/javapackages-tools.changes 2020-07-17 20:44:28.396515779 +0200 @@ -1,0 +2,9 @@ +Thu Jul 16 07:23:37 UTC 2020 - Fridrich Strba <[email protected]> + +- Upgrade to version 5.3.1 +- Modified patch: + * suse-use-libdir.patch + + rediff to changed context +- Define _rpmmacrodir for distributions that don't have it + +------------------------------------------------------------------- Old: ---- 5.3.0.tar.gz New: ---- 5.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javapackages-tools.spec ++++++ --- /var/tmp/diff_new_pack.BgQbWO/_old 2020-07-17 20:44:29.748517220 +0200 +++ /var/tmp/diff_new_pack.BgQbWO/_new 2020-07-17 20:44:29.752517224 +0200 @@ -16,6 +16,7 @@ # +%{!?_rpmmacrodir:%global _rpmmacrodir %{_rpmconfigdir}/macros.d} %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "extras" %bcond_without python @@ -27,7 +28,7 @@ %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 ++++++ 5.3.0.tar.gz -> 5.3.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-5.3.0/.travis.yml new/javapackages-5.3.1/.travis.yml --- old/javapackages-5.3.0/.travis.yml 2018-08-06 17:09:06.000000000 +0200 +++ new/javapackages-5.3.1/.travis.yml 2019-06-14 12:26:27.000000000 +0200 @@ -1,6 +1,5 @@ language: python python: - - 2.6 # RHEL 6 - 2.7 # RHEL 7 - 3.5 # Fedora 24-25 - 3.6 # Fedora 26+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-5.3.0/VERSION new/javapackages-5.3.1/VERSION --- old/javapackages-5.3.0/VERSION 2018-08-06 17:09:06.000000000 +0200 +++ new/javapackages-5.3.1/VERSION 2019-06-14 12:26:27.000000000 +0200 @@ -1 +1 @@ -5.3.0 +5.3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-5.3.0/java-utils/maven_depmap.py new/javapackages-5.3.1/java-utils/maven_depmap.py --- old/javapackages-5.3.0/java-utils/maven_depmap.py 2018-08-06 17:09:06.000000000 +0200 +++ new/javapackages-5.3.1/java-utils/maven_depmap.py 2019-06-14 12:26:27.000000000 +0200 @@ -85,7 +85,7 @@ def _make_files_versioned(versions, pom_path, jar_path, pom_base, jar_base): """Make pom and jar file versioned""" - versions = list(set(versions.split(','))) + versions = sorted(set(versions.split(','))) vpom_path = pom_path vjar_path = jar_path @@ -179,11 +179,11 @@ return artifact aliases = additions.split(',') - result = set() + result = list() for a in aliases: alias = MetadataAlias.from_mvn_str(a) alias.extension = artifact.extension - result.add(alias) + result.append(alias) artifact.aliases = result return artifact diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-5.3.0/javapackages-tools.spec new/javapackages-5.3.1/javapackages-tools.spec --- old/javapackages-5.3.0/javapackages-tools.spec 2018-08-06 17:09:06.000000000 +0200 +++ new/javapackages-5.3.1/javapackages-tools.spec 2019-06-14 12:26:27.000000000 +0200 @@ -138,7 +138,7 @@ # Java build systems don't have hard requirement on java-devel, so it should be there Requires: java-1.8.0-openjdk-devel Requires: %{?scl_prefix}%{python_prefix}-javapackages = %{version}-%{release} -Requires: %{python_prefix} +Requires: %{python_interpreter} %description -n %{?scl_prefix}javapackages-local This package provides non-essential macros and scripts to support Java packaging. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-5.3.0/macros.d/macros.javapackages-filesystem new/javapackages-5.3.1/macros.d/macros.javapackages-filesystem --- old/javapackages-5.3.0/macros.d/macros.javapackages-filesystem 2018-08-06 17:09:06.000000000 +0200 +++ new/javapackages-5.3.1/macros.d/macros.javapackages-filesystem 2019-06-14 12:26:27.000000000 +0200 @@ -38,17 +38,17 @@ # # Root directory for all common architecture dependent parts of Java VM/SDK/JRE's # -%_jvmcommonlibdir %{_prefix}/lib/jvm-commmon +%_jvmcommonlibdir %{_prefix}/lib/jvm-common # # Root directory for all common architecture independent parts of Java VM/SDK/JRE's # -%_jvmcommondatadir %{_datadir}/jvm-commmon +%_jvmcommondatadir %{_datadir}/jvm-common # # Root directory for all common configurations parts of Java VM/SDK/JRE's # -%_jvmcommonsysconfdir %{_sysconfdir}/jvm-commmon +%_jvmcommonsysconfdir %{_sysconfdir}/jvm-common # # Directory containing Java configuration file (java.conf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-5.3.0/man/mvn_build.txt new/javapackages-5.3.1/man/mvn_build.txt --- old/javapackages-5.3.0/man/mvn_build.txt 2018-08-06 17:09:06.000000000 +0200 +++ new/javapackages-5.3.1/man/mvn_build.txt 2019-06-14 12:26:27.000000000 +0200 @@ -73,6 +73,12 @@ behavior is mostly useful when bootstrapping new packages, which dependecies have not yet been packaged. +*_without_tests*:: + Defining this macro to any value is equivalent to *-f* option. + +*_without_javadoc*:: + Defining this macro to any value is equivalent to *-j* option. + AUTHOR ------ Originally written by Mikolaj Izdebski. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/javapackages-5.3.0/test/test_rpmbuild.py new/javapackages-5.3.1/test/test_rpmbuild.py --- old/javapackages-5.3.0/test/test_rpmbuild.py 2018-08-06 17:09:06.000000000 +0200 +++ new/javapackages-5.3.1/test/test_rpmbuild.py 2019-06-14 12:26:27.000000000 +0200 @@ -21,6 +21,7 @@ """ def __init__(self, name): self.__name = name + self.__macros = [u'%topdir {cwd}/rpmbuild'.format(cwd=os.getcwd())] self.__sources = [] self.__begin = '' self.__prep = '' @@ -83,9 +84,8 @@ def __invoke_rpmbuild(self, args): outfile = open("tmpout", 'w') errfile = open("tmperr", 'w') - topdir = '--define=_topdir {cwd}/rpmbuild'.format(cwd=os.getcwd()) - scl_undef = '--eval=%undefine scl' - proc = subprocess.Popen(['rpmbuild', topdir, scl_undef, + proc = subprocess.Popen(['rpmbuild', + '--macros', '/usr/lib/rpm/macros:rpmmacros', os.path.join('rpmbuild', 'SPECS', self.__name + '.spec')] + args, shell=False, env=self.__env, @@ -113,7 +113,7 @@ os.mkdir('rpmbuild/BUILDROOT') except OSError: pass - _prepare_macros() + self.__prepare_macros() self.__prepare_spec() self.__prepare_sources() @@ -177,21 +177,23 @@ shutil.copy(sourcepath, '{0}{1}'.format(target, index)) -def _prepare_macros(): - macropath = os.path.join(DIRPATH, '..', 'macros.d') - java_utils = os.path.abspath(os.path.join(DIRPATH, '..', 'java-utils')) - - with io.open('.rpmmacros', 'wt', encoding='utf-8') as rpmmacros: - for filepath in os.listdir(macropath): - if filepath.startswith('macros'): - with io.open(os.path.join(macropath, filepath), encoding='utf-8') as macrofile: - for line in macrofile.readlines(): - if '/usr/share/java-utils' in line: - line = re.sub(r'/usr/share/java-utils', - java_utils, line) - if '@{javadir}-utils' in line: - line = re.sub(r'@\{javadir\}-utils', - java_utils, line) - if '@{pyinterpreter}' in line: - line = re.sub(r'@\{pyinterpreter\}', sys.executable, line) - rpmmacros.write(line) + def __prepare_macros(self): + macropath = os.path.join(DIRPATH, '..', 'macros.d') + java_utils = os.path.abspath(os.path.join(DIRPATH, '..', 'java-utils')) + + with io.open('rpmmacros', 'wt', encoding='utf-8') as rpmmacros: + for filepath in os.listdir(macropath): + if filepath.startswith('macros'): + with io.open(os.path.join(macropath, filepath), encoding='utf-8') as macrofile: + for line in macrofile.readlines(): + if '/usr/share/java-utils' in line: + line = re.sub(r'/usr/share/java-utils', + java_utils, line) + if '@{javadir}-utils' in line: + line = re.sub(r'@\{javadir\}-utils', + java_utils, line) + if '@{pyinterpreter}' in line: + line = re.sub(r'@\{pyinterpreter\}', sys.executable, line) + rpmmacros.write(line) + for line in self.__macros: + rpmmacros.write(line + '\n') ++++++ suse-use-libdir.patch ++++++ --- /var/tmp/diff_new_pack.BgQbWO/_old 2020-07-17 20:44:30.076517569 +0200 +++ /var/tmp/diff_new_pack.BgQbWO/_new 2020-07-17 20:44:30.076517569 +0200 @@ -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" \
