rpm/javapackages-tools
SHA256
1
0
Fork 0
forked from pool/javapackages-tools
Code Pull Requests Activity
2efe7541dc
javapackages-tools/python-optional.patch

36 lines
1.7 KiB
Diff
Raw Normal View History

- Split to python and non-python edition for smaller depgraph - Add patch python-optional.patch - Split to python and non-python edition for smaller depgraph - Add patch python-optional.patch - 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 - 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/84211c0ee761e93ee507f5d37e9fc80ec377e89d OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=35
2017-05-18 22:41:28 +02:00
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"
Copy Permalink