diff --git a/minipro-0.5-makefile.patch b/minipro-0.5-makefile.patch deleted file mode 100644 index 1b90b0f..0000000 --- a/minipro-0.5-makefile.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 76b93c388d7d024552d85b786f2edb679989859a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dan=20Hor=C3=A1k?= -Date: Thu, 27 May 2021 12:30:19 +0200 -Subject: [PATCH] update Makefile - -- separate the define into CPPFLAGS to allow overriding the compiler - flags -- introduce LDFLAGS variable so additional options can be passed - -Both these changes should make the Makefile more friendly for -distribution builds. ---- - Makefile | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 40bc61d..dd68a48 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,7 +5,9 @@ CC=gcc - #CC=clang - - # Compiler options --CFLAGS = -g -O0 -Wall -DSHARE_INSTDIR="\"$(SHARE_INSTDIR)\"" -+CFLAGS = -g -O0 -Wall -+CPPFLAGS = -DSHARE_INSTDIR="\"$(SHARE_INSTDIR)\"" -+LDFLAGS = - - # Normally minipro is installed to /usr/local. If you want to put it - # somewhere else, define that location here. -@@ -120,7 +120,7 @@ $(VERSION_STRINGS): - @echo "#include \"version.h\"" >> $@ - - minipro: $(VERSION_HEADER) $(VERSION_STRINGS) $(COMMON_OBJECTS) main.o -- $(CC) $(COMMON_OBJECTS) main.o $(LIBS) -o $(MINIPRO) -+ $(CC) $(LDFLAGS) $(COMMON_OBJECTS) main.o $(LIBS) -o $(MINIPRO) - - library: $(VERSION_HEADER) $(VERSION_STRINGS) $(COMMON_OBJECTS) - ar ru $(STATIC_LIB) $(VERSION_OBJ) $(COMMON_OBJECTS) diff --git a/minipro.spec b/minipro.spec index 529578f..3495462 100644 --- a/minipro.spec +++ b/minipro.spec @@ -1,13 +1,14 @@ +%global commit 0774b071361366c866ec97302ec02972379418b0 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) + Name: minipro Version: 0.5 -Release: 2%{?dist} +Release: 2.20210810git%{shortcommit}%{?dist} Summary: Utility for MiniPro TL866A/TL866/CS programmer License: GPLv3+ URL: https://gitlab.com/DavidGriffith/minipro -Source0: https://gitlab.com/DavidGriffith/minipro/-/archive/%{version}/%{name}-%{version}.tar.gz -# https://gitlab.com/DavidGriffith/minipro/-/commit/76b93c388d7d024552d85b786f2edb679989859a -Patch1: minipro-0.5-makefile.patch +Source0: https://gitlab.com/DavidGriffith/minipro/-/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz BuildRequires: make BuildRequires: gcc @@ -23,7 +24,7 @@ various BIOSes and EEPROMs). %prep -%autosetup +%autosetup -n %{name}-%{commit} %build @@ -42,10 +43,14 @@ rm %{buildroot}%{_udevrulesdir}/61-minipro-plugdev.rules %{_bindir}/miniprohex %{_udevrulesdir}/*.rules %{_datadir}/%{name}/infoic.xml +%{_datadir}/%{name}/logicic.xml %{_mandir}/man1/minipro.1* %changelog +* Tue Aug 10 2021 Lubomir Rintel - 0.5-2.20210810git0774b07 +- Update to a Git snapshot with support for logic IC testing + * Thu Jul 22 2021 Fedora Release Engineering - 0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 6f0e034..616c350 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (minipro-0.5.tar.gz) = e2341213bc43ef53b106211d07a488a142083fe4b6dd6ced0f02595164ce2e0e47f6bdc0a6f6c63f19b9b9438c8f5ad173485953d8a29cb39f89272f8e70dc7c +SHA512 (minipro-0.5-0774b07.tar.gz) = 3bb582868c74283327361cd79a218cc74d1a548573471d3bd4417624c5bfc1b575898883b2e155cad6326c30ed621d4efddadfea9b9524678cd0978c8bf5e0ca