diff options
author | Jakub Bogusz | 2013-09-15 12:43:17 (GMT) |
---|---|---|
committer | Jakub Bogusz | 2013-09-15 12:43:17 (GMT) |
commit | ab2ece4e389475c3b4d3686f3122bcfaab29ca6b (patch) | |
tree | 48304933a6d63c690f25e96820d56ab3e5d66a75 | |
parent | 7bec9e308ab8fcdc6d2c39e3efd4d4ae17053b03 (diff) | |
download | cpmtools-ab2ece4e389475c3b4d3686f3122bcfaab29ca6b.zip cpmtools-ab2ece4e389475c3b4d3686f3122bcfaab29ca6b.tar.gz |
- updated to 2.16auto/th/cpmtools-2.16-1
- updated DESTDIR patch
- removed obsolete libdsk-fix patch
-rw-r--r-- | cpmtools-DESTDIR.patch | 8 | ||||
-rw-r--r-- | cpmtools-libdsk-fix.patch | 29 | ||||
-rw-r--r-- | cpmtools.spec | 6 |
3 files changed, 6 insertions, 37 deletions
diff --git a/cpmtools-DESTDIR.patch b/cpmtools-DESTDIR.patch index f9e387c..28bd151 100644 --- a/cpmtools-DESTDIR.patch +++ b/cpmtools-DESTDIR.patch @@ -1,5 +1,5 @@ ---- 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 +--- cpmtools-2.16/Makefile.in.orig 2013-09-15 14:35:11.917504540 +0200 ++++ cpmtools-2.16/Makefile.in 2013-09-15 14:37:22.097499077 +0200 @@ -80,26 +80,26 @@ -./fsck.cpm -f pcw -n badfs/label @@ -13,7 +13,7 @@ - $(INSTALL) -s -m 755 cpmchattr $(BINDIR)/cpmchattr - $(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm - $(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm -- [ $(FSED_CPM) != '' ] && $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm +- [ "$(FSED_CPM)" != '' ] && $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm - $(INSTALL_DATA) diskdefs @datarootdir@/diskdefs - $(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1 - $(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1 @@ -33,7 +33,7 @@ + $(INSTALL) -D -m 755 cpmchattr $(DESTDIR)$(BINDIR)/cpmchattr + $(INSTALL) -D -m 755 mkfs.cpm $(DESTDIR)$(BINDIR)/mkfs.cpm + $(INSTALL) -D -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm -+ [ $(FSED_CPM) != '' ] && $(INSTALL) -D -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm ++ [ "$(FSED_CPM)" != '' ] && $(INSTALL) -D -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm + $(INSTALL_DATA) -D diskdefs $(DESTDIR)@datarootdir@/diskdefs + $(INSTALL_DATA) cpmls.1 $(DESTDIR)$(MANDIR)/man1/cpmls.1 + $(INSTALL_DATA) cpmcp.1 $(DESTDIR)$(MANDIR)/man1/cpmcp.1 diff --git a/cpmtools-libdsk-fix.patch b/cpmtools-libdsk-fix.patch deleted file mode 100644 index 7351856..0000000 --- a/cpmtools-libdsk-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- 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 916b2c2..5b73998 100644 --- a/cpmtools.spec +++ b/cpmtools.spec @@ -1,15 +1,14 @@ 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.15 +Version: 2.16 Release: 1 License: GPL v3+ Group: Applications Source0: http://www.moria.de/~michael/cpmtools/%{name}-%{version}.tar.gz -# Source0-md5: 12451210924adec390cbfc52a5aa69fb +# Source0-md5: b2b204cf3b1d85b8e16be39b57a5a768 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 @@ -32,7 +31,6 @@ Z80-PC, ale działa także ze stacjami dyskietek. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 %build %{__autoconf} |