From 1c0d3136d6014b3edad9cc1bb97e38dd3711bbf6d4e9f624c91ab7814db86edc Mon Sep 17 00:00:00 2001
From: Peter Simons <peter.simons@suse.com>
Date: Fri, 5 Jun 2020 14:24:23 +0000
Subject: [PATCH] Accepting request 811804 from
 home:polslinux:branches:utilities

- Update to v2.0.0
  * Add ncurses mode for interactive file deletion (plain mode still available via --plain or ./configure).
  * Add --minsize option.
  * Add --maxsize option.
  * Add --time option.
  * Add --order=ctime option.
  * Add --log option.
  * Use configure script for installation (Autotools/Automake).
- Remove fdupes-makefile.patch

OBS-URL: https://build.opensuse.org/request/show/811804
OBS-URL: https://build.opensuse.org/package/show/utilities/fdupes?expand=0&rev=20
---
 fdupes-1.6.1.tar.gz   |  3 ---
 fdupes-2.0.0.tar.gz   |  3 +++
 fdupes-makefile.patch | 13 -------------
 fdupes.changes        | 13 +++++++++++++
 fdupes.spec           | 19 +++++++------------
 5 files changed, 23 insertions(+), 28 deletions(-)
 delete mode 100644 fdupes-1.6.1.tar.gz
 create mode 100644 fdupes-2.0.0.tar.gz
 delete mode 100644 fdupes-makefile.patch

diff --git a/fdupes-1.6.1.tar.gz b/fdupes-1.6.1.tar.gz
deleted file mode 100644
index 1b4ae27..0000000
--- a/fdupes-1.6.1.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9d6b6fdb0b8419815b4df3bdfd0aebc135b8276c90bbbe78ebe6af0b88ba49ea
-size 20869
diff --git a/fdupes-2.0.0.tar.gz b/fdupes-2.0.0.tar.gz
new file mode 100644
index 0000000..c006581
--- /dev/null
+++ b/fdupes-2.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:eb9e3bd3e722ebb2a272e45a1073f78c60f8989b151c3661421b86b14b203410
+size 137705
diff --git a/fdupes-makefile.patch b/fdupes-makefile.patch
deleted file mode 100644
index 1884f2d..0000000
--- a/fdupes-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: Makefile
-===================================================================
---- Makefile.orig	2016-08-21 06:54:46.000000000 +0200
-+++ Makefile	2016-11-04 13:46:21.037423459 +0100
-@@ -11,7 +11,7 @@
- # determination of the actual installation directories.
- # Suggested values are "/usr/local", "/usr", "/pkgs/fdupes-$(VERSION)"
- #
--PREFIX = /usr/local
-+PREFIX = /usr
- 
- #
- # When compiling for 32-bit systems, FILEOFFSET_64BIT must be enabled
diff --git a/fdupes.changes b/fdupes.changes
index aeec205..71a03c4 100644
--- a/fdupes.changes
+++ b/fdupes.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri May 22 08:27:11 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- Update to v2.0.0
+  * Add ncurses mode for interactive file deletion (plain mode still available via --plain or ./configure).
+  * Add --minsize option.
+  * Add --maxsize option.
+  * Add --time option.
+  * Add --order=ctime option.
+  * Add --log option.
+  * Use configure script for installation (Autotools/Automake).
+- Remove fdupes-makefile.patch
+
 -------------------------------------------------------------------
 Thu Apr 16 21:07:45 UTC 2020 - Matej Cepl <mcepl@suse.com>
 
diff --git a/fdupes.spec b/fdupes.spec
index 9a45030..7f3a67f 100644
--- a/fdupes.spec
+++ b/fdupes.spec
@@ -15,24 +15,19 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# Upstream calls this version 1.6.1, but that version number is *lower* than
-# previously released ones, like 1.51, so we mangle the number to keep
-# continuity: https://github.com/adrianlopezroche/fdupes/issues/74.
-%global upstream_version 1.6.1
-
 %{?!_rpmmacrodir:%define _rpmmacrodir /usr/lib/rpm/macros.d}
 
 Name:           fdupes
-Version:        1.61
+Version:        2.0.0
 Release:        0
 Summary:        Identifying or deleting duplicate files
 License:        MIT
 Group:          Productivity/Archiving/Compression
 Url:            https://github.com/adrianlopezroche/fdupes
-Source0:        https://github.com/adrianlopezroche/fdupes/archive/v%{upstream_version}.tar.gz#/%{name}-%{upstream_version}.tar.gz
+Source0:        https://github.com/adrianlopezroche/fdupes/releases/download/%{version}/fdupes-%{version}.tar.gz
 Source1:        macros.fdupes
-#PATCH-FIX-SUSE: fix patch according distro's needs
-Patch0:         fdupes-makefile.patch
+BuildRequires:  ncurses-devel
+BuildRequires:  pcre2-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -40,11 +35,11 @@ FDUPES is a program for identifying or deleting duplicate files
 residing within specified directories.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
-%patch0
+%setup -q -n %{name}-%{version}
 
 %build
-make %{?_smp_mflags} COMPILER_OPTIONS="%{optflags}"
+%configure
+%make_build
 
 %install
 install -D -m755 %{name} %{buildroot}%{_bindir}/%{name}