- updated to 2.24

diff --git a/cpmtools-DESTDIR.patch b/cpmtools-DESTDIR.patch
deleted file mode 100644 (file)
index f02ee45..0000000
--- a/cpmtools-DESTDIR.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- cpmtools-2.19/Makefile.in.orig     2014-07-20 18:08:59.551241866 +0200
-+++ cpmtools-2.19/Makefile.in  2014-07-20 18:14:15.721228597 +0200
-@@ -80,27 +80,28 @@
-               -./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
--              [ -d $(BINDIR) ] || $(INSTALL) -m 755 -d $(BINDIR)
--              $(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
--              $(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
--              $(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
--              $(INSTALL) -s -m 755 cpmchmod $(BINDIR)/cpmchmod
--              $(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
--              $(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
--              $(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
--              $(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1
--              $(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1
--              $(INSTALL_DATA) cpmchmod.1 $(MANDIR)/man1/cpmchmod.1
--              $(INSTALL_DATA) cpmchattr.1 $(MANDIR)/man1/cpmchattr.1
--              $(INSTALL_DATA) mkfs.cpm.1 $(MANDIR)/man1/mkfs.cpm.1
--              $(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
-+              [ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -m 755 -d $(DESTDIR)$(BINDIR)
-+              [ -d $(DESTDIR)@datarootdir@ ] || $(INSTALL) -m 755 -d $(DESTDIR)@datarootdir@
-+              $(INSTALL) -m 755 cpmls $(DESTDIR)$(BINDIR)/cpmls
-+              $(INSTALL) -m 755 cpmcp $(DESTDIR)$(BINDIR)/cpmcp
-+              $(INSTALL) -m 755 cpmrm $(DESTDIR)$(BINDIR)/cpmrm
-+              $(INSTALL) -m 755 cpmchmod $(DESTDIR)$(BINDIR)/cpmchmod
-+              $(INSTALL) -m 755 cpmchattr $(DESTDIR)$(BINDIR)/cpmchattr
-+              $(INSTALL) -m 755 mkfs.cpm $(DESTDIR)$(BINDIR)/mkfs.cpm
-+              $(INSTALL) -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm
-+              [ "$(FSED_CPM)" = '' ] || $(INSTALL) -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm
-+              $(INSTALL_DATA) diskdefs $(DESTDIR)@datarootdir@/diskdefs
-+              $(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-install.patch b/cpmtools-install.patch
new file mode 100644 (file)
index 0000000..abd623e
--- /dev/null
+++ b/cpmtools-install.patch
@@ -0,0 +1,24 @@
+--- cpmtools-2.24/Makefile.in.orig     2023-09-12 21:55:42.577982381 +0200
++++ cpmtools-2.24/Makefile.in  2023-09-12 22:04:32.638444131 +0200
+@@ -84,13 +84,14 @@ install:   all
+               [ -d $(DESTDIR)$(MANDIR)/man1 ] || $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man1
+               [ -d $(DESTDIR)$(MANDIR)/man5 ] || $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man5
+               [ -d $(DESTDIR)$(BINDIR) ] || $(INSTALL) -m 755 -d $(DESTDIR)$(BINDIR)
+-              $(INSTALL) -s -m 755 cpmls $(DESTDIR)$(BINDIR)/cpmls
+-              $(INSTALL) -s -m 755 cpmcp $(DESTDIR)$(BINDIR)/cpmcp
+-              $(INSTALL) -s -m 755 cpmrm $(DESTDIR)$(BINDIR)/cpmrm
+-              $(INSTALL) -s -m 755 cpmchmod $(DESTDIR)$(BINDIR)/cpmchmod
+-              $(INSTALL) -s -m 755 cpmchattr $(DESTDIR)$(BINDIR)/cpmchattr
+-              $(INSTALL) -s -m 755 mkfs.cpm $(DESTDIR)$(BINDIR)/mkfs.cpm
+-              $(INSTALL) -s -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm
++              [ -d $(DESTDIR)@datarootdir@ ] || $(INSTALL) -m 755 -d $(DESTDIR)@datarootdir@
++              $(INSTALL) -m 755 cpmls $(DESTDIR)$(BINDIR)/cpmls
++              $(INSTALL) -m 755 cpmcp $(DESTDIR)$(BINDIR)/cpmcp
++              $(INSTALL) -m 755 cpmrm $(DESTDIR)$(BINDIR)/cpmrm
++              $(INSTALL) -m 755 cpmchmod $(DESTDIR)$(BINDIR)/cpmchmod
++              $(INSTALL) -m 755 cpmchattr $(DESTDIR)$(BINDIR)/cpmchattr
++              $(INSTALL) -m 755 mkfs.cpm $(DESTDIR)$(BINDIR)/mkfs.cpm
++              $(INSTALL) -m 755 fsck.cpm $(DESTDIR)$(BINDIR)/fsck.cpm
+               [ "$(FSED_CPM)" = '' ] || $(INSTALL) -s -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm
+               $(INSTALL_DATA) diskdefs $(DESTDIR)@datarootdir@/diskdefs
+               $(INSTALL_DATA) cpmls.1 $(DESTDIR)$(MANDIR)/man1/cpmls.1

diff --git a/cpmtools-link.patch b/cpmtools-link.patch
index 37e330bf950f4ca08e6def8fc27b00a1bcb27c82..d92294eb9d5bfb768d6700b9e905c8ef542ef12c 100644 (file)
--- a/cpmtools-link.patch
+++ b/cpmtools-link.patch
@@ -20,9 +20,9 @@
  
  dnl If using libdsk, check it's available. 
  if test "$LIBDSK" != ""; then
---- cpmtools-2.13/Makefile.in.orig     2010-11-16 08:31:59.727101613 +0100
-+++ cpmtools-2.13/Makefile.in  2010-11-16 08:32:59.059104128 +0100
-@@ -20,6 +20,7 @@
+--- cpmtools-2.24/Makefile.in.orig     2023-01-30 20:32:25.000000000 +0100
++++ cpmtools-2.24/Makefile.in  2023-09-12 21:55:25.491408281 +0200
+@@ -20,6 +20,7 @@ FSED_CPM=       @FSED_CPM@
  EXEEXT =        @EXEEXT@
  OBJEXT =        .@OBJEXT@
  LIBS=           @LIBS@ @LDLIBS@
@@ -30,12 +30,12 @@
  LDDEPS=               @LDDEPS@
  CPPFLAGS=     @CPPFLAGS@ -DDISKDEFS=\"$(DISKDEFS)\" -DFORMAT=\"$(DEFFORMAT)\"
  #
-@@ -63,7 +64,7 @@
+@@ -63,7 +64,7 @@ fsck.cpm$(EXEEXT):   fsck.cpm$(OBJEXT) cpm
                $(CC) $(LDFLAGS) -o $@ fsck.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS)
  
- fsed.cpm$(EXEEXT):    fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LDDEPS)
--              $(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS)
-+              $(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(NCURSESLIBS) $(LIBS)
+ fsed.cpm$(EXEEXT):    fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) term_curses$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LDDEPS)
+-              $(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) term_curses$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(LIBS)
++              $(CC) $(LDFLAGS) -o $@ fsed.cpm$(OBJEXT) cpmfs$(OBJEXT) term_curses$(OBJEXT) getopt$(OBJEXT) getopt1$(OBJEXT) $(DEVICEOBJ) $(NCURSESLIBS) $(LIBS)
  
  fsck.test:    fsck.cpm
                -./fsck.cpm -f ibm-3740 -n badfs/status

diff --git a/cpmtools.spec b/cpmtools.spec
index 0e3ce21d93a4fdaf7b783818d5e279f286543b80..0dc32a86e019d27735773b8a63ee71c3fefed4aa 100644 (file)
--- a/cpmtools.spec
+++ b/cpmtools.spec
@@ -1,13 +1,13 @@
 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.20
+Version:       2.24
 Release:       1
 License:       GPL v3+
 Group:         Applications/File
 Source0:       http://www.moria.de/~michael/cpmtools/files/%{name}-%{version}.tar.gz
-# Source0-md5: 675dd715c93469330833c8b67abadcda
-Patch0:                %{name}-DESTDIR.patch
+# Source0-md5: 0cb3a4c2fa7b2b05d9096d06b4b126b7
+Patch0:                %{name}-install.patch
 Patch1:                %{name}-link.patch
 URL:           http://www.moria.de/~michael/cpmtools/
 BuildRequires: autoconf >= 2.13
@@ -63,3 +63,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/fsed.cpm.1*
 %{_mandir}/man1/mkfs.cpm.1*
 %{_mandir}/man5/cpm.5*
+%{_mandir}/man5/diskdefs.5*