From d66449ace6500e9a645c62f09f641b373df0d3ab Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Dec 15 2020 09:07:57 +0000
Subject: import rpmdevtools-8.3-8.el7_9


---

diff --git a/SOURCES/BZ-1337544-spectool-url-ignore-query.patch b/SOURCES/BZ-1337544-spectool-url-ignore-query.patch
index 49ff260..fa58905 100644
--- a/SOURCES/BZ-1337544-spectool-url-ignore-query.patch
+++ b/SOURCES/BZ-1337544-spectool-url-ignore-query.patch
@@ -1,34 +1,12 @@
-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 {
+diff -up rpmdevtools-8.3/spectool.in.orig rpmdevtools-8.3/spectool.in
+--- rpmdevtools-8.3/spectool.in.orig	2020-11-23 14:17:49.231979840 +0100
++++ rpmdevtools-8.3/spectool.in	2020-11-23 14:18:30.411761075 +0100
+@@ -201,7 +201,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|([^\/]+?)(?:\?.*)?$|);
++		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 6d66d9d..5d67ad2 100644
--- a/SPECS/rpmdevtools.spec
+++ b/SPECS/rpmdevtools.spec
@@ -2,7 +2,7 @@
 
 Name:           rpmdevtools
 Version:        8.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        RPM Development Tools
 
 # rpmdev-setuptree is GPLv2, everything else GPLv2+
@@ -106,6 +106,9 @@ done
 
 
 %changelog
+* Mon Nov 23 2020 Michal Domonkos <mdomonko@redhat.com> - 8.3-8
+- spectool: fix regression in URL fragment handling (RHBZ#1899112)
+
 * Thu Apr 16 2020 Michal Domonkos <mdomonko@redhat.com> - 8.3-7
 - Actually apply the spectool patch (RHBZ#1337544)