- up to 2.4

Changed files:
    cpmtools-DESTDIR.patch -> 1.2
    cpmtools.spec -> 1.3

diff --git a/cpmtools-DESTDIR.patch b/cpmtools-DESTDIR.patch
index 5af4fc4cb0c67122c9ae8a758bb596e120dec4a2..4bf272a5384676ba58445a84f7f698aedf06f6a2 100644 (file)
--- a/cpmtools-DESTDIR.patch
+++ b/cpmtools-DESTDIR.patch
@@ -1,6 +1,7 @@
---- cpmtools-2.1/Makefile.in.orig      2002-04-17 22:32:38.000000000 +0200
-+++ cpmtools-2.1/Makefile.in   2003-08-15 15:20:05.546395792 +0200
-@@ -77,23 +77,24 @@
+diff -urN cpmtools-2.4.orig/Makefile.in cpmtools-2.4/Makefile.in
+--- cpmtools-2.4.orig/Makefile.in      2004-03-29 07:44:39.000000000 +0000
++++ cpmtools-2.4/Makefile.in   2004-10-18 22:10:27.169039872 +0000
+@@ -77,24 +77,26 @@
                -./fsck.cpm -f pcw -n badfs/label
  
  install:      all
@@ -21,16 +22,18 @@
 -              $(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) -m 755 -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)@datadir@
-+              $(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
-+              $(INSTALL) -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm
-+              $(INSTALL_DATA) diskdefs $(DESTDIR)@datadir@/diskdefs
+-              $(INSTALL_DATA) cpm.5 $(MANDIR)/man5/cpm.5
++              $(INSTALL) -m 755 -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)/usr/share/misc
++              $(INSTALL) -m 755 -d $(DESTDIR)$(MANDIR)/man5
++              $(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
++              $(INSTALL) -s -m 755 fsed.cpm $(DESTDIR)$(BINDIR)/fsed.cpm
++              $(INSTALL_DATA) diskdefs $(DESTDIR)/usr/share/misc/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
@@ -39,6 +42,7 @@
 +              $(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) *.1 *.5

diff --git a/cpmtools.spec b/cpmtools.spec
index 6d445d62518ecfd3a65cd8d97020d234edd0e0f6..7615d53e2de86d4cea7729ebae98dcd6aec35a4b 100644 (file)
--- a/cpmtools.spec
+++ b/cpmtools.spec
@@ -1,12 +1,13 @@
 Summary:       Tools for accessing CP/M file systems
 Summary(pl):   Narzêdzia pozwalaj±ce na dostêp do systemów plików CP/M
 Name:          cpmtools
-Version:       2.1
+Version:       2.4
 Release:       1
 License:       GPL
 Group:         Applications
 Source0:       http://www.moria.de/~michael/cpmtools/%{name}-%{version}.tar.gz
-# Source0-md5: 43bbca6c5728e2aff298079cb0c00146
+# Source0-md5: 83d26649ab672c53a699475cf1320e3c
+# Source0-size:        130700
 Patch0:                %{name}-DESTDIR.patch
 URL:           http://www.moria.de/~michael/cpmtools/
 BuildRequires: libdsk-devel