diff --git a/jdupes-1.20.0-Makefile.patch b/jdupes-1.20.0-Makefile.patch deleted file mode 100644 index 2ea5687..0000000 --- a/jdupes-1.20.0-Makefile.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up jdupes-1.20.0/Makefile.orig jdupes-1.20.0/Makefile ---- jdupes-1.20.0/Makefile.orig 2021-05-12 17:42:26.000000000 -0400 -+++ jdupes-1.20.0/Makefile 2021-08-10 14:11:29.738413518 -0400 -@@ -6,7 +6,7 @@ - - # PREFIX determines where files will be installed. Common examples - # include "/usr" or "/usr/local". --PREFIX = /usr/local -+PREFIX ?= /usr - - # Certain platforms do not support long options (command line options). - # To disable long options, uncomment the following line. -@@ -14,7 +14,8 @@ PREFIX = /usr/local - - # Uncomment for -B/--dedupe. - # This can also be enabled at build time: 'make ENABLE_DEDUPE=1' --#CFLAGS += -DENABLE_DEDUPE -+CFLAGS += -DENABLE_DEDUPE -+ENABLE_DEDUPE = 1 - - # Uncomment for low memory usage at the expense of speed and features - # This can be enabled at build time: 'make LOW_MEMORY=1' -@@ -22,7 +23,7 @@ PREFIX = /usr/local - - # Uncomment this to build in hardened mode. - # This can be enabled at build time: 'make HARDEN=1' --#HARDEN=1 -+HARDEN=1 - - ##################################################################### - # Developer Configuration Section # -@@ -33,11 +34,11 @@ PROGRAM_NAME = jdupes - - # BIN_DIR indicates directory where program is to be installed. - # Suggested value is "$(PREFIX)/bin" --BIN_DIR = $(PREFIX)/bin -+BIN_DIR ?= $(PREFIX)/bin - - # MAN_DIR indicates directory where the jdupes man page is to be - # installed. Suggested value is "$(PREFIX)/man/man1" --MAN_BASE_DIR = $(PREFIX)/share/man -+MAN_BASE_DIR ?= $(PREFIX)/share/man - MAN_DIR = $(MAN_BASE_DIR)/man1 - MAN_EXT = 1 - diff --git a/jdupes.spec b/jdupes.spec index 18a481d..b055b81 100644 --- a/jdupes.spec +++ b/jdupes.spec @@ -5,13 +5,12 @@ Version: 1.20.2 %forgemeta Name: jdupes -Release: 1%{?dist} +Release: 2%{?dist} Summary: Duplicate file finder and an enhanced fork of 'fdupes' License: MIT URL: %{forgeurl} Source0: %{forgesource} -Patch0: jdupes-1.20.0-Makefile.patch BuildRequires: gcc BuildRequires: make @@ -31,11 +30,10 @@ prompting the user." %prep %forgesetup -%patch0 -p1 %build -%make_build CFLAGS="%{optflags}" PREFIX="%{_prefix}" MAN_BASE_DIR="%{_mandir}" +%make_build ENABLE_DEDUPE=1 CFLAGS_EXTRA="%{optflags}" PREFIX="%{_prefix}" MAN_BASE_DIR="%{_mandir}" %install @@ -50,6 +48,9 @@ prompting the user." %changelog +* Fri Dec 24 2021 Matthew Miller - 1.20.2-2 +- Actually enable DEDUPE support at build time :) + * Mon Dec 20 2021 David Cantrell - 1.20.2-1 - Upgrade to jdupes-1.20.2