packages: cpmtools/cpmtools-DESTDIR.patch, cpmtools/cpmtools.spec - updated...

[qboosh]

Author: qboosh                       Date: Sun Nov 14 21:18:28 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.13
- updated DESTDIR patch

---- Files affected:
packages/cpmtools:
   cpmtools-DESTDIR.patch (1.3 -> 1.4) , cpmtools.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: packages/cpmtools/cpmtools-DESTDIR.patch
diff -u packages/cpmtools/cpmtools-DESTDIR.patch:1.3 packages/cpmtools/cpmtools-DESTDIR.patch:1.4
--- packages/cpmtools/cpmtools-DESTDIR.patch:1.3	Fri Feb 29 18:21:40 2008
+++ packages/cpmtools/cpmtools-DESTDIR.patch	Sun Nov 14 22:18:23 2010
@@ -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

================================================================
Index: packages/cpmtools/cpmtools.spec
diff -u packages/cpmtools/cpmtools.spec:1.12 packages/cpmtools/cpmtools.spec:1.13
--- packages/cpmtools/cpmtools.spec:1.12	Fri Feb 29 18:22:42 2008
+++ packages/cpmtools/cpmtools.spec	Sun Nov 14 22:18:23 2010
@@ -2,12 +2,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
@@ -44,8 +44,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -D cpm.5 $RPM_BUILD_ROOT%{_mandir}/man5/cpm.5
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -69,6 +67,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2010/11/14 21:18:23  qboosh
+- updated to 2.13
+- updated DESTDIR patch
+
 Revision 1.12  2008/02/29 17:22:42  qboosh
 - updated to 2.7 (off-by-one bugfix; GPL v3)
 - updated DESTDIR patch
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cpmtools/cpmtools-DESTDIR.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cpmtools/cpmtools.spec?r1=1.12&r2=1.13&f=u