commit e823c600f1cef95edd04572d3dbd83d859fe4abe
Author: Jakub Bogusz <[email protected]>
Date: Mon Aug 1 18:46:53 2016 +0200
- added javadoc fixes to java patch
- release 2
libdsk-java.patch | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
libdsk.spec | 4 +--
2 files changed, 80 insertions(+), 2 deletions(-)
---
diff --git a/libdsk.spec b/libdsk.spec
index f2721c1..3c422c8 100644
--- a/libdsk.spec
+++ b/libdsk.spec
@@ -8,7 +8,7 @@ Summary(pl.UTF-8): Biblioteka libdsk
Name: libdsk
# note: 1.4.x is stable, 1.5.x development version
Version: 1.4.0
-Release: 1
+Release: 2
License: LGPL v2+
Group: Libraries
Source0: http://www.seasip.info/Unix/LibDsk/%{name}-%{version}.tar.gz
@@ -16,7 +16,7 @@ Source0:
http://www.seasip.info/Unix/LibDsk/%{name}-%{version}.tar.gz
Patch0: %{name}-am.patch
Patch1: %{name}-java.patch
URL: http://www.seasip.info/Unix/LibDsk/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.50
BuildRequires: automake
BuildRequires: bzip2-devel
%{?with_java:BuildRequires: jdk}
diff --git a/libdsk-java.patch b/libdsk-java.patch
index 6e25df6..9c9ec74 100644
--- a/libdsk-java.patch
+++ b/libdsk-java.patch
@@ -21,3 +21,81 @@
+ $(mkinstalldirs) $(DESTDIR)$(javadir)
+ if test x@LIBDSKJAR@ = x; then true; else $(INSTALL_DATA) @LIBDSKJAR@
$(DESTDIR)$(javadir); fi
+--- libdsk-1.4.0/lib/uk/co/demon/seasip/libdsk/Drive.java.orig 2015-04-28
22:06:20.000000000 +0200
++++ libdsk-1.4.0/lib/uk/co/demon/seasip/libdsk/Drive.java 2016-08-01
18:33:24.505272401 +0200
+@@ -120,7 +120,7 @@
+ * @param cyl The physical cylinder containing the sector.
+ * @param head The physical head to use.
+ * @param cylExpected The expected cylinder number in the sector header.
+- * @param cylExpected The expected head number in the sector header.
++ * @param headExpected The expected head number in the sector header.
+ * @param sector The number of the sector.
+ * @param sectorLen The number of bytes to transfer (may be less than a
+ * full sector).
+@@ -165,7 +165,7 @@
+ * @param cyl The physical cylinder containing the sector.
+ * @param head The physical head to use.
+ * @param cylExpected The expected cylinder number in the sector header.
+- * @param cylExpected The expected head number in the sector header.
++ * @param headExpected The expected head number in the sector header.
+ * @param sector The number of the sector.
+ * @param sectorLen The number of bytes to transfer (may be less than a
+ * full sector).
+@@ -209,7 +209,7 @@
+ * @param cyl The physical cylinder containing the sector.
+ * @param head The physical head to use.
+ * @param cylExpected The expected cylinder number in the sector header.
+- * @param cylExpected The expected head number in the sector header.
++ * @param headExpected The expected head number in the sector header.
+ * @param sector The number of the sector.
+ * @param sectorLen The number of bytes to transfer (may be less than a
+ * full sector).
+@@ -228,7 +228,7 @@
+ /** Format a track, using physical cylinder/sector.
+ *
+ * @param g The drive geometry to use.
+- * @param c The physical cylinder to use.
++ * @param cyl The physical cylinder to use.
+ * @param h The physical head to use.
+ * @param fd An array of FormatData objects containing sector headers.
+ * @param filler The byte with which to fill the empty sectors.
+@@ -252,7 +252,7 @@
+ * it will just do repeated sector reads.
+ * @param g The drive geometry to use.
+ * @param buf The buffer to be filled with data.
+- * @param cyl The physical cylinder to use.
++ * @param cylinder The physical cylinder to use.
+ * @param head The physical head to use.
+ * @exception DskException If the read failed for any reason, or the driver
cannot
+ * read sectors.
+@@ -280,10 +280,10 @@
+ * use this call.
+ * @param g The drive geometry to use.
+ * @param buf The buffer to be filled with data.
+- * @param cyl The physical cylinder to use.
++ * @param cylinder The physical cylinder to use.
+ * @param head The physical head to use.
+ * @param cylExpected The expected cylinder number in the sector header.
+- * @param cylExpected The expected head number in the sector header.
++ * @param headExpected The expected head number in the sector header.
+ * @exception DskException If the read failed for any reason, or the driver
cannot
+ * read sectors.
+ */
+@@ -294,7 +294,7 @@
+ * Linux floppies.
+ *
+ * @param g The drive geometry to use.
+- * @param cyl The physical cylinder to use.
++ * @param cylinder The physical cylinder to use.
+ * @param head The physical head to use.
+ * @param filler The byte with which to fill the empty sectors.
+ * @exception DskException If the format failed for any reason, or the driver
cannot
+@@ -402,7 +402,7 @@
+ public native void setComment(String c) throws DskException;
+
+ /** Set the number of times an operation will be retried.
+- * @param n The number of times to retry a read, write or format, 1 or more.
++ * @param c The number of times to retry a read, write or format, 1 or more.
+ * @exception DskException If the number passed is 0. */
+ public native void setRetry(int c) throws DskException;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libdsk.git/commitdiff/e823c600f1cef95edd04572d3dbd83d859fe4abe
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
