From 3dee436027da0ba8920dd24cd078ef7d0b66c6a0 Mon Sep 17 00:00:00 2001
From: Christophe Grenier <grenier@cgsecurity.org>
Date: Wed, 6 Apr 2022 13:29:33 +0200
Subject: [PATCH] copr: Build failed on copr.fedorainfracloud.org since
 rpkg-util has been updated to v3. Update spec files to try to fix the
 problem.

---
 copr/cygwin-testdisk.spec | 11 ++++++-----
 copr/mingw-testdisk.spec  |  7 ++++---
 copr/testdisk.spec        |  9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/copr/cygwin-testdisk.spec b/copr/cygwin-testdisk.spec
index 92efbe1f..ffd8218b 100644
--- a/copr/cygwin-testdisk.spec
+++ b/copr/cygwin-testdisk.spec
@@ -1,7 +1,7 @@
 %{?cygwin_package_header}
 
 Name:		cygwin-testdisk
-Version:	7.2
+Version:	{{{ git_dir_version }}}
 Release:	0%{?dist}
 Summary:	TestDisk checks and undeletes partitions, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narzędzie sprawdzające i odzyskujące partycje
@@ -10,7 +10,8 @@ Summary(ru_RU.UTF8): Программа для проверки и восста
 License:	GPLv2+
 Group:		Applications/System
 URL:		https://www.cgsecurity.org/wiki/TestDisk
-Source0:	https://www.cgsecurity.org/testdisk-%{version}.tar.bz2
+VCS:		{{{ git_dir_vcs }}}
+Source0:	{{{ git_dir_pack }}}
 
 BuildArch:	noarch
 BuildRequires:	libtool autoconf automake
@@ -26,7 +27,7 @@ BuildRequires:	cygwin32-libjpeg-turbo
 BuildRequires:	cygwin32-ntfsprogs
 BuildRequires:	cygwin32-ncurses
 BuildRequires:	cygwin32-zlib
-BuildRequires:  cygwin32-pkg-config
+BuildRequires:	cygwin32-pkg-config
 
 BuildRequires:	cygwin64-binutils
 BuildRequires:	cygwin64-filesystem >= 9
@@ -38,7 +39,7 @@ BuildRequires:	cygwin64-ntfsprogs
 BuildRequires:	cygwin64-ncurses
 BuildRequires:	cygwin64-libiconv
 BuildRequires:	cygwin64-zlib
-BuildRequires:  cygwin64-pkg-config
+BuildRequires:	cygwin64-pkg-config
 
 %description
 Cygwin compiled testdisk.
@@ -112,7 +113,7 @@ PhotoRec is a signature based file recovery utility. It handles more than
 %{?cygwin_debug_package}
 
 %prep
-%setup -q
+{{{ git_dir_setup_macro }}}
 
 %build
 autoreconf -vif -I config -W all
diff --git a/copr/mingw-testdisk.spec b/copr/mingw-testdisk.spec
index 19eed713..4e285f84 100644
--- a/copr/mingw-testdisk.spec
+++ b/copr/mingw-testdisk.spec
@@ -1,7 +1,7 @@
 %{?mingw_package_header}
 
 Name:		mingw-testdisk
-Version:	7.2
+Version:	{{{ git_dir_version }}}
 Release:	0%{?dist}
 Summary:	TestDisk checks and undeletes partitions, PhotoRec recovers lost files
 Summary(pl.UTF8):	Narzędzie sprawdzające i odzyskujące partycje
@@ -10,7 +10,8 @@ Summary(ru_RU.UTF8): Программа для проверки и восста
 License:	GPLv2+
 Group:		Applications/System
 URL:		https://www.cgsecurity.org/wiki/TestDisk
-Source0:	https://www.cgsecurity.org/testdisk-%{version}.tar.bz2
+VCS:		{{{ git_dir_vcs }}}
+Source0:	{{{ git_dir_pack }}}
 
 BuildArch:	noarch
 BuildRequires:	libtool autoconf automake
@@ -119,7 +120,7 @@ PhotoRec is a signature based file recovery utility. It handles more than
 %{?mingw_debug_package}
 
 %prep
-%setup -q
+{{{ git_dir_setup_macro }}}
 
 %build
 autoreconf -vif -I config -W all
diff --git a/copr/testdisk.spec b/copr/testdisk.spec
index 1e42dad5..cadb5ea1 100644
--- a/copr/testdisk.spec
+++ b/copr/testdisk.spec
@@ -3,12 +3,13 @@ Summary(pl.UTF8):	Narzędzie sprawdzające i odzyskujące partycje
 Summary(fr.UTF8):	Outil pour vérifier et restaurer des partitions
 Summary(ru_RU.UTF8): Программа для проверки и восстановления разделов диска
 Name:		testdisk
-Version:	7.2
+Version:	{{{ git_dir_version }}}
 Release:	0%{?dist}
 License:	GPLv2+
 Group:		Applications/System
-Source0:	https://www.cgsecurity.org/testdisk-%{version}.tar.bz2
+Source0:	{{{ git_dir_pack }}}
 URL:		https://www.cgsecurity.org/wiki/TestDisk
+VCS:		{{{ git_dir_vcs }}}
 BuildRequires:	libtool autoconf automake
 BuildRequires:	make
 BuildRequires:	desktop-file-utils
@@ -22,7 +23,7 @@ BuildRequires:	ntfs-3g-devel
 BuildRequires:	zlib-devel
 %if  0%{?rhel} != 5
 BuildRequires:	libuuid-devel
-BuildRequires:  qt5-linguist
+BuildRequires:	qt5-linguist
 BuildRequires:	qt5-qtbase-devel
 %endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -71,7 +72,7 @@ OpenOffice documents.
 %endif
 
 %prep
-%setup -q
+{{{ git_dir_setup_macro }}}
 
 %build
 autoreconf -vif -I config -W all