From 77b43b5fa8828fb076080268f019b31bad0b119cb0b76318897c4f50c5758121 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 16 Dec 2016 22:59:40 +0000
Subject: [PATCH] Accepting request 446737 from home:psimons:branches:utilities

We cannot update from fdupes 1.51 to 1.6.1. That "downgrade"
works okay'ish for Tumbleweed because we can replace the old
package with the new one, but in SLE this is not possible. We
asked upstream to please release a "2.0" version to remedy these
issues (https://github.com/adrianlopezroche/fdupes/issues/74),
but he does not respond. Therefore, we'll call this version 1.61,
ignoring upstreams change in the versioning scheme.

OBS-URL: https://build.opensuse.org/request/show/446737
OBS-URL: https://build.opensuse.org/package/show/utilities/fdupes?expand=0&rev=17
---
 fdupes.changes | 11 +++++++++++
 fdupes.spec    | 14 +++++++-------
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/fdupes.changes b/fdupes.changes
index 00f331f..04694a6 100644
--- a/fdupes.changes
+++ b/fdupes.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Dec 16 12:40:20 UTC 2016 - psimons@suse.com
+
+- We cannot update from fdupes 1.51 to 1.6.1. That "downgrade"
+  works okay'ish for Tumbleweed because we can replace the old
+  package with the new one, but in SLE this is not possible. We
+  asked upstream to please release a "2.0" version to remedy these
+  issues (https://github.com/adrianlopezroche/fdupes/issues/74),
+  but he does not respond. Therefore, we'll call this version 1.61,
+  ignoring upstreams change in the versioning scheme.
+
 -------------------------------------------------------------------
 Mon Dec  5 13:54:08 UTC 2016 - psimons@suse.com
 
diff --git a/fdupes.spec b/fdupes.spec
index 840edbd..66b3daa 100644
--- a/fdupes.spec
+++ b/fdupes.spec
@@ -15,22 +15,22 @@
 # 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
 
 Name:           fdupes
-Version:        1.6.1
+Version:        1.61
 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%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Source0:        https://github.com/adrianlopezroche/fdupes/archive/v%{upstream_version}.tar.gz#/%{name}-%{upstream_version}.tar.gz
 Source1:        macros.fdupes
 #PATCH-FIX-SUSE: fix patch according distro's needs
 Patch0:         fdupes-makefile.patch
-# Upstream changed their versioning scheme after 1.51 in a way that zypper
-# won't recognize as an update without help.
-Provides:       %{name} = 1.51.%{version}
-Obsoletes:      %{name} < 1.51.%{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -38,7 +38,7 @@ FDUPES is a program for identifying or deleting duplicate files
 residing within specified directories.
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{upstream_version}
 %patch0
 
 %build