diff --git a/.gitignore b/.gitignore index 51d265a..8a48039 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /minipro-0-6f36b9e.tar.gz /minipro-0-1b451ae.tar.gz /minipro-0-6a561be.tar.gz +/minipro-0-0107a7a.tar.gz diff --git a/0001-Fix-I-option-in-usage-info.patch b/0001-Fix-I-option-in-usage-info.patch deleted file mode 100644 index 933a2df..0000000 --- a/0001-Fix-I-option-in-usage-info.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 79cb420393e4ede48a10ed7ed8eb5cce5543231a Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Sat, 11 Oct 2014 08:01:20 +0200 -Subject: [PATCH] Fix -I option in usage info - ---- - main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/main.c b/main.c -index c6b5813..84bf5be 100644 ---- a/main.c -+++ b/main.c -@@ -34,7 +34,7 @@ void print_help_and_exit(const char *progname) { - " -p Specify device\n" - " -c Specify memory type (optional)\n" - " Possible values: code, data, config\n" -- " -i Use ICSP\n"; -+ " -i Use ICSP\n" - " -I Use ICSP (without enabling Vcc)\n"; - fprintf(stderr, usage, progname); - exit(-1); --- -2.1.0 - diff --git a/minipro.spec b/minipro.spec index 1a9d5de..7422d32 100644 --- a/minipro.spec +++ b/minipro.spec @@ -1,9 +1,9 @@ -%global commit 6a561bedf960861a312c77e3cdf236e088478b10 +%global commit 0107a7ab620bd2a6151b19eb75f824c67353c4cd %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: minipro Version: 0 -Release: 6.20141011git%{shortcommit}%{?dist} +Release: 6.20141205git%{shortcommit}%{?dist} Summary: Utility for MiniPro TL866A/TL866/CS programmer Group: System Environment/Base @@ -12,7 +12,6 @@ Group: System Environment/Base License: GPLv2+ URL: https://github.com/vdudouyt/minipro Source0: https://github.com/vdudouyt/minipro/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz -Patch0: 0001-Fix-I-option-in-usage-info.patch BuildRequires: pkgconfig(libusb-1.0) Requires: udev @@ -26,7 +25,6 @@ various BIOSes and EEPROMs). %prep %setup -q -n %{name}-%{commit} -%patch0 -p1 %build @@ -57,6 +55,11 @@ udevadm trigger --subsystem-match=usb --attr-match=idVendor=04d8 --attr-match=id %changelog +* Fri Dec 05 2014 Lubomir Rintel - 0-6.20141205git0107a7a +- Fix ATMEGA32 support +- Rebase to a later upstream snapshot +- Drop upstreamed patches + * Sat Oct 11 2014 Lubomir Rintel - 0-6.20141011git6a561be - Rebase to a later upstream snapshot - Drop upstreamed patches diff --git a/sources b/sources index c7a4e92..cf8df52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c69abb37faaff85b2587e7711a8c3a9 minipro-0-6a561be.tar.gz +452863bda5b1f54a3f8e4a8cf4cbf7eb minipro-0-0107a7a.tar.gz