From 27905a83835edeaea815709456f97fcdfce7629b Mon Sep 17 00:00:00 2001
From: basebuilder_pel7x64builder0 <basebuilder@powerel.org>
Date: Mon, 14 Dec 2020 16:59:17 +0100
Subject: [PATCH] rpmdevtools package update

Signed-off-by: basebuilder_pel7x64builder0 <basebuilder@powerel.org>
---
 ...BZ-1337544-spectool-url-ignore-query.patch | 34 +++++++++++++++++++
 SPECS/rpmdevtools.spec                        | 15 ++++++--
 2 files changed, 46 insertions(+), 3 deletions(-)
 create mode 100644 SOURCES/BZ-1337544-spectool-url-ignore-query.patch

diff --git a/SOURCES/BZ-1337544-spectool-url-ignore-query.patch b/SOURCES/BZ-1337544-spectool-url-ignore-query.patch
new file mode 100644
index 00000000..49ff2602
--- /dev/null
+++ b/SOURCES/BZ-1337544-spectool-url-ignore-query.patch
@@ -0,0 +1,34 @@
+commit 26a8abc746fba9c0b32eb899b96c92841a37855a
+Author: Michal Domonkos <mdomonko@redhat.com>
+Date:   Thu Mar 26 17:00:46 2020 +0100
+
+    spectool: ignore query string in URL. BZ 1337544
+    
+    When constructing the target filename from the given Source or Patch URL
+    (sub retrieve), do not include the query string (if present).
+    
+    Example:
+    * Before: http://some.url/foo.tgz?arg=123 => ./foo.tgz?arg=123
+    * After:  http://some.url/foo.tgz?arg=123 => ./foo.tgz
+    
+    Regex explanation:
+    * 1st group: ([^\/]+?)
+        * Lazily matches one or more characters that are not a forward slash
+    * 2nd group: (?:\?.*)?$
+        * Matches a query string (if any) starting with a question mark,
+          followed by zero or more characters until the end of string,
+          without creating a capturing group (the leading ?:)
+
+diff --git a/spectool.in b/spectool.in
+index 6f7499c..0ebf401 100644
+--- a/spectool.in
++++ b/spectool.in
+@@ -198,7 +198,7 @@ sub retrievable {
+ sub retrieve {
+ 	my ($where, $url) = @_;
+ 	if (retrievable ($url)) {
+-		my $path = File::Spec->catfile($where, $url =~ m|([^/]+)$|);
++		my $path = File::Spec->catfile($where, $url =~ m|([^\/]+?)(?:\?.*)?$|);
+ 		print "Getting $url to $path\n";
+ 		if (-e $path) {
+ 			if ($force) {
diff --git a/SPECS/rpmdevtools.spec b/SPECS/rpmdevtools.spec
index f9750898..6d66d9df 100644
--- a/SPECS/rpmdevtools.spec
+++ b/SPECS/rpmdevtools.spec
@@ -2,14 +2,15 @@
 
 Name:           rpmdevtools
 Version:        8.3
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        RPM Development Tools
 
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
 License:        GPLv2+ and GPLv2
-URL:            https://fedorahosted.org/rpmdevtools/
-Source0:        https://fedorahosted.org/released/rpmdevtools/%{name}-%{version}.tar.xz
+URL:            https://pagure.io/rpmdevtools
+Source0:        https://releases.pagure.org/rpmdevtools/%{name}-%{version}.tar.xz
 Patch0:         rpmdevtools-8.3-no_qa_robot.patch
+Patch1:         BZ-1337544-spectool-url-ignore-query.patch
 BuildArch:      noarch
 # help2man, pod2man, *python for creating man pages
 BuildRequires:  help2man
@@ -64,6 +65,7 @@ rpmdev-bumpspec     Bump revision in specfile
 %setup -q
 %if ! 0%{?fedora}
 %patch0 -p1 -b .no_qa_robot
+%patch1 -p1
 %endif
 
 
@@ -104,6 +106,13 @@ done
 
 
 %changelog
+* Thu Apr 16 2020 Michal Domonkos <mdomonko@redhat.com> - 8.3-7
+- Actually apply the spectool patch (RHBZ#1337544)
+
+* Mon Mar 30 2020 Michal Domonkos <mdomonko@redhat.com> - 8.3-6
+- spectool: ignore query string in URL (RHBZ#1337544)
+- Update upstream URLs (RHBZ#1502423)
+
 * Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 8.3-5
 - Mass rebuild 2013-12-27