Hello community, here is the log from the commit of package javapackages-tools for openSUSE:Factory checked in at 2017-05-31 13:32:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/javapackages-tools (Old) and /work/SRC/openSUSE:Factory/.javapackages-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "javapackages-tools" Wed May 31 13:32:25 2017 rev:14 rq:497990 version:4.7.0+git20170331.ef4057e7 Changes: -------- New Changes file: --- /dev/null 2017-03-01 00:40:19.279048016 +0100 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools-extras.changes 2017-05-31 13:32:26.337553435 +0200 @@ -0,0 +1,182 @@ +------------------------------------------------------------------- +Wed May 24 13:39:01 UTC 2017 - tchvatal@suse.com + +- Fix typo in suse-use-libdir.patch + +------------------------------------------------------------------- +Fri May 19 10:26:41 UTC 2017 - tchvatal@suse.com + +- Fix url to correct one https://github.com/fedora-java/javapackages + +------------------------------------------------------------------- +Thu May 18 20:11:39 UTC 2017 - tchvatal@suse.com + +- Split to python and non-python edition for smaller depgraph +- Add patch python-optional.patch +- Fix abs2rel shebang: + * fix-abs2rel.patch +- Fix Requires on subpackages to point to javapackages-tools proper + +------------------------------------------------------------------- +Thu May 18 19:40:26 UTC 2017 - tchvatal@suse.com + +- Update to version 4.7.0+git20170331.ef4057e7: + * Reimplement abs2rel in Python + * Don't expand {scl} in macro definitions + * Install expanded rpmfc attr files + * [spec] Avoid file conflicts between in SCL + * Fix macros.d directory ownership + * Make %ant macro enable SCL when needed + * [spec] Fix file conflicts between SCL and non-SCL packages + * Fix ownership of ivyxmldir + * [test] Force locale for python processes + * Don't include timestamp in generated pom.properties +- Remove patch merged by upstream: + * create_valid_xml_comments.patch +- Remove patch suse-macros-install-location.patch + * We switch to /usr/lib/ location for macros +- Try to reduce some dependencies bsc#1036025 +- Refresh patch suse-use-libdir.patch + +------------------------------------------------------------------- +Fri Feb 12 15:21:42 UTC 2016 - toddrme2178@gmail.com + +- Add create_valid_xml_comments.patch + python-lxml 3.5.0 introduces validation for xml comments, and + one of the comments created in this package were not valid. + This patch fixes the problem. It backported from upstream and + should be in the next release. + https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9f... + +------------------------------------------------------------------- +Mon Feb 8 20:23:42 UTC 2016 - tchvatal@suse.com + +- Version update to 4.6.0: + * various bugfixes for maven tooling + * introduction to gradle-local package for gradle packaging + +------------------------------------------------------------------- +Wed Apr 1 08:40:57 UTC 2015 - tchvatal@suse.com + +- Drop dependency over source-highlight as it causes build cycle + +------------------------------------------------------------------- +Tue Mar 31 10:28:12 UTC 2015 - tchvatal@suse.com + +- Try to break buildcycle detected on Factory + +------------------------------------------------------------------- +Wed Mar 18 10:44:29 UTC 2015 - tchvatal@suse.com + +- Fix build on SLE11 + +------------------------------------------------------------------- +Tue Mar 17 14:39:51 UTC 2015 - tchvatal@suse.com + +- Use python-devel instead of pkgconfig to build on sle11 + +------------------------------------------------------------------- +Tue Mar 17 14:02:21 UTC 2015 - tchvatal@suse.com + +- Add python-javapackages as requirement for main package + +------------------------------------------------------------------- +Tue Mar 17 13:35:17 UTC 2015 - tchvatal@suse.com + +- Update requires on python packages to properly have all the needed + dependencies on runtime + +------------------------------------------------------------------- +Tue Mar 17 09:34:37 UTC 2015 - tchvatal@suse.com + +- Install macros to /etc/rpm as we do in SUSE: + * suse-macros-install-location.patch +- Cleanup with spec-cleaner + +------------------------------------------------------------------- +Fri Jan 23 20:59:04 UTC 2015 - mailaender@opensuse.org + +- Drop patches + * depgen.patch + * javapackages-2.0.1-fix-bashisms.patch + * javapackages-2.0.1-java9.patch + * maven_depmap-no-attribute-exit.patch +- Remove hacky workarounds +- Fix rpmlint errors +- Enable maven-local +- Avoid unsatisfiable dependencies +- Enable unit tests +- Update to version 4.4.0 + +------------------------------------------------------------------- +Mon Dec 8 13:02:05 UTC 2014 - fstrba@suse.com + +- Added patch: + * javapackages-2.0.1-java9.patch: create directories for java, + so that ant build works +- Add virtual provide jpackage-utils-java9 to be able to + distinguish the presence of java9 compatibility + +------------------------------------------------------------------- +Thu Oct 16 11:12:00 UTC 2014 - Led <ledest@gmail.com> + +- fix bashisms +- Added patches: + * javapackages-2.0.1-fix-bashisms.patch + +------------------------------------------------------------------- +Mon Mar 10 13:52:26 UTC 2014 - darin@darins.net + +- maven_depmap-no-attribute-exit.patch: SLES patch for ZipFile + having no attribute '__exit__' which was causing ecj build + failures + +------------------------------------------------------------------- +Thu Mar 6 13:54:16 UTC 2014 - darin@darins.net + +- set correct libxslt package when building for SLES + +------------------------------------------------------------------- +Fri Nov 8 17:06:25 UTC 2013 - aj@ajaissle.de + +- BuildRequires xz +- Remove '/etc/java' and '/usr/share/java' from file list (both owned by system) +- Url changed + +------------------------------------------------------------------- +Wed Sep 11 15:50:05 UTC 2013 - schwab@suse.de + +- depgen.patch: drain stdin in dependency generator + +------------------------------------------------------------------- +Wed Aug 21 07:56:17 UTC 2013 - mvyskocil@suse.com + +- update to 2.0.1 + * Fix creation of artifact aliases, resolves: rhbz#988462 +- Update to upstream version 2.0.0 + * Merge functionality of jpackage-utils + * Provide and obsolete jpackage-utils + * %%add_maven_depmap macro now injects pom.properties to every JAR + * %%add_to_maven_depmap and %%update_maven_depmap macros were removed + * maven2jpp-mapdeps.xsl template has been removed + * Macros related to installation of icons and desktop files were removed + * 14 new manual pages were added + * Documentation specific to JPackage was removed + * Add BuildRequires: asciidoc, xmlto + * Add lua to Requires + * Add python-xml to Requires for xml.dom.minidom + +------------------------------------------------------------------- +Fri Jul 12 09:35:17 UTC 2013 - mvyskocil@suse.com + +- make maven-local package build optional to not add unsatisfied + dependencies to Factory + +------------------------------------------------------------------- +Tue Jul 2 14:06:39 UTC 2013 - mvyskocil@suse.com + +- Create javapackages-tools 0.15.0 from fc20 + * Added depmap for tools.jar + * Added support for versioned autorequires + * New plugin metadata from Maven Central + * move to independent package from jpackage-utils --- /work/SRC/openSUSE:Factory/javapackages-tools/javapackages-tools.changes 2016-02-17 12:13:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.javapackages-tools.new/javapackages-tools.changes 2017-05-31 13:32:26.369548925 +0200 @@ -1,0 +2,40 @@ +Wed May 24 13:39:01 UTC 2017 - tchvatal@suse.com + +- Fix typo in suse-use-libdir.patch + +------------------------------------------------------------------- +Fri May 19 10:26:41 UTC 2017 - tchvatal@suse.com + +- Fix url to correct one https://github.com/fedora-java/javapackages + +------------------------------------------------------------------- +Thu May 18 20:11:39 UTC 2017 - tchvatal@suse.com + +- Split to python and non-python edition for smaller depgraph +- Add patch python-optional.patch +- Fix abs2rel shebang: + * fix-abs2rel.patch +- Fix Requires on subpackages to point to javapackages-tools proper + +------------------------------------------------------------------- +Thu May 18 19:40:26 UTC 2017 - tchvatal@suse.com + +- Update to version 4.7.0+git20170331.ef4057e7: + * Reimplement abs2rel in Python + * Don't expand {scl} in macro definitions + * Install expanded rpmfc attr files + * [spec] Avoid file conflicts between in SCL + * Fix macros.d directory ownership + * Make %ant macro enable SCL when needed + * [spec] Fix file conflicts between SCL and non-SCL packages + * Fix ownership of ivyxmldir + * [test] Force locale for python processes + * Don't include timestamp in generated pom.properties +- Remove patch merged by upstream: + * create_valid_xml_comments.patch +- Remove patch suse-macros-install-location.patch + * We switch to /usr/lib/ location for macros +- Try to reduce some dependencies bsc#1036025 +- Refresh patch suse-use-libdir.patch + +------------------------------------------------------------------- Old: ---- create_valid_xml_comments.patch javapackages-4.6.0.tar.xz suse-macros-install-location.patch New: ---- _service fix-abs2rel.patch javapackages-4.7.0+git20170331.ef4057e7.tar.xz javapackages-tools-extras.changes javapackages-tools-extras.spec pre_checkin.sh python-optional.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ javapackages-tools-extras.spec ++++++ # # spec file for package javapackages-tools-extras # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %bcond_without python Name: javapackages-tools-extras Version: 4.7.0+git20170331.ef4057e7 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause Group: Development/Languages/Java Url: https://github.com/fedora-java/javapackages # Latest tag is missing, quite often needs patches, use service Source: javapackages-%{version}.tar.xz #PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits # where Fedora use jpackage convention - usr/lib everywhere Patch0: suse-use-libdir.patch #PATCH-FIX-SUSE: allow building without python to reduce depgraph Patch1: python-optional.patch #PATCH-FIX-UPSTREAM: use proper expansion for shebang Patch2: fix-abs2rel.patch BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: rpm BuildRequires: xmlto BuildRequires: xz # Used on too many places Provides: jpackage-utils = %{version} Obsoletes: %{name}-doc Obsoletes: jpackage-utils < %{version} %if %{with python} BuildRequires: python3-lxml BuildRequires: python3-nose BuildRequires: python3-setuptools BuildRequires: python3-six %endif %description This package provides macros and scripts to support Java packaging. %if %{with python} %package -n maven-local Summary: Macros and scripts for Maven packaging support Group: Development/Languages/Java Requires: javapackages-local = %{version} Requires: javapackages-tools = %{version} %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. %package -n gradle-local Summary: Local mode for Gradle Group: Development/Languages/Java Requires: javapackages-local = %{version} Requires: javapackages-tools = %{version} %description -n gradle-local This package implements local mode for Gradle, which allows artifact resolution using XMvn resolver. %package -n ivy-local Summary: Local mode for Apache Ivy Group: Development/Languages/Java Requires: ant Requires: javapackages-local = %{version} Requires: javapackages-tools = %{version} %description -n ivy-local This package implements local mode fow Apache Ivy, which allows artifact resolution using XMvn resolver. %package -n python3-javapackages Summary: Module for handling various files for Java packaging Group: Development/Languages/Java Requires: python3-lxml Requires: python3-six Obsoletes: python-javapackages %description -n python3-javapackages Module for handling, querying and manipulating of various files for Java packaging in Linux distributions %package -n javapackages-local Summary: Non-essential macros and scripts for Java packaging support Group: Development/Languages/Java Requires: javapackages-tools = %{version} Requires: python3-javapackages = %{version} %description -n javapackages-local This package provides non-essential macros and scripts to support Java packaging. %endif %prep %setup -q -n javapackages-%{version} %autopatch -p1 %build %configure \ %if %{with python} --pyinterpreter=/usr/bin/python3 %else --pyinterpreter=%{nil} %endif ./build %if %{with python} pushd python python3 setup.py build popd %endif %install ./install sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* %if %{with python} pushd python python3 setup.py install --root %{buildroot} popd # kill all the common files files=" %{_bindir}/build-classpath %{_bindir}/build-classpath-directory %{_bindir}/build-jar-repository %{_bindir}/check-binary-files %{_bindir}/clean-binary-files %{_bindir}/create-jar-links %{_bindir}/diff-jars %{_bindir}/find-jar %{_bindir}/rebuild-jar-repository %{_bindir}/shade-jar %{_sysconfdir}/java/font.properties %{_sysconfdir}/java/java.conf %{_datadir}/java-utils/java-functions %{_datadir}/java-utils/java-wrapper %{_datadir}/java-utils/scl-enable %{_prefix}/lib/rpm/macros.d/macros.jpackage %{_mandir}/man1/build-classpath.1 %{_mandir}/man1/build-jar-repository.1 %{_mandir}/man1/diff-jars.1 %{_mandir}/man1/rebuild-jar-repository.1 %{_mandir}/man1/shade-jar.1 %{_mandir}/man1/find-jar.1 %{_datadir}/maven-metadata/javapackages-metadata.xml %{_datadir}/xmvn/configuration.xml " for i in $files; do rm -rf %{buildroot}/$i done %endif rm -rf %{buildroot}%{_datadir}/fedora-review/ %fdupes %{buildroot}/%{_prefix} %check ./check %if !%{with python} %files -f files-common %defattr(-,root,root,-) %doc LICENSE %else %files -n javapackages-local -f files-local %defattr(-,root,root,-) %dir %{_datadir}/java-utils %files -n maven-local -f files-maven %defattr(-,root,root,-) %files -n gradle-local -f files-gradle %defattr(-,root,root) %dir %{_datadir}/gradle-local %files -n ivy-local -f files-ivy %defattr(-,root,root,-) %dir %{_sysconfdir}/ant.d %files -n python3-javapackages %defattr(-,root,root,-) %doc LICENSE %{python3_sitelib}/javapackages* %endif %changelog ++++++ javapackages-tools.spec ++++++ --- /var/tmp/diff_new_pack.PjX0TP/_old 2017-05-31 13:32:27.237426592 +0200 +++ /var/tmp/diff_new_pack.PjX0TP/_new 2017-05-31 13:32:27.241426028 +0200 @@ -1,7 +1,7 @@ # # spec file for package javapackages-tools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,65 +16,48 @@ # +%bcond_with python Name: javapackages-tools -Version: 4.6.0 +Version: 4.7.0+git20170331.ef4057e7 Release: 0 Summary: Macros and scripts for Java packaging support License: BSD-3-Clause Group: Development/Languages/Java -Url: https://fedorahosted.org/released/javapackages/doc/ -Source: https://fedorahosted.org/released/javapackages/javapackages-%{version}.tar.xz +Url: https://github.com/fedora-java/javapackages +# Latest tag is missing, quite often needs patches, use service +Source: javapackages-%{version}.tar.xz #PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits # where Fedora use jpackage convention - usr/lib everywhere Patch0: suse-use-libdir.patch -#PATCH-FIX-SUSE: We put macros to /etc/rpm directly so make it reflected by -# the install script -Patch1: suse-macros-install-location.patch -#PATCH-FIX-Upstream: create_valid_xml_comments.patch -- make comments that pass python-lxml validation - https://github.com/mizdebsk/javapackages/commit/84211c0ee761e93ee507f5d37e9f... -Patch2: create_valid_xml_comments.patch +#PATCH-FIX-SUSE: allow building without python to reduce depgraph +Patch1: python-optional.patch +#PATCH-FIX-UPSTREAM: use proper expansion for shebang +Patch2: fix-abs2rel.patch BuildRequires: asciidoc -BuildRequires: dia BuildRequires: fdupes -BuildRequires: python-devel -BuildRequires: python-lxml -BuildRequires: python-nose -BuildRequires: python-pyxb -BuildRequires: python-setuptools -BuildRequires: python-six BuildRequires: rpm BuildRequires: xmlto BuildRequires: xz -Requires: coreutils -Requires: lua -Requires: python -# Well even tho python is split it is required for most of the operations -Requires: python-javapackages = %{version} -# for the xb pom conversions -Requires: python-pyxb -Requires: python-six -# for xml.dom.minidom -Requires: python-xml +# Used on too many places Provides: jpackage-utils = %{version} -Provides: jpackage-utils-java9 = %{version} -Obsoletes: jpackage-utils <= 1.7.5 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -# for xsltproc -%if 0%{?suse_version} == 1110 -# disable pbc on sle11 as there is clash in directories we don't care about -BuildRequires: -post-build-checks -Requires: libxslt -%else -Requires: libxslt-tools +Obsoletes: %{name}-doc +Obsoletes: jpackage-utils < %{version} +%if %{with python} +BuildRequires: python3-lxml +BuildRequires: python3-nose +BuildRequires: python3-setuptools +BuildRequires: python3-six %endif %description This package provides macros and scripts to support Java packaging. +%if %{with python} %package -n maven-local Summary: Macros and scripts for Maven packaging support Group: Development/Languages/Java -Requires: %{name} = %{version} Requires: javapackages-local = %{version} +Requires: javapackages-tools = %{version} %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. @@ -82,8 +65,8 @@ %package -n gradle-local Summary: Local mode for Gradle Group: Development/Languages/Java -Requires: %{name} = %{version} Requires: javapackages-local = %{version} +Requires: javapackages-tools = %{version} %description -n gradle-local This package implements local mode for Gradle, which allows artifact @@ -92,67 +75,108 @@ %package -n ivy-local Summary: Local mode for Apache Ivy Group: Development/Languages/Java -Requires: %{name} = %{version} Requires: ant Requires: javapackages-local = %{version} +Requires: javapackages-tools = %{version} %description -n ivy-local This package implements local mode fow Apache Ivy, which allows artifact resolution using XMvn resolver. -%package -n python-javapackages +%package -n python3-javapackages Summary: Module for handling various files for Java packaging Group: Development/Languages/Java -Requires: python-lxml +Requires: python3-lxml +Requires: python3-six +Obsoletes: python-javapackages -%description -n python-javapackages +%description -n python3-javapackages Module for handling, querying and manipulating of various files for Java packaging in Linux distributions -%package doc -Summary: Guide for Java packaging -Group: Development/Languages/Java - -%description doc -User guide for Java packaging and using utilities from javapackages-tools - %package -n javapackages-local Summary: Non-essential macros and scripts for Java packaging support Group: Development/Languages/Java -Requires: %{name} = %{version} +Requires: javapackages-tools = %{version} +Requires: python3-javapackages = %{version} %description -n javapackages-local This package provides non-essential macros and scripts to support Java packaging. +%endif %prep %setup -q -n javapackages-%{version} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%autopatch -p1 %build -%configure --rpmconfigdir=%{_sysconfdir}/rpm/ +%configure \ +%if %{with python} + --pyinterpreter=/usr/bin/python3 +%else + --pyinterpreter=%{nil} +%endif ./build +%if %{with python} +pushd python +python3 setup.py build +popd +%endif %install ./install sed -e 's/.[17]$/&.gz/' -e 's/.py$/&*/' -i files-* +%if %{with python} +pushd python +python3 setup.py install --root %{buildroot} +popd +# kill all the common files +files=" +%{_bindir}/build-classpath +%{_bindir}/build-classpath-directory +%{_bindir}/build-jar-repository +%{_bindir}/check-binary-files +%{_bindir}/clean-binary-files +%{_bindir}/create-jar-links +%{_bindir}/diff-jars +%{_bindir}/find-jar +%{_bindir}/rebuild-jar-repository +%{_bindir}/shade-jar +%{_sysconfdir}/java/font.properties +%{_sysconfdir}/java/java.conf +%{_datadir}/java-utils/java-functions +%{_datadir}/java-utils/java-wrapper +%{_datadir}/java-utils/scl-enable +%{_prefix}/lib/rpm/macros.d/macros.jpackage +%{_mandir}/man1/build-classpath.1 +%{_mandir}/man1/build-jar-repository.1 +%{_mandir}/man1/diff-jars.1 +%{_mandir}/man1/rebuild-jar-repository.1 +%{_mandir}/man1/shade-jar.1 +%{_mandir}/man1/find-jar.1 +%{_datadir}/maven-metadata/javapackages-metadata.xml +%{_datadir}/xmvn/configuration.xml +" +for i in $files; do + rm -rf %{buildroot}/$i +done +%endif + rm -rf %{buildroot}%{_datadir}/fedora-review/ %fdupes %{buildroot}/%{_prefix} %check -%if 0%{?suse_version} >= 1210 ./check -%endif +%if !%{with python} %files -f files-common %defattr(-,root,root,-) %doc LICENSE - +%else %files -n javapackages-local -f files-local %defattr(-,root,root,-) +%dir %{_datadir}/java-utils %files -n maven-local -f files-maven %defattr(-,root,root,-) @@ -165,13 +189,10 @@ %defattr(-,root,root,-) %dir %{_sysconfdir}/ant.d -%files -n python-javapackages -%defattr(-,root,root,-) -%doc LICENSE -%{python_sitelib}/javapackages* - -%files doc -f files-doc +%files -n python3-javapackages %defattr(-,root,root,-) %doc LICENSE +%{python3_sitelib}/javapackages* +%endif %changelog ++++++ _service ++++++ <services> <service mode="disabled" name="tar_scm"> <param name="url">https://github.com/fedora-java/javapackages.git</param> <param name="scm">git</param> <param name="changesgenerate">enable</param> <param name="filename">javapackages</param> <param name="versionformat">4.7.0+git%cd.%h</param> </service> <service mode="disabled" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="disabled" name="set_version"/> </services> ++++++ fix-abs2rel.patch ++++++ Index: javapackages-4.7.0+git20170331.ef4057e7/bin/abs2rel =================================================================== --- javapackages-4.7.0+git20170331.ef4057e7.orig/bin/abs2rel +++ javapackages-4.7.0+git20170331.ef4057e7/bin/abs2rel @@ -1,4 +1,4 @@ -#!%{pyinterpreter} +#!@{pyinterpreter} # Copyright (c) 2017, Red Hat, Inc. # # All rights reserved. ++++++ pre_checkin.sh ++++++ #!/usr/bin/env bash master="javapackages-tools.spec" slave="javapackages-tools-extras.spec" cp $master $slave sed -i \ -e 's:%bcond_with python:%bcond_without python:' \ -e 's/Name: javapackages-tools/Name: javapackages-tools-extras/' \ $slave # changelogs cp javapackages-tools.changes javapackages-tools-extras.changes ++++++ python-optional.patch ++++++ Index: javapackages-4.7.0+git20170331.ef4057e7/build =================================================================== --- javapackages-4.7.0+git20170331.ef4057e7.orig/build +++ javapackages-4.7.0+git20170331.ef4057e7/build @@ -141,5 +141,3 @@ manpage build-classpath manpage build-jar-repository manpage rebuild-jar-repository manpage shade-jar - -(cd ./python && "${pyinterpreter}" setup.py build) Index: javapackages-4.7.0+git20170331.ef4057e7/configure =================================================================== --- javapackages-4.7.0+git20170331.ef4057e7.orig/configure +++ javapackages-4.7.0+git20170331.ef4057e7/configure @@ -83,7 +83,6 @@ test -z "${libdir}" && rpmconfigdir="${p test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" test -z "${m2home}" && m2home="${datadir}/xmvn" -test -z "${pyinterpreter}" && pyinterpreter=$(which python) test -z "${abrtlibdir}" && abrtlibdir="${prefix}/lib/abrt-java-connector" eval $(sed -n 's/^%_\('"$vars_re"'\)\ *\(.*\)$/\1="\2"/;T;s/%{_\(.*}\)/${\1/;p' macros.d/macros.jpackage) Index: javapackages-4.7.0+git20170331.ef4057e7/install =================================================================== --- javapackages-4.7.0+git20170331.ef4057e7.orig/install +++ javapackages-4.7.0+git20170331.ef4057e7/install @@ -207,8 +207,3 @@ exec >files-gradle inst_exec target/gradle-local "${bindir}" inst_data gradle/init.gradle "${datadir}/gradle-local" inst_data target/gradle_build.7 "${mandir}/man7" - -exec >files-python -(cd ./python && "${pyinterpreter}" setup.py install -O1 --skip-build --prefix "${prefix}" --root "${DEST}") >&2 -echo "${prefix}/lib/python?.?/site-packages/javapackages" -echo "${prefix}/lib/python?.?/site-packages/javapackages-*.egg-info" ++++++ suse-use-libdir.patch ++++++ --- /var/tmp/diff_new_pack.PjX0TP/_old 2017-05-31 13:32:27.345411371 +0200 +++ /var/tmp/diff_new_pack.PjX0TP/_new 2017-05-31 13:32:27.345411371 +0200 @@ -6,11 +6,11 @@ macros.d/macros.jpackage | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) -diff --git a/configure b/configure -index da2fd40..54935ce 100755 ---- a/configure -+++ b/configure -@@ -41,6 +41,7 @@ prefix +Index: javapackages-4.7.0+git20170331.ef4057e7/configure +=================================================================== +--- javapackages-4.7.0+git20170331.ef4057e7.orig/configure ++++ javapackages-4.7.0+git20170331.ef4057e7/configure +@@ -45,6 +45,7 @@ prefix rundir sysconfdir rpmconfigdir @@ -18,7 +18,7 @@ m2home -@@ -76,6 +77,7 @@ test -z "${localstatedir}" && localstatedir="${prefix}/var" +@@ -78,6 +79,7 @@ test -z "${localstatedir}" && localstate test -z "${mandir}" && mandir="${datadir}/man" test -z "${rundir}" && rundir="${localstatedir}/run" test -z "${sysconfdir}" && sysconfdir="${prefix}/etc" @@ -26,11 +26,11 @@ test -z "${rpmconfigdir}" && rpmconfigdir="${prefix}/lib/rpm" test -z "${m2home}" && m2home="${datadir}/xmvn" -diff --git a/macros.d/macros.jpackage b/macros.d/macros.jpackage -index 62d2dc1..75a5ba3 100644 ---- a/macros.d/macros.jpackage -+++ b/macros.d/macros.jpackage -@@ -13,22 +13,22 @@ +Index: javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.jpackage +=================================================================== +--- javapackages-4.7.0+git20170331.ef4057e7.orig/macros.d/macros.jpackage ++++ javapackages-4.7.0+git20170331.ef4057e7/macros.d/macros.jpackage +@@ -13,17 +13,17 @@ # # Root directory where all Java VMs/SDK/JREs are installed. # @@ -38,12 +38,6 @@ +%_jvmdir %{_libdir}/jvm # - # Root directory where all Java VMs/SDK/JREs expose their jars - # --%_jvmjardir %{_prefix}/lib/jvm-exports -+%_jvmjardir %{_libdir}/jvm-exports - - # # Root directory for all Java VM/SDK/JRE's private things. # -%_jvmprivdir %{_prefix}/lib/jvm-private @@ -57,7 +51,7 @@ # # Root directory for all architecture independent parts of Java VM/SDK/JRE's -@@ -43,7 +43,7 @@ +@@ -38,7 +38,7 @@ # # Root directory for all common architecture dependent parts of Java VM/SDK/JRE's # @@ -66,15 +60,12 @@ # # Root directory for all common architecture independent parts of Java VM/SDK/JRE's -@@ -86,7 +86,7 @@ - # - jars for Java standard x.y.z (usually symlinks to %{_jnidir}-ext) - # To simplify things only %{_jnidir} is defined. +@@ -64,7 +64,7 @@ + # + # Directory where arch-specific (JNI) version-independent jars are installed. # -%_jnidir %{_prefix}/lib/java +%_jnidir %{_libdir}/java # # Root directory where all javadoc is installed. Also already in RH macros. --- -2.1.4 -