[cpmtools] sync with latest upstream

[Lucian Langa]

commit 51397faede32cec23cabdc94431560dbf7701179
Author: Lucian Langa <lucilanga at gnome.org>
Date:   Fri Jan 24 19:17:13 2014 +0100

    sync with latest upstream

 .gitignore                                         |    1 +
 ...11-nostrip.patch => cpmtools-2.17-nostrip.patch |   14 +++++++-------
 cpmtools.spec                                      |   13 +++++++------
 sources                                            |    2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 090ce49..e0f080e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 cpmtools-2.12.tar.gz
 /cpmtools-2.13.tar.gz
+/cpmtools-2.17.tar.gz
diff --git a/cpmtools-2.11-nostrip.patch b/cpmtools-2.17-nostrip.patch
similarity index 65%
rename from cpmtools-2.11-nostrip.patch
rename to cpmtools-2.17-nostrip.patch
index 13675d3..767e4b8 100644
--- a/cpmtools-2.11-nostrip.patch
+++ b/cpmtools-2.17-nostrip.patch
@@ -1,10 +1,10 @@
-diff -Naur cpmtools-2.11/Makefile.in cpmtools-2.11-mod/Makefile.in
---- cpmtools-2.11/Makefile.in	2009-07-27 21:38:57.000000000 +0300
-+++ cpmtools-2.11-mod/Makefile.in	2009-11-29 21:59:33.000000000 +0200
-@@ -80,13 +80,13 @@
- 		-./fsck.cpm -f pcw -n badfs/label
- 
+diff -Naur cpmtools-2.17/Makefile.in cpmtools-2.17-mod/Makefile.in
+--- cpmtools-2.17/Makefile.in	2013-10-08 22:06:28.000000000 +0200
++++ cpmtools-2.17-mod/Makefile.in	2014-01-24 19:03:07.659057759 +0100
+@@ -82,13 +82,13 @@
  install:	all
+ 		[ -d $(MANDIR)/man1 ] || $(INSTALL) -m 755 -d $(MANDIR)/man1
+ 		[ -d $(MANDIR)/man5 ] || $(INSTALL) -m 755 -d $(MANDIR)/man5
 -		$(INSTALL) -s -m 755 cpmls $(BINDIR)/cpmls
 -		$(INSTALL) -s -m 755 cpmcp $(BINDIR)/cpmcp
 -		$(INSTALL) -s -m 755 cpmrm $(BINDIR)/cpmrm
@@ -19,6 +19,6 @@ diff -Naur cpmtools-2.11/Makefile.in cpmtools-2.11-mod/Makefile.in
 +		$(INSTALL) -m 755 cpmchattr $(BINDIR)/cpmchattr
 +		$(INSTALL) -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
 +		$(INSTALL) -m 755 fsck.cpm $(BINDIR)/fsck.cpm
- 		[ $(FSED_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
diff --git a/cpmtools.spec b/cpmtools.spec
index 445ae45..fad46cc 100644
--- a/cpmtools.spec
+++ b/cpmtools.spec
@@ -1,14 +1,13 @@
 Name:		cpmtools
-Version:	2.13
-Release:	6%{?dist}
+Version:	2.17
+Release:	1%{?dist}
 Summary:	Programs for accessing CP/M disks
 
 Group:		Applications/System
 License:	GPLv3+
 URL:		http://www.moria.de/~michael/cpmtools/
 Source0:	http://www.moria.de/~michael/cpmtools/cpmtools-%{version}.tar.gz
-Patch0:		cpmtools-2.11-nostrip.patch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:		cpmtools-2.17-nostrip.patch
 
 BuildRequires:	ncurses-devel, libdsk-devel
 #Requires:	
@@ -33,7 +32,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man{1,5}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
@@ -45,7 +43,6 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING NEWS README
 %{_bindir}/*
 %{_datadir}/%{name}
@@ -54,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 24 2014 Lucian Langa <cooly at gnome.eu.org> - 2.17-1
+- sync with latest upstream release
+- spec file cleanup
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.13-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 1403b6e..2fb49d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0622e33c80d2abb44cbe2e844285ce6  cpmtools-2.13.tar.gz
+0d2e0e78cab3a87184c55d350e83af07  cpmtools-2.17.tar.gz