commit hawtjni-runtime for openSUSE:Factory

28 Nov 2019

Hello community,

here is the log from the commit of package hawtjni-runtime for openSUSE:Factory checked in at 2019-11-28 13:50:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/hawtjni-runtime (Old)
 and      /work/SRC/openSUSE:Factory/.hawtjni-runtime.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "hawtjni-runtime"

Thu Nov 28 13:50:23 2019 rev:6 rq:751506 version:1.17

Changes:
--------

--- /work/SRC/openSUSE:Factory/hawtjni-runtime/hawtjni-maven-plugin.changes	2019-11-26 16:59:15.796109778 +0100
+++ /work/SRC/openSUSE:Factory/.hawtjni-runtime.new.26869/hawtjni-maven-plugin.changes	2019-11-28 13:50:25.434705024 +0100
@@ -1,0 +2,7 @@
+Mon Nov 25 11:37:24 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 1.17
+- Add dependency on mvn(org.apache.maven:maven-compat) that is
+  missing
+
+-------------------------------------------------------------------
--- /work/SRC/openSUSE:Factory/hawtjni-runtime/hawtjni-runtime.changes	2019-10-09 15:20:18.280367245 +0200
+++ /work/SRC/openSUSE:Factory/.hawtjni-runtime.new.26869/hawtjni-runtime.changes	2019-11-28 13:50:25.546704982 +0100
@@ -1,0 +2,6 @@
+Mon Nov 25 11:36:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upsteam version 1.17
+- Add dependency on mvn(commons-lang:commons-lang) that is missing
+
+-------------------------------------------------------------------

Old:
----
  hawtjni-fa1fd5dfdd0a1a5a67b61fa7d7ee7126b300c8f0.tar.gz

New:
----
  hawtjni-project-1.17.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hawtjni-maven-plugin.spec ++++++
--- /var/tmp/diff_new_pack.elKqKo/_old	2019-11-28 13:50:26.206704730 +0100
+++ /var/tmp/diff_new_pack.elKqKo/_new	2019-11-28 13:50:26.210704729 +0100
@@ -16,17 +16,13 @@
 #
 
 
-%global base_name hawtjni
-# That is the maven-release-plugin generated commit, but it's not tagged for some reason
-# https://github.com/fusesource/hawtjni/issues/46
-%global commit    fa1fd5dfdd0a1a5a67b61fa7d7ee7126b300c8f0
 Name:           hawtjni-maven-plugin
-Version:        1.16
+Version:        1.17
 Release:        0
 Summary:        Use HawtJNI from a maven plugin
 License:        Apache-2.0 AND EPL-1.0 AND BSD-3-Clause
 URL:            https://github.com/fusesource/hawtjni
-Source0:        https://github.com/fusesource/hawtjni/archive/%{commit}/hawtjni-%{commit}.tar.gz
+Source0:        https://github.com/fusesource/hawtjni/archive/hawtjni-project-%{version}.tar.gz
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
@@ -34,6 +30,7 @@
 BuildRequires:  mvn(org.apache.maven:maven-archiver)
 BuildRequires:  mvn(org.apache.maven:maven-artifact)
 BuildRequires:  mvn(org.apache.maven:maven-artifact-manager)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
 BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 BuildRequires:  mvn(org.apache.maven:maven-project)
 BuildRequires:  mvn(org.codehaus.plexus:plexus-archiver)
@@ -59,7 +56,7 @@
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n hawtjni-%{commit}
+%setup -q -n hawtjni-hawtjni-project-%{version}
 
 # We build only the maven plugin in this one
 %pom_disable_module hawtjni-example
@@ -68,6 +65,8 @@
 
 %pom_remove_plugin -r :maven-eclipse-plugin
 
+%pom_add_dep org.apache.maven:maven-compat:\${mavenVersion}: hawtjni-maven-plugin
+
 %{mvn_package} :hawtjni-project __noinstall
 
 %{mvn_alias} :hawtjni-maven-plugin :maven-hawtjni-plugin

++++++ hawtjni-runtime.spec ++++++
--- /var/tmp/diff_new_pack.elKqKo/_old	2019-11-28 13:50:26.246704716 +0100
+++ /var/tmp/diff_new_pack.elKqKo/_new	2019-11-28 13:50:26.250704714 +0100
@@ -16,18 +16,15 @@
 #
 
 
-%global base_name hawtjni
-# That is the maven-release-plugin generated commit, but it's not tagged for some reason
-# https://github.com/fusesource/hawtjni/issues/46
-%global commit    fa1fd5dfdd0a1a5a67b61fa7d7ee7126b300c8f0
 Name:           hawtjni-runtime
-Version:        1.16
+Version:        1.17
 Release:        0
 Summary:        HawtJNI Runtime
 License:        Apache-2.0 AND EPL-1.0 AND BSD-3-Clause
 URL:            https://github.com/fusesource/hawtjni
-Source0:        https://github.com/fusesource/hawtjni/archive/%{commit}/hawtjni-%{commit}.tar.gz
+Source0:        https://github.com/fusesource/hawtjni/archive/hawtjni-project-%{version}.tar.gz
 BuildRequires:  apache-commons-cli
+BuildRequires:  apache-commons-lang
 BuildRequires:  fdupes
 BuildRequires:  java-devel
 BuildRequires:  javapackages-local
@@ -49,6 +46,7 @@
 Summary:        Code generator that produces the JNI code
 Requires:       %{name} = %{version}
 Requires:       apache-commons-cli
+Requires:       apache-commons-lang
 Requires:       javapackages-tools
 Requires:       objectweb-asm >= 5
 Requires:       xbean
@@ -61,13 +59,16 @@
 JNI code which powers the eclipse platform.
 
 %prep
-%setup -q -n hawtjni-%{commit}
+%setup -q -n hawtjni-hawtjni-project-%{version}
 
 %pom_disable_module hawtjni-example
 %pom_disable_module hawtjni-maven-plugin
 %pom_remove_plugin -r :maven-shade-plugin
 %pom_remove_plugin -r :maven-eclipse-plugin
 
+# this dependency seems to be missing
+%pom_add_dep commons-lang:commons-lang hawtjni-generator
+
 for mod in runtime generator; do
   %pom_remove_parent hawtjni-${mod}
   %pom_xpath_inject pom:project "
@@ -83,13 +84,13 @@
 mkdir -p  hawtjni-generator/build/classes
 javac -d hawtjni-generator/build/classes \
   -source 6 -target 6 \
-  -cp $(build-classpath commons-cli objectweb-asm/asm objectweb-asm/asm-commons xbean/xbean-finder xbean/xbean-asm-util):hawtjni-runtime.jar \
+  -cp $(build-classpath commons-cli commons-lang objectweb-asm/asm objectweb-asm/asm-commons xbean/xbean-finder xbean/xbean-asm-util):hawtjni-runtime.jar \
   $(find hawtjni-generator/src/main/java/ -name *.java | xargs)
 jar cf hawtjni-generator.jar -C hawtjni-generator/build/classes .
 jar uf hawtjni-generator.jar -C hawtjni-generator/src/main/resources .
 mkdir -p hawtjni-runtime/build/apidoc
 javadoc -d hawtjni-runtime/build/apidoc -source 6 \
-  -classpath $(build-classpath commons-cli objectweb-asm/asm objectweb-asm/asm-commons xbean/xbean-finder xbean/xbean-asm-util) \
+  -classpath $(build-classpath commons-cli commons-lang objectweb-asm/asm objectweb-asm/asm-commons xbean/xbean-finder xbean/xbean-asm-util) \
   $(find hawtjni-runtime/src/main/java/ -name *.java && \
     find hawtjni-generator/src/main/java/ -name *.java| xargs)
 
@@ -112,7 +113,7 @@
 cp -pr  hawtjni-runtime/build/apidoc/* %{buildroot}%{_javadocdir}/hawtjni/
 %fdupes -s %{buildroot}%{_javadocdir}/hawtjni/
 
-%{jpackage_script org.fusesource.hawtjni.generator.HawtJNI "" "" commons-cli:objectweb-asm/asm:objectweb-asm/asm-commons:xbean/xbean-finder:xbean/xbean-asm-util:hawtjni/hawtjni-runtime:hawtjni/hawtjni-generator hawtjni-generator true}
+%{jpackage_script org.fusesource.hawtjni.generator.HawtJNI "" "" commons-cli:commons-lang:objectweb-asm/asm:objectweb-asm/asm-commons:xbean/xbean-finder:xbean/xbean-asm-util:hawtjni/hawtjni-runtime:hawtjni/hawtjni-generator hawtjni-generator true}
 
 %files -f .mfiles
 %license license.txt

    

root

tags

participants (1)