From 2f8d53ef1bf2a2b87f18b568e2fa24e3128ff36a Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Aug 28 2019 18:34:30 +0000
Subject: Merge branch 'master' into epel8


---

diff --git a/0001-Bugfix-filetype-and-open-protected-flags-were-not-re.patch b/0001-Bugfix-filetype-and-open-protected-flags-were-not-re.patch
new file mode 100644
index 0000000..83269dc
--- /dev/null
+++ b/0001-Bugfix-filetype-and-open-protected-flags-were-not-re.patch
@@ -0,0 +1,33 @@
+From df8fba550e4e6bdd2979433b278bd3cf63005a06 Mon Sep 17 00:00:00 2001
+From: Claus <claus@protovision.games>
+Date: Wed, 28 Aug 2019 09:19:44 +0200
+Subject: [PATCH] Bugfix: filetype and open/protected flags were not reset
+ after a file was written
+
+---
+ cc1541.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/cc1541.c b/cc1541.c
+index 43df759..5956f9f 100644
+--- a/cc1541.c
++++ b/cc1541.c
+@@ -2264,6 +2264,7 @@ main(int argc, char* argv[])
+             filename = NULL;
+             sectorInterleave = 0;
+             nrSectorsShown = -1;
++            filetype = 0x82;
+             num_files++;
+             j++;
+         } else if (strcmp(argv[j], "-l") == 0) {
+@@ -2288,6 +2289,7 @@ main(int argc, char* argv[])
+             filename = NULL;
+             sectorInterleave = 0;
+             nrSectorsShown = -1;
++            filetype = 0x82;
+             num_files++;
+             j++;
+         } else if (strcmp(argv[j], "-x") == 0) {
+-- 
+2.21.0
+
diff --git a/cc1541.spec b/cc1541.spec
index c4fed6c..8f2dda1 100644
--- a/cc1541.spec
+++ b/cc1541.spec
@@ -5,13 +5,16 @@ CC=%{__cc} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" ENABLE_MAN=1
 
 Name:           cc1541
 Version:        3.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tool for creating Commodore 1541 Floppy disk images in D64, G64, D71 or D81 format
 
 License:        MIT
 URL:            https://bitbucket.org/PTV_Claus/%{name}
 Source0:        %{url}/downloads/%{name}-%{version}.tar.gz
 
+# Backported from upstream.
+Patch0001:      0001-Bugfix-filetype-and-open-protected-flags-were-not-re.patch
+
 BuildRequires:  asciidoc
 BuildRequires:  gcc
 BuildRequires:  git
@@ -48,6 +51,9 @@ using either SPEED DOS or DOLPHIN DOS BAM-formatting.
 
 
 %changelog
+* Wed Aug 28 2019 Björn Esser <besser82@fedoraproject.org> - 3.0-2
+- Add an upstream patch to fix a bug
+
 * Sun Aug 25 2019 Björn Esser <besser82@fedoraproject.org> - 3.0-1
 - New upstream release