- updated to 2.18

- updated DESTDIR,link patches

diff --git a/cpmtools-DESTDIR.patch b/cpmtools-DESTDIR.patch
index 28bd151ddce23306f09b68f167483d3de1f7eaef..042aea5cd7c81fd480a41399e09e575678074ab0 100644 (file)
--- a/cpmtools-DESTDIR.patch
+++ b/cpmtools-DESTDIR.patch
@@ -1,11 +1,12 @@
---- 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 @@
+--- cpmtools-2.18/Makefile.in.orig     2014-04-16 19:28:58.347561466 +0200
++++ cpmtools-2.18/Makefile.in  2014-04-16 19:31:52.804224499 +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
@@ -26,15 +27,17 @@
 -              $(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
-+              $(INSTALL) -D -m 755 cpmchmod $(DESTDIR)$(BINDIR)/cpmchmod
-+              $(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
-+              $(INSTALL_DATA) -D diskdefs $(DESTDIR)@datarootdir@/diskdefs
++              [ -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

diff --git a/cpmtools-link.patch b/cpmtools-link.patch
index cf43babb34b89d11cfd1cae61c86bb0a2291a582..37e330bf950f4ca08e6def8fc27b00a1bcb27c82 100644 (file)
--- a/cpmtools-link.patch
+++ b/cpmtools-link.patch
@@ -1,17 +1,22 @@
---- cpmtools-2.13/configure.in.orig    2010-03-30 20:06:02.000000000 +0200
-+++ cpmtools-2.13/configure.in 2010-11-16 08:36:21.015098261 +0100
-@@ -62,10 +62,12 @@
+--- cpmtools-2.18/configure.in.orig    2014-04-16 19:32:18.657557292 +0200
++++ cpmtools-2.18/configure.in 2014-04-16 19:39:39.014214783 +0200
+@@ -62,14 +62,16 @@
  
  dnl Check for curses. If not found, don't build fsed.cpm
  dnl Try both curses and ncurses
 -AC_CHECK_LIB(curses, printw, FSED_CPM=fsed.cpm LIBS="-lcurses $LIBS", FSED_CPM=)
-+AC_CHECK_LIB(ncurses, printw, FSED_CPM=fsed.cpm NCURSESLIBS="-lcurses", FSED_CPM=)
++AC_CHECK_LIB(ncurses, printw, FSED_CPM=fsed.cpm NCURSESLIBS="-lncurses", FSED_CPM=)
  if test x"$FSED_CPM" = x""; then
 -  AC_CHECK_LIB(ncurses, printw, FSED_CPM=fsed.cpm LIBS="-lncurses $LIBS", FSED_CPM=)
-+  AC_CHECK_LIB(curses, printw, FSED_CPM=fsed.cpm NCURSESLIBS="-lncurses", FSED_CPM=)
- fi
++  AC_CHECK_LIB(curses, printw, FSED_CPM=fsed.cpm NCURSESLIBS="-lcurses", FSED_CPM=)
++fi
 +AC_CHECK_LIB(tinfo, raw, NCURSESLIBS="$NCURSESLIBS -ltinfo")
-+AC_SUBST([NCURSESLIBS])
++AC_SUBST(NCURSESLIBS)
+   if test x"$FSED_CPM" != x""; then
+     AC_DEFINE(NEED_NCURSES)
+     AC_CHECK_HEADERS(ncurses/ncurses.h,have_ncurses_ncurses_h=yes)
+   fi
+-fi
  
  dnl If using libdsk, check it's available. 
  if test "$LIBDSK" != ""; then

diff --git a/cpmtools.spec b/cpmtools.spec
index e5e0b64042cfdd32dfcac675fa8ef0f636b5ba98..41b21db1c230d69326baf6c66250e94ae1f5d754 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.17
+Version:       2.18
 Release:       1
 License:       GPL v3+
-Group:         Applications
+Group:         Applications/File
 Source0:       http://www.moria.de/~michael/cpmtools/%{name}-%{version}.tar.gz
-# Source0-md5: 0d2e0e78cab3a87184c55d350e83af07
+# Source0-md5: f07d3cca79ed8b4a57480745e5199b71
 Patch0:                %{name}-DESTDIR.patch
 Patch1:                %{name}-link.patch
 URL:           http://www.moria.de/~michael/cpmtools/