From 1c0d3136d6014b3edad9cc1bb97e38dd3711bbf6d4e9f624c91ab7814db86edc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Jun 2020 14:24:23 +0000 Subject: [PATCH 1/3] 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 + +- 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 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} From ea56337bf1d69173950cc8bb84438540f333c7127b439ab32c87eeba77cbd469 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 9 Jun 2020 07:36:52 +0000 Subject: [PATCH 2/3] Accepting request 811952 from home:jengelh:branches:utilities - Use noun phrase in summary. Drop old specfile constructs. OBS-URL: https://build.opensuse.org/request/show/811952 OBS-URL: https://build.opensuse.org/package/show/utilities/fdupes?expand=0&rev=21 --- fdupes.changes | 5 +++++ fdupes.spec | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/fdupes.changes b/fdupes.changes index 71a03c4..166d897 100644 --- a/fdupes.changes +++ b/fdupes.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 5 23:42:10 UTC 2020 - Jan Engelhardt + +- Use noun phrase in summary. Drop old specfile constructs. + ------------------------------------------------------------------- Fri May 22 08:27:11 UTC 2020 - Paolo Stivanin diff --git a/fdupes.spec b/fdupes.spec index 7f3a67f..d6a17c6 100644 --- a/fdupes.spec +++ b/fdupes.spec @@ -20,7 +20,7 @@ Name: fdupes Version: 2.0.0 Release: 0 -Summary: Identifying or deleting duplicate files +Summary: Tool to identify or delete duplicate files License: MIT Group: Productivity/Archiving/Compression Url: https://github.com/adrianlopezroche/fdupes @@ -28,14 +28,13 @@ Source0: https://github.com/adrianlopezroche/fdupes/releases/download/%{v Source1: macros.fdupes BuildRequires: ncurses-devel BuildRequires: pcre2-devel -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description FDUPES is a program for identifying or deleting duplicate files residing within specified directories. %prep -%setup -q -n %{name}-%{version} +%autosetup -p1 %build %configure @@ -53,7 +52,6 @@ install -D -m644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.%{name} ./%{name} --size testdir %files -%defattr(-, root, root) %doc CHANGES %{_bindir}/%{name} %{_mandir}/man1/%{name}.1* From c440bc51227070b7da613168039f581ccac36ac13014b27e70ccbd03c32c22c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Aug 2020 08:29:52 +0000 Subject: [PATCH 3/3] Accepting request 827069 from home:dirkmueller:branches:utilities - update to 2.1.2: * Do not enter ncurses mode when --immediate option given. * Fix logging/memory corruption bug when using --log with --immediate. * Break mtime ties using ctime when sorting by time. * Reduce number of calls to stat(), for speed. * Clear last command status when new command is entered. * Rename cs command ("clear all selections") from cs to csel. * Rename igs command ("invert selections") from igs to isel. * Add "prune" command as synonym for DELETE key. * Clear selections after deleting files via prune/DELETE. * Fix dependency issues when fdupes is configured to not use ncurses. - build without ncurses for now until buildcycles can be solved OBS-URL: https://build.opensuse.org/request/show/827069 OBS-URL: https://build.opensuse.org/package/show/utilities/fdupes?expand=0&rev=22 --- fdupes-2.0.0.tar.gz | 3 --- fdupes-2.1.2.tar.gz | 3 +++ fdupes.changes | 16 ++++++++++++++++ fdupes.spec | 11 ++++------- 4 files changed, 23 insertions(+), 10 deletions(-) delete mode 100644 fdupes-2.0.0.tar.gz create mode 100644 fdupes-2.1.2.tar.gz diff --git a/fdupes-2.0.0.tar.gz b/fdupes-2.0.0.tar.gz deleted file mode 100644 index c006581..0000000 --- a/fdupes-2.0.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:eb9e3bd3e722ebb2a272e45a1073f78c60f8989b151c3661421b86b14b203410 -size 137705 diff --git a/fdupes-2.1.2.tar.gz b/fdupes-2.1.2.tar.gz new file mode 100644 index 0000000..462dcb3 --- /dev/null +++ b/fdupes-2.1.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd5cb53b6d898cf20f19b57b81114a5b263cc1149cd0da3104578b083b2837bd +size 142266 diff --git a/fdupes.changes b/fdupes.changes index 166d897..db1e37f 100644 --- a/fdupes.changes +++ b/fdupes.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Sun Aug 16 16:59:45 UTC 2020 - Dirk Mueller + +- update to 2.1.2: + * Do not enter ncurses mode when --immediate option given. + * Fix logging/memory corruption bug when using --log with --immediate. + * Break mtime ties using ctime when sorting by time. + * Reduce number of calls to stat(), for speed. + * Clear last command status when new command is entered. + * Rename cs command ("clear all selections") from cs to csel. + * Rename igs command ("invert selections") from igs to isel. + * Add "prune" command as synonym for DELETE key. + * Clear selections after deleting files via prune/DELETE. + * Fix dependency issues when fdupes is configured to not use ncurses. +- build without ncurses for now until buildcycles can be solved + ------------------------------------------------------------------- Fri Jun 5 23:42:10 UTC 2020 - Jan Engelhardt diff --git a/fdupes.spec b/fdupes.spec index d6a17c6..4fb6764 100644 --- a/fdupes.spec +++ b/fdupes.spec @@ -18,16 +18,14 @@ %{?!_rpmmacrodir:%define _rpmmacrodir /usr/lib/rpm/macros.d} Name: fdupes -Version: 2.0.0 +Version: 2.1.2 Release: 0 Summary: Tool to identify or delete duplicate files License: MIT Group: Productivity/Archiving/Compression Url: https://github.com/adrianlopezroche/fdupes -Source0: https://github.com/adrianlopezroche/fdupes/releases/download/%{version}/fdupes-%{version}.tar.gz +Source0: https://github.com/adrianlopezroche/fdupes/releases/download/v%{version}/fdupes-%{version}.tar.gz Source1: macros.fdupes -BuildRequires: ncurses-devel -BuildRequires: pcre2-devel %description FDUPES is a program for identifying or deleting duplicate files @@ -37,12 +35,11 @@ residing within specified directories. %autosetup -p1 %build -%configure +%configure --without-ncurses %make_build %install -install -D -m755 %{name} %{buildroot}%{_bindir}/%{name} -install -D -m644 %{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 +%make_install install -D -m644 %{SOURCE1} %{buildroot}%{_rpmmacrodir}/macros.%{name} %check