Update to 1.5.1

- New upstream release
- Rebase sb2 patches

Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>

11 files changed, 60 insertions, 91 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c1cce54c8ab3..d1d5fa0f92a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = osc
 	pkgdesc = Command line client for the openSUSE Build Service
-	pkgver = 1.5.0
+	pkgver = 1.5.1
 	pkgrel = 1
 	url = https://github.com/openSUSE/osc
 	arch = any
@@ -19,25 +19,23 @@ pkgbase = osc
 	conflicts = zsh-completion-osc
 	replaces = osc-bash-completion
 	replaces = zsh-completion-osc
-	source = https://github.com/openSUSE/osc/archive/1.5.0.tar.gz
-	source = 0001-remove-public-route-from-osc.patch
-	source = 0002-Add-sb2install-support-to-osc.patch
-	source = 0003-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
-	source = 0004-Support-synchronous-copyproj.patch
-	source = 0005-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
-	source = 0006-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
-	source = 0007-Add-architecture-and-scheduler-maps.patch
-	source = 0008-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
-	source = 0009-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
-	sha256sums = 7d3be5b17338f11767441c451c50137356756b51786d0296e751f2fef1c87e27
-	sha256sums = 06cdc1134dcfec28af98b3738189c8794cf898fa2578a7a2947acc3102b16094
+	source = https://github.com/openSUSE/osc/archive/1.5.1.tar.gz
+	source = 0001-Add-sb2install-support-to-osc.patch
+	source = 0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
+	source = 0003-Support-synchronous-copyproj.patch
+	source = 0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
+	source = 0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
+	source = 0006-Add-architecture-and-scheduler-maps.patch
+	source = 0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
+	source = 0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
+	sha256sums = 17b1268413561b3d1b8564d3d1ed8f025efa34774497df4d54205b6cf0882c28
 	sha256sums = 1e4a61c7ae267812de89459c715baa66115851d0f213f95f4ac46fe0f67802a3
-	sha256sums = d5415d2ad620ec8ff9c5ea9b97b78ed76eef4ead4b11892465f6a96a015a03b7
-	sha256sums = a857b48a3c9d698c8ab347509dafb67cfe201f882a0d90f9738c6386945ca3b6
-	sha256sums = eba2c169e52fb5b0e722591f67b8c93615610a66acfb5e660a65fc8fb9f0c81c
-	sha256sums = 83219095de865463ce82206b50fc975c4a4de86e5af3415c8f41ed8de9d2ebd1
+	sha256sums = 3ebca3c11b6985e3e90386662f21e8c6f7cc35d318ad48581069addd1a786c2f
+	sha256sums = ec60ca441997437044dd0847b275a2ee468b7ea8f9ae5f3ef35813e30008f075
+	sha256sums = 5dd6f4f56b80b82683bca27aca25a5c84315850193bdbee512f221df6f8023bf
+	sha256sums = 47f3d68a74b60fc2a8942b4a35dceb15c1ee9daf64bb6d64641e732bd0c9a506
 	sha256sums = eae5f978b8385db3acae46df96fc4973f306c4a640389165a8ac54469d370e5b
-	sha256sums = d2ba1b665101e28673c65912b7bc9095dbdc02049fb8c8d83f1809a441132d8f
+	sha256sums = e98744f2644f3358280c81375f129f65289f8ed964bddcadfce40077ab7afe4e
 	sha256sums = 67c916cd7ba9dcd4899477c223c79f7087c0a0077d33f95ccb465b790e052547
 
 pkgname = osc
diff --git a/0002-Add-sb2install-support-to-osc.patch b/0001-Add-sb2install-support-to-osc.patch
index efdb5898e9f6..efdb5898e9f6 100644
--- a/0002-Add-sb2install-support-to-osc.patch
+++ b/0001-Add-sb2install-support-to-osc.patch
diff --git a/0001-remove-public-route-from-osc.patch b/0001-remove-public-route-from-osc.patch
deleted file mode 100644
index fb8f8f4701a8..000000000000
--- a/0001-remove-public-route-from-osc.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Marco Strigl <mstrigl@suse.com>
-Date: Wed, 22 Nov 2023 14:33:06 +0100
-Subject: [PATCH] remove public route from osc
-
----
- osc/commandline.py | 2 +-
- osc/core.py        | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/osc/commandline.py b/osc/commandline.py
-index f2892b827c795b4e0218761a20243bf8c4985093..b7c19bc63e1dbd5566ead116890df62a72a4bb05 100644
---- a/osc/commandline.py
-+++ b/osc/commandline.py
-@@ -4860,7 +4860,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
-         return (parent_project, parent_package)
- 
-     def _pdiff_get_exists_and_parent(self, apiurl, project, package):
--        link_url = makeurl(apiurl, ['public', 'source', project, package])
-+        link_url = makeurl(apiurl, ['source', project, package])
-         try:
-             file = http_GET(link_url)
-             root = ET.parse(file).getroot()
-diff --git a/osc/core.py b/osc/core.py
-index bda78ddf70a8990588ebb3752802cce46ef8bd4d..3a5543dc356d9831d5f868ff0ae62155e4135682 100644
---- a/osc/core.py
-+++ b/osc/core.py
-@@ -3938,7 +3938,7 @@ def show_pattern_meta(apiurl: str, prj: str, pattern: str):
- 
- 
- def show_configuration(apiurl):
--    u = makeurl(apiurl, ['public', 'configuration'])
-+    u = makeurl(apiurl, ['configuration'])
-     f = http_GET(u)
-     return f.readlines()
- 
diff --git a/0003-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch b/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
index 0a35306e86f9..92d70cce58d0 100644
--- a/0003-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
+++ b/0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
@@ -13,7 +13,7 @@ Subject: [PATCH] Support 'osc copyprj' in api by Islam Amer usage: osc copyprj
  2 files changed, 80 insertions(+)
 
 diff --git a/osc/commandline.py b/osc/commandline.py
-index b7c19bc63e1dbd5566ead116890df62a72a4bb05..ad45daa45efbb4f4e53e2bcc03e6731a22e78e59 100644
+index b7c19bc63e1dbd5566ead116890df62a72a4bb05..7fc9dd5c47cb46d494f206a94793511e5fe901de 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
 @@ -2106,6 +2106,58 @@ class Osc(cmdln.Cmdln):
@@ -22,7 +22,7 @@ index b7c19bc63e1dbd5566ead116890df62a72a4bb05..ad45daa45efbb4f4e53e2bcc03e6731a
  
 +    @cmdln.option('-b', '--with-binaries', action='store_true',
 +                        help='copy the built binaries over to avoid a rebuild')
-+    @cmdln.option('-x', '--with-history', action='store_true',
++    @cmdln.option('-H', '--with-history', action='store_true',
 +                        help='replicate the history of each package.')
 +    @cmdln.option('-o', '--make-older', action='store_true',
 +                        help='No idea')
diff --git a/0004-Support-synchronous-copyproj.patch b/0003-Support-synchronous-copyproj.patch
index 9f08c4657278..be6599cb2f9e 100644
--- a/0004-Support-synchronous-copyproj.patch
+++ b/0003-Support-synchronous-copyproj.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Support synchronous copyproj
  2 files changed, 7 insertions(+)
 
 diff --git a/osc/commandline.py b/osc/commandline.py
-index ad45daa45efbb4f4e53e2bcc03e6731a22e78e59..d67a4184afac79795c2e3dd7a2ca1ad64d77fe9a 100644
+index 7fc9dd5c47cb46d494f206a94793511e5fe901de..46bbc28087338961ff09cabc964ae0024a73001c 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
 @@ -2108,6 +2108,8 @@ class Osc(cmdln.Cmdln):
@@ -18,7 +18,7 @@ index ad45daa45efbb4f4e53e2bcc03e6731a22e78e59..d67a4184afac79795c2e3dd7a2ca1ad6
                          help='copy the built binaries over to avoid a rebuild')
 +    @cmdln.option('-n', '--now', action='store_true',
 +                  help='copy synchronously (may take some time to complete)')
-     @cmdln.option('-x', '--with-history', action='store_true',
+     @cmdln.option('-H', '--with-history', action='store_true',
                          help='replicate the history of each package.')
      @cmdln.option('-o', '--make-older', action='store_true',
 @@ -2126,6 +2128,8 @@ class Osc(cmdln.Cmdln):
diff --git a/0005-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch b/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
index fc5258ec16db..104f9103df49 100644
--- a/0005-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
+++ b/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Add -p to copyprj to enable copying of prjconf
  2 files changed, 8 insertions(+)
 
 diff --git a/osc/commandline.py b/osc/commandline.py
-index d67a4184afac79795c2e3dd7a2ca1ad64d77fe9a..2eff6bfb2a38a7919d2c1850a57f49ebe7feba92 100644
+index 46bbc28087338961ff09cabc964ae0024a73001c..c7ad5927974123bae6e31bd23057ffd6f6d1ecdd 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
 @@ -2114,6 +2114,8 @@ class Osc(cmdln.Cmdln):
@@ -21,33 +21,42 @@ index d67a4184afac79795c2e3dd7a2ca1ad64d77fe9a..2eff6bfb2a38a7919d2c1850a57f49eb
      @cmdln.option('-r', '--re-sign', action='store_true',
                          help='re-sign the binaries')
      @cmdln.option('-m', '--message', metavar='TEXT',
-@@ -2159,6 +2161,7 @@ class Osc(cmdln.Cmdln):
+@@ -2156,6 +2158,7 @@ class Osc(cmdln.Cmdln):
+         r = copy_prj(src_apiurl, src_project, dst_project,
+                      withbinaries = opts.with_binaries,
+                      withhistory = opts.with_history,
++                     withprjconf = opts.prjconf,
                       makeolder = opts.make_older,
                       resign = opts.re_sign,
                       now = opts.now,
-+                     prjconf = opts.prjconf,
-                      comment = comment)
-         print("done cp")
-         print(r)
 diff --git a/osc/core.py b/osc/core.py
-index d3d4ca9cf3b3cfc6ad966fa3692cfa019d8d567c..66b51f437df47cb09cb7b440338836cf9a79ec62 100644
+index d3d4ca9cf3b3cfc6ad966fa3692cfa019d8d567c..d79c1bac7e35daa73a700344c23410be16adfe9e 100644
 --- a/osc/core.py
 +++ b/osc/core.py
-@@ -6284,6 +6284,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
+@@ -6282,8 +6282,10 @@ def copy_pac(
+ def copy_prj(src_apiurl, src_project, dst_project,
+              withbinaries = False,
               withhistory = False,
++             withprjconf = False,
               makeolder = False,
               resign = False,
 +             now = False,
-+             prjconf = False,
               comment = None):
      """
      Create a copy of a project.
-@@ -6305,6 +6307,9 @@ def copy_prj(src_apiurl, src_project, dst_project,
+@@ -6297,6 +6299,8 @@ def copy_prj(src_apiurl, src_project, dst_project,
+         query['withbinaries'] = '1'
+     if withhistory:
+         query['withhistory'] = '1'
++    if withprjconf:
++        query['withprjconf'] = '1'
+     if makeolder:
+         query['makeolder'] = '1'
+     if resign:
+@@ -6305,6 +6309,7 @@ def copy_prj(src_apiurl, src_project, dst_project,
          query['comment'] = comment
      if now:
          query['nodelay'] = '1'
-+    if prjconf:
-+        query['prjconf'] = '1'
 +
      u = makeurl(src_apiurl, ['source', dst_project], query=query)
      print("copyprj ", u, file=sys.stderr)
diff --git a/0006-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch b/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
index 44568de74396..01cbfebde5e4 100644
--- a/0006-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
+++ b/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
@@ -31,7 +31,7 @@ index 096e6c40998e35650b857d09cce41cfc95e10f67..ef18a0b8cb61ae96a013f526775cd764
          buildargs.append('--no-checks')
      if not opts.no_changelog:
 diff --git a/osc/commandline.py b/osc/commandline.py
-index 2eff6bfb2a38a7919d2c1850a57f49ebe7feba92..2e575eddd4aa044ca53c4677fd8a99a8d92890c8 100644
+index c7ad5927974123bae6e31bd23057ffd6f6d1ecdd..2866ceead87dd276b10ac845f9a996c67e350704 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
 @@ -7119,6 +7119,10 @@ Please submit there instead, or use --nodevelproject to force direct submission.
diff --git a/0007-Add-architecture-and-scheduler-maps.patch b/0006-Add-architecture-and-scheduler-maps.patch
index e38914d086bb..e38914d086bb 100644
--- a/0007-Add-architecture-and-scheduler-maps.patch
+++ b/0006-Add-architecture-and-scheduler-maps.patch
diff --git a/0008-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch b/0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
index 8725a867bbd1..21d6c3066fcf 100644
--- a/0008-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
+++ b/0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
@@ -9,7 +9,7 @@ Subject: [PATCH] Trap any kind of exception during plugin parsing (eg IOError
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/osc/commandline.py b/osc/commandline.py
-index 2e575eddd4aa044ca53c4677fd8a99a8d92890c8..ed110d359bb6803ab06d21fe88ea6a43006943fa 100644
+index 2866ceead87dd276b10ac845f9a996c67e350704..5ebd0cecc876ee8499b5010f2739db643cf9a50c 100644
 --- a/osc/commandline.py
 +++ b/osc/commandline.py
 @@ -10164,7 +10164,7 @@ Please submit there instead, or use --nodevelproject to force direct submission.
diff --git a/0009-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch b/0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
index b30d58e38006..b30d58e38006 100644
--- a/0009-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
+++ b/0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
diff --git a/PKGBUILD b/PKGBUILD
index 82352034ea6f..b2fddbfe1649 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 # Contributor : Patrick McCarty  <pnorcks at gmail dot com>
 
 pkgname=osc
-pkgver=1.5.0
+pkgver=1.5.1
 pkgrel=1
 pkgdesc="Command line client for the openSUSE Build Service"
 arch=(any)
@@ -21,20 +21,19 @@ optdepends=('obs-build: required to run local builds'
             'obs-service-download_files: for running the download_files source service'
             'python-keyring: keyring support'
             'python-progressbar: progressbar support for operations like uploading and services'
-            )
+           )
 conflicts=('osc-git' 'osc-bash-completion' 'zsh-completion-osc')
 replaces=('osc-bash-completion' 'zsh-completion-osc')
 source=("https://github.com/openSUSE/${pkgname}/archive/${pkgver}.tar.gz"
-        0001-remove-public-route-from-osc.patch
-        0002-Add-sb2install-support-to-osc.patch
-        0003-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
-        0004-Support-synchronous-copyproj.patch
-        0005-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
-        0006-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
-        0007-Add-architecture-and-scheduler-maps.patch
-        0008-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
-        0009-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
-)
+        0001-Add-sb2install-support-to-osc.patch
+        0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch
+        0003-Support-synchronous-copyproj.patch
+        0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch
+        0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch
+        0006-Add-architecture-and-scheduler-maps.patch
+        0007-Trap-any-kind-of-exception-during-plugin-parsing-eg-.patch
+        0008-Fix-hdrmd5-check-of-downloaded-packages-from-DoD-rep.patch
+       )
 
 
 prepare() {
@@ -64,15 +63,14 @@ package() {
 
 }
 
-sha256sums=('7d3be5b17338f11767441c451c50137356756b51786d0296e751f2fef1c87e27'
-            '06cdc1134dcfec28af98b3738189c8794cf898fa2578a7a2947acc3102b16094'
+sha256sums=('17b1268413561b3d1b8564d3d1ed8f025efa34774497df4d54205b6cf0882c28'
             '1e4a61c7ae267812de89459c715baa66115851d0f213f95f4ac46fe0f67802a3'
-            'd5415d2ad620ec8ff9c5ea9b97b78ed76eef4ead4b11892465f6a96a015a03b7'
-            'a857b48a3c9d698c8ab347509dafb67cfe201f882a0d90f9738c6386945ca3b6'
-            'eba2c169e52fb5b0e722591f67b8c93615610a66acfb5e660a65fc8fb9f0c81c'
-            '83219095de865463ce82206b50fc975c4a4de86e5af3415c8f41ed8de9d2ebd1'
+            '3ebca3c11b6985e3e90386662f21e8c6f7cc35d318ad48581069addd1a786c2f'
+            'ec60ca441997437044dd0847b275a2ee468b7ea8f9ae5f3ef35813e30008f075'
+            '5dd6f4f56b80b82683bca27aca25a5c84315850193bdbee512f221df6f8023bf'
+            '47f3d68a74b60fc2a8942b4a35dceb15c1ee9daf64bb6d64641e732bd0c9a506'
             'eae5f978b8385db3acae46df96fc4973f306c4a640389165a8ac54469d370e5b'
-            'd2ba1b665101e28673c65912b7bc9095dbdc02049fb8c8d83f1809a441132d8f'
+            'e98744f2644f3358280c81375f129f65289f8ed964bddcadfce40077ab7afe4e'
             '67c916cd7ba9dcd4899477c223c79f7087c0a0077d33f95ccb465b790e052547')
 
 # vim:set sts=2 ts=2 sw=2 et: