Browse code

jna: Updated to version 4.5.2

Updated to latest available version

Change-Id: I6d315227ca3883763ed2c604ff499c8fceaad14e
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5628
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George

Ankit Jain authored on 2018/09/11 05:44:41
Showing 2 changed files
... ...
@@ -3,16 +3,15 @@
3 3
 
4 4
 Summary:        Java Native Access
5 5
 Name:           jna
6
-Version:        4.4.0
7
-Release:        9%{?dist}
6
+Version:        4.5.2
7
+Release:        1%{?dist}
8 8
 License:        Apache
9
-URL:            http://github.com/twall/jna
9
+URL:            https://github.com/java-native-access/jna
10 10
 Group:          Applications/System
11 11
 Vendor:         VMware, Inc.
12 12
 Distribution:   Photon
13 13
 Source0:        https://github.com/java-native-access/jna/archive/%{version}/%{name}-%{version}.tar.gz
14
-%define sha1 jna=d9b54e98393a696f458468bc8f3167f701a9ea9f
15
-Patch0:         jna_remove_clover_jar.patch
14
+%define sha1 %{name}-%{version}=a75cfa8690861e535f391eca9820da548c921252
16 15
 BuildRequires: openjre8
17 16
 BuildRequires: openjdk8
18 17
 BuildRequires: apache-ant
... ...
@@ -26,14 +25,13 @@ The JNA package contains libraries for interop from Java to native libraries.
26 26
 %package devel
27 27
 Summary:    Sources for JNA
28 28
 Group:      Development/Libraries
29
-Requires:   jna = %{version}-%{release}
29
+Requires:   %{name} = %{version}-%{release}
30 30
 
31 31
 %description devel
32 32
 Sources for JNA
33 33
 
34 34
 %prep
35 35
 %setup -q
36
-%patch0 -p1
37 36
 
38 37
 %clean
39 38
 rm -rf %{buildroot}
... ...
@@ -83,6 +81,8 @@ ant
83 83
 %{_prefix}/*.aar
84 84
 
85 85
 %changelog
86
+*   Mon Sep 10 2018 Ankit Jain <ankitja@vmware.com> 4.5.2-1
87
+-   Updated to version 4.5.2
86 88
 *   Fri Oct 13 2017 Alexey Makhalov <amakhalov@vmware.com> 4.4.0-9
87 89
 -   Remove BuildArch
88 90
 *   Thu Sep 14 2017 Dheeraj Shetty <dheerajs@vmware.com> 4.4.0-8
89 91
deleted file mode 100644
... ...
@@ -1,80 +0,0 @@
1
-+++ b/build.xml	2017-08-17 12:14:12.965910677 -0700
2
-@@ -345,7 +345,6 @@
3
-       <pathelement path="${build}/${jar}"/>
4
-       <pathelement path="${test.classes}"/>
5
-       <pathelement path="${build}/${testjar}"/>
6
--      <pathelement path="lib/clover.jar"/>
7
-       <path refid="test.libs"/>
8
-     </path>
9
-   </target>
10
-@@ -995,7 +994,6 @@
11
-     <copy todir="${build}/jws" file="${build}/${jar}"/>
12
-     <copy todir="${build}/jws" file="${build}/${testjar}"/>
13
-     <copy todir="${build}/jws" file="lib/junit.jar"/>
14
--    <copy todir="${build}/jws" file="lib/clover.jar"/>
15
-     <jar jarfile="${build}/jws/jnidispatch.jar">
16
-       <fileset dir="${build.native}" includes="*jnidispatch.*"/>
17
-     </jar>
18
-@@ -1004,7 +1002,7 @@
19
-     <!-- javaws -viewer (security tab, import CSR as CA-->
20
-     <!--
21
-     <signjar alias="jna" keystore="jna.keystore" storepass="jnadev" lazy="true">
22
--      <fileset dir="${build}/jws" includes="${jar},${testjar},junit.jar,jnidispatch.jar,clover.jar"/>
23
-+      <fileset dir="${build}/jws" includes="${jar},${testjar},junit.jar,jnidispatch.jar"/>
24
-     </signjar>
25
-     -->
26
-   </target>
27
-@@ -1121,27 +1119,6 @@
28
-     </subant>
29
-   </target>
30
- 
31
--  <target name="with.clover" description="Enable code coverage for tests">
32
--    <taskdef resource="cloverlib.xml" classpath="lib/clover.jar"/>
33
--    <property name="clover" value="true"/>
34
--    <property name="build" value="build.clover"/>
35
--    <clover-setup/>
36
--  </target>
37
--
38
--  <target name="clover" depends="with.clover,test"
39
--          description="Generate test code coverage reports">
40
--    <property name="reports.clover" value="${reports}/clover"/>
41
--    <mkdir dir="${reports.clover}"/>
42
--    <clover-report>
43
--      <current outfile="${reports.clover}" title="clover">
44
--        <fileset dir="." includes="**/*.java" />
45
--        <testresults dir="${results.junit}" includes="TEST-*.xml"/>
46
--        <format type="html"/>
47
--      </current>
48
--    </clover-report>
49
--    <echo>Reports generated in ${reports.clover}</echo>
50
--  </target>
51
--
52
-   <target name="javadoc" depends="-setup">
53
-     <path id="javadoc.src.path">
54
-       <path refid="src.path"/>
55
-@@ -1232,7 +1209,7 @@
56
-     <!-- Full sources required to build and test everything -->
57
-     <zip zipfile="${dist}/src-full.zip">
58
-       <zipfileset src="${dist}/src.zip"/>
59
--      <zipfileset dir="lib" includes="junit.jar,clover.jar" prefix="lib"/>
60
-+      <zipfileset dir="lib" includes="junit.jar" prefix="lib"/>
61
-       <zipfileset dir="." includes=".classpath,.project"/>
62
-       <zipfileset dir="${native}" includes="libffi,libffi/**/*" prefix="native"/>
63
-     </zip>
64
-@@ -1247,8 +1224,6 @@
65
-       <fileset dir="${build}"/>
66
-     </delete>
67
-     <delete quiet="true" includeEmptyDirs="true">
68
--      <fileset dir=".clover"/>
69
--      <fileset dir="build.clover" />
70
-       <fileset dir="${javadoc}"/>
71
-       <fileset dir="." includes="*~,**/*~,build.number,native/libffi/configure"/>
72
-     </delete>
73
-@@ -1343,4 +1318,4 @@
74
-       <arg value="-Dgpg.useagent=true"/>
75
-     </artifact:mvn>
76
-   </target>
77
--</project>
78
-\ No newline at end of file
79
-+</project>