- updated to 2.13

- updated DESTDIR patch

Changed files:
    cpmtools-DESTDIR.patch -> 1.4
    cpmtools.spec -> 1.13

diff --git a/cpmtools-DESTDIR.patch b/cpmtools-DESTDIR.patch
index 40cd355900934026c158559055c793a1bc4de748..0a9dbe650bb49cb0fc07691316fa6474aeb65a70 100644 (file)
--- a/cpmtools-DESTDIR.patch
+++ b/cpmtools-DESTDIR.patch
@@ -1,6 +1,6 @@
---- cpmtools-2.7/Makefile.in.orig      2007-11-26 15:46:14.000000000 +0100
-+++ cpmtools-2.7/Makefile.in   2008-02-29 18:06:46.681653449 +0100
-@@ -79,24 +79,24 @@
+--- 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 @@
                -./fsck.cpm -f pcw -n badfs/label
  
  install:      all
@@ -11,13 +11,13 @@
 -              $(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
--              $(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
 -              $(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1
 -              $(INSTALL_DATA) cpmchmod.1 $(MANDIR)/man1/cpmchmod.1
--              $(INSTALL_DATA) cpmchmod.1 $(MANDIR)/man1/cpmchattr.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
@@ -29,13 +29,13 @@
 +              $(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
-+              $(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) -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 cpmchmod.1 $(DESTDIR)$(MANDIR)/man1/cpmchattr.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

diff --git a/cpmtools.spec b/cpmtools.spec
index 2ae1a51222b3a90dfc2d5753cf8c23cc5bac7794..0c221b1553560a3bd6e447dde72a752243dd82e4 100644 (file)
--- a/cpmtools.spec
+++ b/cpmtools.spec
@@ -1,12 +1,12 @@
 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.7
+Version:       2.13
 Release:       1
 License:       GPL v3+
 Group:         Applications
 Source0:       http://www.moria.de/~michael/cpmtools/%{name}-%{version}.tar.gz
-# Source0-md5: 0deadd1e8baac3808691bef73ddbb5c7
+# Source0-md5: d0622e33c80d2abb44cbe2e844285ce6
 Patch0:                %{name}-DESTDIR.patch
 URL:           http://www.moria.de/~michael/cpmtools/
 BuildRequires: libdsk-devel
@@ -43,8 +43,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -D cpm.5 $RPM_BUILD_ROOT%{_mandir}/man5/cpm.5
-
 %clean
 rm -rf $RPM_BUILD_ROOT