- 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 suse-macros-install-location.patch * We switch to /usr/lib/ location for macros - Refresh patch suse-use-libdir.patch OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=33
2017-05-18 19:51:04 +00:00
parent fd3321620d
commit fe76c21721
7 changed files with 52 additions and 68 deletions
--- a/14
+++ b/14
@@ -0,0 +1,14 @@
+<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>
--- a/javapackages-4.7.0+git20170331.ef4057e7.tar.xz
+++ b/javapackages-4.7.0+git20170331.ef4057e7.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:65fb48922717262330b2038977e1fa0b0379d8d9038b8f9c9941e6546e515424
+size 116300
--- a/javapackages-4.7.0.tar.xz
+++ b/javapackages-4.7.0.tar.xz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4444b7301a61b8b2f049809364db57b15c4ad7e11e890487527167228e37db2
-size 184964
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -1,13 +1,23 @@
 -------------------------------------------------------------------
-Thu May 18 19:28:28 UTC 2017 - tchvatal@suse.com
+Thu May 18 19:40:26 UTC 2017 - tchvatal@suse.com

- Version update to 4.7.0:
-  * Switch to python3
-  * All binaries in python now
-  * More tests
+- 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
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -17,22 +17,18 @@


 Name:           javapackages-tools
-Version:        4.7.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://github.com/mizdebsk/javapackages
-# Impossible tags, downloaded from Fedora package
+# 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
 BuildRequires:  asciidoc
-BuildRequires:  dia
 BuildRequires:  fdupes
 BuildRequires:  python3-lxml
 BuildRequires:  python3-nose
@@ -41,6 +37,7 @@ BuildRequires:  python3-six
 BuildRequires:  rpm
 BuildRequires:  xmlto
 BuildRequires:  xz
+Obsoletes:      %{name}-doc
 # Even tho python is split it is required for most of the operations.
 # All the binaries used for most builds are in python now.
 # Only if package does not contain anything except macro usage it is not needed
@@ -90,13 +87,6 @@ Obsoletes:      python-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
@@ -107,12 +97,10 @@ This package provides non-essential macros and scripts to support Java packaging

 %prep
 %setup -q -n javapackages-%{version}
-%patch0 -p1
-%patch1 -p1
+%autopatch -p1

 %build
 %configure \
-    --rpmconfigdir=%{_sysconfdir}/rpm/ \
    --pyinterpreter=python3
 ./build

@@ -155,8 +143,4 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
 %doc LICENSE
 %{python3_sitelib}/javapackages*

-%files doc -f files-doc
-%defattr(-,root,root,-)
-%doc LICENSE
-
 %changelog
--- a/suse-macros-install-location.patch
+++ b/suse-macros-install-location.patch
@@ -1,15 +0,0 @@
-Index: javapackages-4.6.0/install
-===================================================================
--- javapackages-4.6.0.orig/install
-+++ javapackages-4.6.0/install
-@@ -127,8 +127,8 @@ inst_data java-utils/maven_depmap.py "${
- inst_data java-utils/pom_editor.py "${javadir}-utils"
- inst_data java-utils/request-artifact.py "${javadir}-utils"
- 
-inst_data target/macros.jpackage "${rpmconfigdir}/macros.d"
-inst_data target/macros.fjava "${rpmconfigdir}/macros.d"
-+inst_data target/macros.jpackage "${rpmconfigdir}"
-+inst_data target/macros.fjava "${rpmconfigdir}"
- 
- inst_data target/build-classpath.1 "${mandir}/man1"
- inst_data target/build-jar-repository.1 "${mandir}/man1"
--- a/suse-use-libdir.patch
+++ b/suse-use-libdir.patch
@@ -6,11 +6,11 @@ Subject: [PATCH] SUSE does store jvm related things in libdir
 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 @@ index da2fd40..54935ce 100755
 
 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,28 +26,22 @@ index da2fd40..54935ce 100755
 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.
 #
 -%_jvmdir        %{_prefix}/lib/jvm
 +%_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
-+%_jvmprivdir    %{_libdir}/jvm-private
+%_jvmprivdir    %{_lbidir}/jvm-private
 
 #
 # Root directory for all architecture dependent parts of Java VM/SDK/JRE's
@@ -57,7 +51,7 @@ index 62d2dc1..75a5ba3 100644
 
 #
 # 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 @@ index 62d2dc1..75a5ba3 100644
 
 #
 # 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
-