From cb08a8dad7d7e9aa3d441c68c2f6a084d093b12d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Oct 30 2019 15:51:36 +0000 Subject: import libvirt-java-0.4.9-4.el7 --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..00e4ab4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/libvirt-java-0.4.9.tar.gz diff --git a/.libvirt-java.metadata b/.libvirt-java.metadata new file mode 100644 index 0000000..c1e7d68 --- /dev/null +++ b/.libvirt-java.metadata @@ -0,0 +1 @@ +823ddf1406a98ddfe2d799baad733898ccbe309a SOURCES/libvirt-java-0.4.9.tar.gz diff --git a/SOURCES/0001-Fix-build-with-jna-3.5.0.patch b/SOURCES/0001-Fix-build-with-jna-3.5.0.patch new file mode 100644 index 0000000..34d32f9 --- /dev/null +++ b/SOURCES/0001-Fix-build-with-jna-3.5.0.patch @@ -0,0 +1,230 @@ +From 307ba7a1974bf7fdd920b85c73015887873a4502 Mon Sep 17 00:00:00 2001 +Message-Id: <307ba7a1974bf7fdd920b85c73015887873a4502.1363641114.git.crobinso@redhat.com> +From: Jiri Denemark +Date: Tue, 27 Nov 2012 18:33:22 +0100 +Subject: [PATCH] Fix build with jna >= 3.5.0 + +Since jna-3.5.0, all subclasses of com.sun.jna.Structure are required to +implement getFieldOrder method which is supposed to return a list of +fields the wrapped structure contains. +--- + src/main/java/org/libvirt/jna/virConnectAuth.java | 5 +++++ + src/main/java/org/libvirt/jna/virConnectCredential.java | 6 ++++++ + src/main/java/org/libvirt/jna/virDomainBlockInfo.java | 4 ++++ + src/main/java/org/libvirt/jna/virDomainBlockStats.java | 5 +++++ + src/main/java/org/libvirt/jna/virDomainInfo.java | 5 +++++ + src/main/java/org/libvirt/jna/virDomainInterfaceStats.java | 5 +++++ + src/main/java/org/libvirt/jna/virDomainJobInfo.java | 7 +++++++ + src/main/java/org/libvirt/jna/virDomainMemoryStats.java | 4 ++++ + src/main/java/org/libvirt/jna/virError.java | 6 ++++++ + src/main/java/org/libvirt/jna/virNodeInfo.java | 8 +++++++- + src/main/java/org/libvirt/jna/virSchedParameter.java | 5 +++++ + src/main/java/org/libvirt/jna/virStoragePoolInfo.java | 5 +++++ + src/main/java/org/libvirt/jna/virStorageVolInfo.java | 6 +++++- + src/main/java/org/libvirt/jna/virVcpuInfo.java | 4 ++++ + 14 files changed, 73 insertions(+), 2 deletions(-) + +diff --git a/src/main/java/org/libvirt/jna/virConnectAuth.java b/src/main/java/org/libvirt/jna/virConnectAuth.java +index 74dd65c..369d2e5 100644 +--- a/src/main/java/org/libvirt/jna/virConnectAuth.java ++++ b/src/main/java/org/libvirt/jna/virConnectAuth.java +@@ -11,4 +11,9 @@ public class virConnectAuth extends Structure { + public int ncredtype; + public Libvirt.VirConnectAuthCallback cb; + public Pointer cbdata; ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "credtype", "ncredtype", "cb", "cbdata" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virConnectCredential.java b/src/main/java/org/libvirt/jna/virConnectCredential.java +index ba47482..dbfc38e 100644 +--- a/src/main/java/org/libvirt/jna/virConnectCredential.java ++++ b/src/main/java/org/libvirt/jna/virConnectCredential.java +@@ -13,4 +13,10 @@ public class virConnectCredential extends Structure implements Structure.ByRefer + // public Pointer result; + public String result; + public int resultlen; ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "type", "prompt", "challenge", "defresult", ++ "result", "resultlen" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java +index 234a381..cbd7385 100644 +--- a/src/main/java/org/libvirt/jna/virDomainBlockInfo.java ++++ b/src/main/java/org/libvirt/jna/virDomainBlockInfo.java +@@ -7,4 +7,8 @@ public class virDomainBlockInfo extends Structure { + public long allocation; + public long physical; + ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "capacity", "allocation", "physical" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virDomainBlockStats.java b/src/main/java/org/libvirt/jna/virDomainBlockStats.java +index f29dba0..71041cc 100644 +--- a/src/main/java/org/libvirt/jna/virDomainBlockStats.java ++++ b/src/main/java/org/libvirt/jna/virDomainBlockStats.java +@@ -16,4 +16,9 @@ public class virDomainBlockStats extends Structure { + // is correct + public long errs; // this is a long long in the code, so a long mapping is + // correct ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "rd_req", "rd_bytes", "wr_req", "wr_bytes", "errs" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virDomainInfo.java b/src/main/java/org/libvirt/jna/virDomainInfo.java +index a93c0a5..994042a 100644 +--- a/src/main/java/org/libvirt/jna/virDomainInfo.java ++++ b/src/main/java/org/libvirt/jna/virDomainInfo.java +@@ -12,4 +12,9 @@ public class virDomainInfo extends Structure { + public NativeLong memory; + public short nrVirtCpu; + public long cpuTime; ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "state", "maxMem", "memory", "nrVirtCpu", "cpuTime" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java +index 1cb0e66..dcdd529 100644 +--- a/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java ++++ b/src/main/java/org/libvirt/jna/virDomainInterfaceStats.java +@@ -23,4 +23,9 @@ public class virDomainInterfaceStats extends Structure { + public long tx_drop; // this is a long long in the code, so a long mapping + // is correct + ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "rx_bytes", "rx_packets", "rx_errs", "rx_drop", ++ "tx_bytes", "tx_packets", "tx_errs", "tx_drop" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virDomainJobInfo.java b/src/main/java/org/libvirt/jna/virDomainJobInfo.java +index 98b4f59..af934ad 100644 +--- a/src/main/java/org/libvirt/jna/virDomainJobInfo.java ++++ b/src/main/java/org/libvirt/jna/virDomainJobInfo.java +@@ -15,4 +15,11 @@ public class virDomainJobInfo extends Structure { + public long fileTotal; + public long fileProcessed; + public long fileRemaining; ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "type", "timeElapsed", "timeRemaining", "dataTotal", ++ "dataProcessed", "dataRemaining", "memTotal", "memProcessed", ++ "memRemaining", "fileTotal", "fileProcessed", "fileRemaining" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java +index 7a9f5d2..ec7b29e 100644 +--- a/src/main/java/org/libvirt/jna/virDomainMemoryStats.java ++++ b/src/main/java/org/libvirt/jna/virDomainMemoryStats.java +@@ -5,4 +5,8 @@ import com.sun.jna.Structure; + public class virDomainMemoryStats extends Structure { + public int tag ; + public long val ; ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { "tag", "val" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virError.java b/src/main/java/org/libvirt/jna/virError.java +index e2580dd..9009280 100644 +--- a/src/main/java/org/libvirt/jna/virError.java ++++ b/src/main/java/org/libvirt/jna/virError.java +@@ -19,4 +19,10 @@ public class virError extends Structure { + public int int1; + public int int2; + public NetworkPointer net; ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "code", "domain", "message", "level", "conn", "dom", ++ "str1", "str2", "str3", "int1", "int2", "net" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virNodeInfo.java b/src/main/java/org/libvirt/jna/virNodeInfo.java +index 532aad9..f13eddc 100644 +--- a/src/main/java/org/libvirt/jna/virNodeInfo.java ++++ b/src/main/java/org/libvirt/jna/virNodeInfo.java +@@ -21,4 +21,10 @@ public class virNodeInfo extends Structure { + public int sockets; + public int cores; + public int threads; +-} +\ No newline at end of file ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "model", "memory", "cpus", "mhz", "nodes", ++ "sockets", "cores", "threads" }); ++ } ++} +diff --git a/src/main/java/org/libvirt/jna/virSchedParameter.java b/src/main/java/org/libvirt/jna/virSchedParameter.java +index 0013fff..9496121 100644 +--- a/src/main/java/org/libvirt/jna/virSchedParameter.java ++++ b/src/main/java/org/libvirt/jna/virSchedParameter.java +@@ -9,4 +9,9 @@ public class virSchedParameter extends Structure { + public byte field[] = new byte[Libvirt.VIR_DOMAIN_SCHED_FIELD_LENGTH]; + public int type; + public virSchedParameterValue value; ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "field", "type", "value" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java +index 5a98e08..7f370cd 100644 +--- a/src/main/java/org/libvirt/jna/virStoragePoolInfo.java ++++ b/src/main/java/org/libvirt/jna/virStoragePoolInfo.java +@@ -13,4 +13,9 @@ public class virStoragePoolInfo extends Structure { + // mapping is correct + public long available; // this is a long long in the code, so a long mapping + // is correct ++ ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "state", "capacity", "allocation", "available" }); ++ } + } +diff --git a/src/main/java/org/libvirt/jna/virStorageVolInfo.java b/src/main/java/org/libvirt/jna/virStorageVolInfo.java +index db8a5bd..a02219e 100644 +--- a/src/main/java/org/libvirt/jna/virStorageVolInfo.java ++++ b/src/main/java/org/libvirt/jna/virStorageVolInfo.java +@@ -12,4 +12,8 @@ public class virStorageVolInfo extends Structure { + public long allocation; // this is a long long in the code, so a long + // mapping is correct + +-} +\ No newline at end of file ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "type", "capacity", "allocation" }); ++ } ++} +diff --git a/src/main/java/org/libvirt/jna/virVcpuInfo.java b/src/main/java/org/libvirt/jna/virVcpuInfo.java +index 16f237d..e5f4363 100644 +--- a/src/main/java/org/libvirt/jna/virVcpuInfo.java ++++ b/src/main/java/org/libvirt/jna/virVcpuInfo.java +@@ -12,4 +12,8 @@ public class virVcpuInfo extends Structure { + // is correct + public int cpu; + ++ protected java.util.List getFieldOrder() { ++ return java.util.Arrays.asList(new String[] { ++ "number", "state", "cpuTime", "cpu" }); ++ } + } +-- +1.8.1.4 + diff --git a/SPECS/libvirt-java.spec b/SPECS/libvirt-java.spec new file mode 100644 index 0000000..23deb70 --- /dev/null +++ b/SPECS/libvirt-java.spec @@ -0,0 +1,178 @@ +Summary: Java bindings for the libvirt virtualization API +Name: libvirt-java +Version: 0.4.9 +Prefix: libvirt +Release: 4%{?dist}%{?extra_release} +License: MIT +BuildArch: noarch +Group: Development/Libraries +Source: http://libvirt.org/sources/java/%{name}-%{version}.tar.gz + +# Fix FTBFS issue (bz #914153) +Patch0001: 0001-Fix-build-with-jna-3.5.0.patch +URL: http://libvirt.org/ +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Requires: jna +Requires: libvirt-client >= 0.9.12 +Requires: java >= 1.5.0 +Requires: jpackage-utils +BuildRequires: ant +BuildRequires: jna +BuildRequires: ant-junit +BuildRequires: java-devel >= 1.5.0 +BuildRequires: jpackage-utils + +# +# the jpackage-utils should provide a %{java_home} macro +# to select a different Java JVM from the default one use the following +# rpmbuild --define 'java_home /usr/lib/jvm/your_jvm_of_choice' +# + +%description +Libvirt-java is a base framework allowing to use libvirt, the virtualization +API though the Java programming language. +It requires libvirt-client >= 0.9.12 + +%package devel +Summary: Compressed Java source files for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description devel +Libvirt-java is a base framework allowing to use libvirt, the virtualization +API though the Java programming language. This is the development part needed +to build applications with Libvirt-java. + + +%package javadoc +Summary: Java documentation for %{name} +Group: Development/Documentation +Requires: jpackage-utils + +%description javadoc +API documentation for %{name}. +%prep +%setup -q + +# Fix FTBFS issue (bz #914153) +%patch0001 -p1 + +%build +ant build docs + +%install +rm -fr %{buildroot} +install -d -m0755 %{buildroot}%{_javadir} +install -d -m0755 %{buildroot}%{_javadocdir}/%{name}-%{version} +cp target/%{prefix}-%{version}.jar %{buildroot}%{_javadir} +%{__ln_s} %{_javadir}/%{prefix}-%{version}.jar %{buildroot}%{_javadir}/%{prefix}.jar +cp -r target/javadoc/* %{buildroot}%{_javadocdir}/%{name}-%{version} +%{__ln_s} %{_javadocdir}/%{name}-%{version} %{buildroot}%{_javadocdir}/%{name} + +%check +ant test + +%clean +rm -rf %{buildroot} + +%files +%defattr(-,root,root) +%doc AUTHORS LICENCE NEWS README INSTALL +%{_javadir}/*.jar + +%files devel +%defattr(-,root,root) +%doc src/test/java/test.java + + +%files javadoc +%defattr(-,root,root) +%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} + +%changelog +* Fri Dec 27 2013 Daniel Mach - 0.4.9-4 +- Mass rebuild 2013-12-27 + +* Mon Mar 18 2013 Cole Robinson - 0.4.9-3 +- Fix FTBFS issue (bz #914153) + +* Thu Feb 14 2013 Fedora Release Engineering - 0.4.9-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Fri Sep 14 2012 Daniel Veillard - 0.4.9-1 +- Change Licence to MIT and release 0.4.9 +- Fix IndexOutOfBoundsException for unknown error codes +- Fix javadoc warnings +- Fix typo in Domain.java + +* Thu Jul 19 2012 Fedora Release Engineering - 0.4.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jul 6 2012 Daniel Veillard - 0.4.8-1 +- Add flags to StoragePoolRefresh +- use byte[] array for secretGetValue +- Fix for the jna parameter passing issue +- Added domain flags and error constants for libvirt 0.9.12 + +* Fri Jan 13 2012 Fedora Release Engineering - 0.4.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 0.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Feb 3 2011 Bryan Kearney - 0.4.3-1 +- Added libvirt API support for up to 0.7.1 +- Reduce java dependencies to 1.5 +- Improved packaging for javadocs +- Better Free/Close handling + +* Fri Jan 29 2010 Bryan Kearney - 0.4.2-1 +- Changed Scheduled Parameters to be a Union instead of a Struct. +- Better Pointer mappings in the error callback + +* Mon Jan 18 2010 Bryan Kearney - 0.4.1-1 +- Better null checking around Scheduled Parameters +- Added error function callback + +* Tue Dec 1 2009 Bryan Kearney - 0.4.0-2 +- Modified the dependency to be libvirt-client instead of libvirt. + +* Tue Nov 24 2009 Bryan Kearney - 0.4.0-1 +- Added libvirt APIs up through 0.7.0 + +* Tue Nov 24 2009 Bryan Kearney - 0.3.2-1 +- Added libvirt APIs up through 0.6.1 + +* Thu Oct 29 2009 Bryan Kearney - 0.3.1-1 +- Added maven building tools. +- Fixed connection and domain bugs found by Thomas Treutner + +* Wed Jul 29 2009 Bryan Kearney - 0.3.0-1 +- refactored the code to use jna (https://jna.dev.java.net/) + +* Fri Jul 18 2008 Daniel Veillard - 0.2.0-1 +- new release 0.2.0 +- finished cleanup of APIs + +* Thu Jul 3 2008 Daniel Veillard - 0.1.2-1 +- new release 0.1.2 + +* Tue Jul 1 2008 Daniel Veillard - 0.1.1-1 +- new release 0.1.1 + +* Tue Jun 24 2008 Daniel Veillard - 0.1.0-1 +- created +