From daeb487a5eb246ecdfc5ec3b18504aed7b04645a Mon Sep 17 00:00:00 2001 From: Björn Esser Date: Mar 09 2022 19:14:19 +0000 Subject: New upstream release --- diff --git a/cc1541-3.4-add_cli_param.patch b/cc1541-3.4-add_cli_param.patch new file mode 100644 index 0000000..381e77c --- /dev/null +++ b/cc1541-3.4-add_cli_param.patch @@ -0,0 +1,27 @@ +From bef16a302c00162b726022bb3a8cebe8f219091e Mon Sep 17 00:00:00 2001 +From: Claus +Date: Tue, 8 Mar 2022 09:54:25 +0100 +Subject: [PATCH] Added missing commandline parameter for separator example + +--- + README.md | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/README.md b/README.md +index 2c427ed..6750300 100644 +--- a/README.md ++++ b/README.md +@@ -31,8 +31,8 @@ https://bitbucket.org/PTV_Claus/cc1541/src/master/ + * "cc1541 -f game -W game.prg -f 'transwarp v0.86' -w transwarp.prg + Transwarp-Game.d64" creates a Transwarp disk image with the + required boot file. +-* "cc1541 -T DEL -f ---------------- -L" creates a DEL entry as +- separator. ++* "cc1541 -T DEL -f ---------------- -L image.d64" creates a DEL ++ entry as separator. + + ## Version history ## + +-- +2.32.0 + diff --git a/cc1541-3.4-commandline_help.patch b/cc1541-3.4-commandline_help.patch new file mode 100644 index 0000000..151c37d --- /dev/null +++ b/cc1541-3.4-commandline_help.patch @@ -0,0 +1,53 @@ +From f7739f104f1817a3d56a2f13ef5dae0f589e388f Mon Sep 17 00:00:00 2001 +From: Claus +Date: Fri, 25 Feb 2022 12:36:10 +0100 +Subject: [PATCH] Small fixed to commandline help + +--- + cc1541.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/cc1541.c b/cc1541.c +index 1228247..dfb3387 100644 +--- a/cc1541.c ++++ b/cc1541.c +@@ -284,7 +284,7 @@ usage() + printf("-K key Set an encryption key for Transwarp files, a string of up to 29\n"); + printf(" characters.\n"); + printf("-f filename Use filename as name when writing next file, use prefix # to\n"); +- printf(" include arbitrary PETSCII characters (e.g. -f \"START#a0,8,1\").\n"); ++ printf(" include arbitrary PETSCII characters (e.g. -f \"start#a0,8,1\").\n"); + printf("-o Do not overwrite if file with same name exists already.\n"); + printf("-V Do not modify image unless it is in valid CBM DOS format.\n"); + printf("-T filetype Filetype for next file, allowed parameters are PRG, SEQ, USR, REL\n"); +@@ -315,7 +315,7 @@ usage() + printf(" default. Not applicable for D81.\n"); + printf("-S value Default sector interleave, default=10.\n"); + printf(" At track end, reduces this by 1 to accomodate large tail gap.\n"); +- printf(" If negative, no special treatment of tail gap. Not applicable for\n"); ++ printf(" If negative, no special treatment of tail gap. Not applicable for\n"); + printf(" D81.\n"); + printf("-s value Next file sector interleave, valid after each file.\n"); + printf(" At track end, reduces this by 1 to accomodate large tail gap.\n"); +@@ -332,15 +332,15 @@ usage() + printf("-4 Use tracks 35-40 with SPEED DOS BAM formatting.\n"); + printf("-5 Use tracks 35-40 with DOLPHIN DOS BAM formatting.\n"); + printf("-R level Try to restore deleted and formatted files.\n"); +- printf(" level 0: Only restore all dir entries without touching any t/s links.\n"); ++ printf(" level 0: Only restore dir entries without touching any t/s links.\n"); + printf(" level 1: Fix dir entries for files with valid t/s chains.\n"); + printf(" level 2: Also add wild sector chains with valid t/s chains.\n"); + printf(" level 3: Also fix dir entries with invalid t/s chains.\n"); + printf(" level 4: Also add and fix wild invalid t/s chains.\n"); + printf(" level 5: Also add reasonable wild single blocks.\n"); + printf("-g filename Write additional g64 output file with given name.\n"); +- printf("-a Print commandline options that would create the same directory as the\n"); +- printf(" one in the given image (for directory art import).\n"); ++ printf("-a Print commandline options that would create the same directory as\n"); ++ printf(" the one in the given image (for directory art import).\n"); + printf("-U mapping Print PETSCII as Unicode (requires Unicode 13.0 font, e.g.\n"); + printf(" UNSCII). Use mapping 0 for ASCII output, 1 for upper case, 2 for\n"); + printf(" lower case, default is 0.\n"); +-- +2.32.0 + diff --git a/cc1541-3.4-example_transwarp_version.patch b/cc1541-3.4-example_transwarp_version.patch new file mode 100644 index 0000000..9795844 --- /dev/null +++ b/cc1541-3.4-example_transwarp_version.patch @@ -0,0 +1,25 @@ +From 1889aff50d4af10d9aba87d5b8f139e3c87e16f0 Mon Sep 17 00:00:00 2001 +From: Claus +Date: Wed, 2 Mar 2022 12:12:44 +0100 +Subject: [PATCH] Changing transwarp version number in examples + +--- + README.md | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/README.md b/README.md +index 4cd95aa..2c427ed 100644 +--- a/README.md ++++ b/README.md +@@ -28,7 +28,7 @@ https://bitbucket.org/PTV_Claus/cc1541/src/master/ + * "cc1541 -s 4 -f program -w program.prg image.d64" writes a file + with a dedicated sector interleave for a fastloader (the best + value depends on the used fastloader and its configuration) +-* "cc1541 -f game -W game.prg -f 'transwarp v0.82' -w transwarp.prg ++* "cc1541 -f game -W game.prg -f 'transwarp v0.86' -w transwarp.prg + Transwarp-Game.d64" creates a Transwarp disk image with the + required boot file. + * "cc1541 -T DEL -f ---------------- -L" creates a DEL entry as +-- +2.32.0 + diff --git a/cc1541-3.4-spelling_fixes.patch b/cc1541-3.4-spelling_fixes.patch new file mode 100644 index 0000000..12eda38 --- /dev/null +++ b/cc1541-3.4-spelling_fixes.patch @@ -0,0 +1,207 @@ +From 4b2f628d216dd337cb3385f0fa95a07260c6cbba Mon Sep 17 00:00:00 2001 +From: Claus +Date: Mon, 28 Feb 2022 17:40:27 +0100 +Subject: [PATCH] Some small English fixes + +--- + README.md | 10 +++++----- + cc1541.1.txt.in | 12 ++++++------ + cc1541.c | 23 ++++++++++++----------- + 3 files changed, 23 insertions(+), 22 deletions(-) + +diff --git a/README.md b/README.md +index 865c7b3..4cd95aa 100644 +--- a/README.md ++++ b/README.md +@@ -43,7 +43,7 @@ v3.4 + files + * -L switch added to create directory entries without writing a + file +-* -a switch added to print a cc1541 commandline that re-creates ++* -a switch added to print a cc1541 command line that re-creates + the directory art of the given disk image + * -T now also allows a number as parameter + * Files with file type DEL will now actually be written, use +@@ -64,7 +64,7 @@ v3.3 + * Output file is not touched when no change is requested + * Bugfix: Fixed crash on write protected output file + * Bugfix: Spacing in directory printout was not correct when +- filesize is more than 999 blocks ++ file size is more than 999 blocks + + v3.2 + +@@ -86,7 +86,7 @@ v3.1 + free slot in the directory before the file to overwrite + * Bugfix: Filetype, open and protected flags were not reset after + writing a file +-* Bugfix: default disk name and id were wrong in commandline help ++* Bugfix: default disk name and id were wrong in command line help + + v3.0 + +@@ -105,7 +105,7 @@ v3.0 + * -T switch added to allow setting the file type + * -O switch added to allow setting the open flag + * -P switch added to allow setting the protected flag +-* Hex escapes are now also allowed for diskname and ID ++* Hex escapes are now also allowed for disk name and ID + * When no disk file name is provided, only the base name of the input + file is used as disk file name instead of the full path + * Bugfix: fixed memory access issue for filenames with 16 letters +@@ -121,7 +121,7 @@ v2.0 + + * The first version with a release number + * All existing modifications consolidated (hopefully) +-* G64 output dependent on output file name instead of a souce code ++* G64 output dependent on output file name instead of a source code + define + * Converted to ANSI C99 + * MSVC build files added +diff --git a/cc1541.1.txt.in b/cc1541.1.txt.in +index 19bc676..e1c493c 100644 +--- a/cc1541.1.txt.in ++++ b/cc1541.1.txt.in +@@ -88,13 +88,13 @@ results in an error. + valid BAM). + + *-t*:: +- Use dirtrack to also store files (makes -x useless) (default no). ++ Use directory track to also store files (makes -x useless) (default no). + + *-u numblocks*:: + When using -t, amount of dir blocks to leave free (default=2). + + *-x*:: +- Don't split files over dirtrack hole (default split files). ++ Don't split files over directory track hole (default split files). + + *-F*:: + Next file first sector on a new track (default=0). Any negative +@@ -104,12 +104,12 @@ for D81. + + *-S value*:: + Default sector interleave, default=10. At track end, reduces this +-by 1 to accomodate large tail gap. If negative, no special treatment ++by 1 to accommodate large tail gap. If negative, no special treatment + of tail gap. Not applicable for D81. + + *-s value*:: + Next file sector interleave, valid after each file. At track end, +-reduces this by 1 to accomodate large tail gap. If negative, no ++reduces this by 1 to accommodate large tail gap. If negative, no + special treatment of tail gap. The interleave value falls back to + the default value set by -S after the first sector of the next file. + Not applicable for D81. +@@ -150,7 +150,7 @@ level 5: Also add reasonable wild single blocks. + Write additional g64 output file with given name. + + *-a*:: +-Print commandline options that would create the same directory as the ++Print command line options that would create the same directory as the + one in the given image (for directory art import). + + *-U mapping*:: +@@ -165,7 +165,7 @@ default is 0. + Be verbose. + + *-h*:: +- Print commandline help. ++ Print command line help. + + == Exit status + +diff --git a/cc1541.c b/cc1541.c +index dfb3387..79dc197 100644 +--- a/cc1541.c ++++ b/cc1541.c +@@ -268,7 +268,7 @@ static int unicode = 0; /* which unicode mapping to use: 0 = none, + static int modified = 0; /* image needs to be written */ + static int dir_error = DIR_OK; /* directory has an error */ + +-/* Prints the commandline help */ ++/* Prints the command line help */ + static void + usage() + { +@@ -306,19 +306,20 @@ usage() + printf(" results in an error.\n"); + printf("-d track Maintain a shadow directory (copy of the actual directory without\n"); + printf(" a valid BAM).\n"); +- printf("-t Use dirtrack to also store files (makes -x useless) (default no).\n"); ++ printf("-t Use directory track to also store files (makes -x useless)\n"); ++ printf(" (default no).\n"); + printf("-u numblocks When using -t, amount of dir blocks to leave free (default=2).\n"); +- printf("-x Don't split files over dirtrack hole (default split files).\n"); ++ printf("-x Don't split files over directory track hole (default split files).\n"); + printf("-F Next file first sector on a new track (default=0).\n"); + printf(" Any negative value assumes aligned tracks and uses current\n"); + printf(" sector + interleave. After each file, the value falls back to the\n"); + printf(" default. Not applicable for D81.\n"); + printf("-S value Default sector interleave, default=10.\n"); +- printf(" At track end, reduces this by 1 to accomodate large tail gap.\n"); ++ printf(" At track end, reduces this by 1 to accommodate large tail gap.\n"); + printf(" If negative, no special treatment of tail gap. Not applicable for\n"); + printf(" D81.\n"); + printf("-s value Next file sector interleave, valid after each file.\n"); +- printf(" At track end, reduces this by 1 to accomodate large tail gap.\n"); ++ printf(" At track end, reduces this by 1 to accommodate large tail gap.\n"); + printf(" If negative, no special treatment of tail gap.\n"); + printf(" The interleave value falls back to the default value set by -S\n"); + printf(" after the first sector of the next file. Not applicable for D81.\n"); +@@ -339,14 +340,14 @@ usage() + printf(" level 4: Also add and fix wild invalid t/s chains.\n"); + printf(" level 5: Also add reasonable wild single blocks.\n"); + printf("-g filename Write additional g64 output file with given name.\n"); +- printf("-a Print commandline options that would create the same directory as\n"); ++ printf("-a Print command line options that would create the same directory as\n"); + printf(" the one in the given image (for directory art import).\n"); + printf("-U mapping Print PETSCII as Unicode (requires Unicode 13.0 font, e.g.\n"); + printf(" UNSCII). Use mapping 0 for ASCII output, 1 for upper case, 2 for\n"); + printf(" lower case, default is 0.\n"); + printf("-q Be quiet.\n"); + printf("-v Be verbose.\n"); +- printf("-h Print this commandline help.\n"); ++ printf("-h Print this command line help.\n"); + printf("\n"); + + exit(-1); +@@ -2958,7 +2959,7 @@ write_files(image_type type, unsigned char *image, imagefile *files, int num_fil + for (int i = 0; i < num_files; i++) { + imagefile *file = files + i; + if (type == IMAGE_D81) { +- file->sectorInterleave = 1; /* caught in commandline parsing anyway, but does not hurt */ ++ file->sectorInterleave = 1; /* caught in command line parsing anyway, but does not hurt */ + } + + int file_usedirtrack = usedirtrack; +@@ -4202,7 +4203,7 @@ restore(image_type type, unsigned char* image, int level, imagefile files[]) + } + } + +-/* Prints a commandline to create dir art like the given image */ ++/* Prints a command line to create dir art like the given image */ + static void + convert_to_commandline(image_type type, unsigned char* image) + { +@@ -4658,7 +4659,7 @@ main(int argc, char* argv[]) + } else if (strcmp(argv[j], "-h") == 0) { + usage(); + } else { +- fprintf(stderr, "ERROR: Error parsing commandline at \"%s\"\n", argv[j]); ++ fprintf(stderr, "ERROR: Error parsing command line at \"%s\"\n", argv[j]); + printf("Use -h for help.\n"); + return -1; + } +@@ -4782,7 +4783,7 @@ main(int argc, char* argv[]) + } + } + +- /* Print commandline before adding anything to the image */ ++ /* Print command line before adding anything to the image */ + if(print_art_commandline) { + convert_to_commandline(type, image); + } +-- +2.32.0 + diff --git a/cc1541.spec b/cc1541.spec index 283abf3..dad5484 100644 --- a/cc1541.spec +++ b/cc1541.spec @@ -4,14 +4,19 @@ CC=%{__cc} CFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" ENABLE_MAN=1 Name: cc1541 -Version: 3.3 -Release: 2%{?dist} -Summary: Tool for creating Commodore 1541 Floppy disk images in D64, G64, D71 or D81 format +Version: 3.4 +Release: 1%{?dist} +Summary: Tool for creating Commodore 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 +Patch0000: %{url}/commits/f7739f104f1817a3d56a2f13ef5dae0f589e388f/raw#/%{name}-3.4-commandline_help.patch +Patch0001: %{url}/commits/4b2f628d216dd337cb3385f0fa95a07260c6cbba/raw#/%{name}-3.4-spelling_fixes.patch +Patch0002: %{url}/commits/1889aff50d4af10d9aba87d5b8f139e3c87e16f0/raw#/%{name}-3.4-example_transwarp_version.patch +Patch0003: %{url}/commits/bef16a302c00162b726022bb3a8cebe8f219091e/raw#/%{name}-3.4-add_cli_param.patch + BuildRequires: asciidoc BuildRequires: gcc BuildRequires: make @@ -47,6 +52,9 @@ using either SPEED DOS or DOLPHIN DOS BAM-formatting. %changelog +* Wed Mar 09 2022 Björn Esser - 3.4-1 +- New upstream release + * Wed Jan 19 2022 Fedora Release Engineering - 3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources index 9f18eaf..b6fa4fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cc1541-3.3.tar.gz) = 6ec12028320137dd104546a359e57e22c1e9026505570fd085b3a74dec61491a86b6eb4f3c918b068e8e357e20dc5a9a95ffe5bcf8bc4425cfa9285818f6234d +SHA512 (cc1541-3.4.tar.gz) = 9199e9342340b1dd552661a2efb3a73260950a2dea5aabf7863c6be457627f0200e2a913511cab6cfb206b5543c591f311aa2d84ff2a8c090eb70f669614faa3