- updated to 2.15

- updated DESTDIR patch
- added libdsk-fix patch (fixes device_libdsk.c compilation)

diff --git a/cpmtools-DESTDIR.patch b/cpmtools-DESTDIR.patch
index 0a9dbe650bb49cb0fc07691316fa6474aeb65a70..f9e387c838c211179cf1d842966e045e3e4ad206 100644 (file)
--- a/cpmtools-DESTDIR.patch
+++ b/cpmtools-DESTDIR.patch
@@ -1,9 +1,11 @@
---- cpmtools-2.13/Makefile.in.orig     2010-03-30 19:53:11.000000000 +0200
-+++ cpmtools-2.13/Makefile.in  2010-11-14 21:42:47.443102452 +0100
-@@ -80,24 +80,24 @@
+--- cpmtools-2.15/Makefile.in.orig     2013-03-02 20:24:53.958658546 +0100
++++ cpmtools-2.15/Makefile.in  2013-03-02 20:30:40.518644002 +0100
+@@ -80,26 +80,26 @@
                -./fsck.cpm -f pcw -n badfs/label
  
  install:      all
+-              [ -d $(MANDIR)/man1 ] || $(INSTALL) -m 755 -d $(MANDIR)/man1
+-              [ -d $(MANDIR)/man5 ] || $(INSTALL) -m 755 -d $(MANDIR)/man5
 -              $(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
 -              $(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
 -              $(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
@@ -22,6 +24,8 @@
 -              $(INSTALL_DATA) fsck.cpm.1 $(MANDIR)/man1/fsck.cpm.1
 -              $(INSTALL_DATA) fsed.cpm.1 $(MANDIR)/man1/fsed.cpm.1
 -              $(INSTALL_DATA) cpm.5 $(MANDIR)/man5/cpm.5
++              [ -d $(DESTDIR)$(MANDIR)/man1 ] || $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man1
++              [ -d $(DESTDIR)$(MANDIR)/man5 ] || $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man5
 +              $(INSTALL) -D -m 755 cpmls $(DESTDIR)$(BINDIR)/cpmls
 +              $(INSTALL) -D -m 755 cpmcp $(DESTDIR)$(BINDIR)/cpmcp
 +              $(INSTALL) -D -m 755 cpmrm $(DESTDIR)$(BINDIR)/cpmrm
@@ -31,15 +35,15 @@
 +              $(INSTALL) -D -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm
 +              [ $(FSED_CPM) != '' ] && $(INSTALL) -D -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm
 +              $(INSTALL_DATA) -D diskdefs $(DESTDIR)@datarootdir@/diskdefs
-+              $(INSTALL_DATA) -D cpmls.1 $(DESTDIR)$(MANDIR)/man1/cpmls.1
-+              $(INSTALL_DATA) -D cpmcp.1 $(DESTDIR)$(MANDIR)/man1/cpmcp.1
-+              $(INSTALL_DATA) -D cpmrm.1 $(DESTDIR)$(MANDIR)/man1/cpmrm.1
-+              $(INSTALL_DATA) -D cpmchmod.1 $(DESTDIR)$(MANDIR)/man1/cpmchmod.1
-+              $(INSTALL_DATA) -D cpmchattr.1 $(DESTDIR)$(MANDIR)/man1/cpmchattr.1
-+              $(INSTALL_DATA) -D mkfs.cpm.1 $(DESTDIR)$(MANDIR)/man1/mkfs.cpm.1
-+              $(INSTALL_DATA) -D fsck.cpm.1 $(DESTDIR)$(MANDIR)/man1/fsck.cpm.1
-+              $(INSTALL_DATA) -D fsed.cpm.1 $(DESTDIR)$(MANDIR)/man1/fsed.cpm.1
-+              $(INSTALL_DATA) -D cpm.5 $(DESTDIR)$(MANDIR)/man5/cpm.5
++              $(INSTALL_DATA) cpmls.1 $(DESTDIR)$(MANDIR)/man1/cpmls.1
++              $(INSTALL_DATA) cpmcp.1 $(DESTDIR)$(MANDIR)/man1/cpmcp.1
++              $(INSTALL_DATA) cpmrm.1 $(DESTDIR)$(MANDIR)/man1/cpmrm.1
++              $(INSTALL_DATA) cpmchmod.1 $(DESTDIR)$(MANDIR)/man1/cpmchmod.1
++              $(INSTALL_DATA) cpmchattr.1 $(DESTDIR)$(MANDIR)/man1/cpmchattr.1
++              $(INSTALL_DATA) mkfs.cpm.1 $(DESTDIR)$(MANDIR)/man1/mkfs.cpm.1
++              $(INSTALL_DATA) fsck.cpm.1 $(DESTDIR)$(MANDIR)/man1/fsck.cpm.1
++              $(INSTALL_DATA) fsed.cpm.1 $(DESTDIR)$(MANDIR)/man1/fsed.cpm.1
++              $(INSTALL_DATA) cpm.5 $(DESTDIR)$(MANDIR)/man5/cpm.5
  
  clean:
                rm -f *$(OBJEXT)

diff --git a/cpmtools-libdsk-fix.patch b/cpmtools-libdsk-fix.patch
new file mode 100644 (file)
index 0000000..7351856
--- /dev/null
+++ b/cpmtools-libdsk-fix.patch
@@ -0,0 +1,29 @@
+--- cpmtools-2.15/device_libdsk.c.orig 2012-03-18 19:18:16.000000000 +0100
++++ cpmtools-2.15/device_libdsk.c      2013-03-02 21:24:38.201841462 +0100
+@@ -31,7 +31,7 @@
+   this->sectrk=sectrk;
+   this->tracks=tracks;
+   /* Must be an even multiple of sector size */
+-  assert((offset%secLength==0);
++  assert(offset%secLength==0);
+   this->offset=offset;
+   
+   this->geom.dg_secsize   = secLength;
+@@ -65,7 +65,7 @@
+ const char *Device_readSector(const struct Device *this, int track, int sector, char *buf)
+ {
+   dsk_err_t e;
+-  e = dsk_lread(this->dev, &this->geom, buf, (track * this->sectrk) + sector + offset/this->secLength);
++  e = dsk_lread(this->dev, &this->geom, buf, (track * this->sectrk) + sector + this->offset/this->secLength);
+   return (e?dsk_strerror(e):(const char*)0);
+ }
+ /*}}}*/
+@@ -73,7 +73,7 @@
+ const char *Device_writeSector(const struct Device *this, int track, int sector, const char *buf)
+ {
+   dsk_err_t e;
+-  e = dsk_lwrite(this->dev, &this->geom, buf, (track * this->sectrk) + sector + offset/this->secLength);
++  e = dsk_lwrite(this->dev, &this->geom, buf, (track * this->sectrk) + sector + this->offset/this->secLength);
+   return (e?dsk_strerror(e):(const char*)0);
+ }
+ /*}}}*/

diff --git a/cpmtools.spec b/cpmtools.spec
index 674449f1f0445acc1d4c8188c4ed5fc1575d976b..916b2c2acd15d3e112f6cd299f6a43d45357324d 100644 (file)
--- a/cpmtools.spec
+++ b/cpmtools.spec
@@ -1,14 +1,15 @@
 Summary:       Tools for accessing CP/M file systems
 Summary(pl.UTF-8):     Narzędzia pozwalające na dostęp do systemów plików CP/M
 Name:          cpmtools
-Version:       2.13
-Release:       3
+Version:       2.15
+Release:       1
 License:       GPL v3+
 Group:         Applications
 Source0:       http://www.moria.de/~michael/cpmtools/%{name}-%{version}.tar.gz
-# Source0-md5: d0622e33c80d2abb44cbe2e844285ce6
+# Source0-md5: 12451210924adec390cbfc52a5aa69fb
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-link.patch
+Patch2:                %{name}-libdsk-fix.patch
 URL:           http://www.moria.de/~michael/cpmtools/
 BuildRequires: autoconf >= 2.13
 BuildRequires: libdsk-devel
@@ -31,6 +32,7 @@ Z80-PC, ale działa także ze stacjami dyskietek.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__autoconf}