diff options
author | Björn Bidar | 2023-02-07 21:10:54 +0200 |
---|---|---|
committer | Björn Bidar | 2023-02-07 21:10:54 +0200 |
commit | 2122584fa9db83262c4737be9efacb13f21eaa77 (patch) | |
tree | b8e5b504f24f6a9ab18198ce9fb5b00d24689fb6 | |
parent | 971ea2ea2332fe7e0fdaa84d2d5097f48efe11ec (diff) | |
download | aur-2122584fa9db83262c4737be9efacb13f21eaa77.tar.gz |
Update to 1.0.0b4
- New upstream releae
- Rebase sb2 patches
Signed-off-by: Björn Bidar <bjorn.bidar@thaodan.de>
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | 0001-Add-sb2install-support-to-osc.patch | 6 | ||||
-rw-r--r-- | 0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch | 8 | ||||
-rw-r--r-- | 0003-Support-synchronous-copyproj.patch | 12 | ||||
-rw-r--r-- | 0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch | 12 | ||||
-rw-r--r-- | 0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch | 8 | ||||
-rw-r--r-- | PKGBUILD | 14 |
7 files changed, 38 insertions, 38 deletions
@@ -1,6 +1,6 @@ pkgbase = osc pkgdesc = Command line client for the openSUSE Build Service - pkgver = 1.0.0b3 + pkgver = 1.0.0b4 pkgrel = 1 url = https://github.com/openSUSE/osc arch = any @@ -19,7 +19,7 @@ pkgbase = osc conflicts = zsh-completion-osc replaces = osc-bash-completion replaces = zsh-completion-osc - source = https://github.com/openSUSE/osc/archive/1.0.0b3.tar.gz + source = https://github.com/openSUSE/osc/archive/1.0.0b4.tar.gz source = _osc source = 0001-Add-sb2install-support-to-osc.patch source = 0002-Support-osc-copyprj-in-api-by-Islam-Amer-usage-osc-c.patch @@ -27,13 +27,13 @@ pkgbase = osc 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 - sha256sums = c02d03c9327abd7a6055b8d6d7170ee57011567536f8b41dbf68b2580f7b179e + sha256sums = 9542585fbddadaaff914996b9e239c00ba6873a9ad4db5b28c00e841c9c582da sha256sums = 2b045e03d2fdce12683ceb9792d491a32f00b256045456412e7bc18c8726218a - sha256sums = 7478f2297ac87090979d19fd55d539aa1000792a8858796ba7c7f239b45d9ef6 - sha256sums = de9cd536d5b294b5ec702d6e57f014928e67f3678c1dd9ea2a7d986c2506469b - sha256sums = 0ac6241d05061e85f4b7d38472180c138e266bf968d6c074105d7e528f44e336 - sha256sums = 1573dd86844d1eebeb93ff092f6345928fad4611f7634dadb17fcc579de4dc32 - sha256sums = 8ac9d5760333f76428f85ff6ee8cffabc12678be703ba285f708015d95039eb4 + sha256sums = 35ba6d6c03cbb1e437708251969ca8d71376744cdb8fd826fd971645224e1ec5 + sha256sums = 569519d45ef2d87d984e6828c6c2c1bc0aedbc9485ad303fd35d11a249cc2446 + sha256sums = add44ed6f71cadea8f43370ef2dc72516fd148db2e77879091bd812b4b95adc9 + sha256sums = 29e68a3e4142cbef52f2311d2ea3c34472de87b1f6eddf70b9d9cfb8395bd31e + sha256sums = 0439a28bd3606fb298894c73f7d530090c31bdf638e9f3e4037bc68a36b24089 sha256sums = eae5f978b8385db3acae46df96fc4973f306c4a640389165a8ac54469d370e5b pkgname = osc diff --git a/0001-Add-sb2install-support-to-osc.patch b/0001-Add-sb2install-support-to-osc.patch index e0ba1c6a3105..e19d36a750b5 100644 --- a/0001-Add-sb2install-support-to-osc.patch +++ b/0001-Add-sb2install-support-to-osc.patch @@ -8,7 +8,7 @@ Subject: [PATCH] Add sb2install support to osc 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/osc/build.py b/osc/build.py -index 7e864b883686bd56755d1f0250df12ec80cecc89..d51b81c9cc66959d74194c48f2a6710649fd117f 100644 +index 36dcd75f02555a238ebcb53388b52e75418af3e9..a93e10716de947b579823a065b6b4d207bc65466 100644 --- a/osc/build.py +++ b/osc/build.py @@ -190,12 +190,13 @@ class Buildinfo: @@ -26,7 +26,7 @@ index 7e864b883686bd56755d1f0250df12ec80cecc89..d51b81c9cc66959d74194c48f2a67106 self.preinstallimage = root.find('preinstallimage') else: self.preinstallimage = None -@@ -227,7 +228,8 @@ class Pac: +@@ -235,7 +236,8 @@ class Pac: 'project', 'repository', 'sysroot', 'preinstall', 'vminstall', 'runscripts', 'noinstall', 'installonly', 'notmeta', @@ -36,7 +36,7 @@ index 7e864b883686bd56755d1f0250df12ec80cecc89..d51b81c9cc66959d74194c48f2a67106 self.mp[i] = node.get(i) self.mp['buildarch'] = buildarch -@@ -1390,6 +1392,7 @@ def main(apiurl, opts, argv): +@@ -1398,6 +1400,7 @@ def main(apiurl, opts, argv): rpmlist.append('preinstall: ' + ' '.join(bi.preinstall_list) + '\n') rpmlist.append('vminstall: ' + ' '.join(bi.vminstall_list) + '\n') diff --git a/0002-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 2bba1a5df823..9c51d3336a26 100644 --- a/0002-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,10 +13,10 @@ 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 ee68b0e77f0304fea025b9b3c22b370fadccc42a..cae02268cacca43aa7db97ace9683b841afbfe2c 100644 +index c2a7cbf998e58ca1ee51ef47c3b767e3777bf0c3..797e3ffd5f248285507bbafc59350efe675ce607 100644 --- a/osc/commandline.py +++ b/osc/commandline.py -@@ -3408,6 +3408,58 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3407,6 +3407,58 @@ Please submit there instead, or use --nodevelproject to force direct submission. delayed=not opts.no_delay, print_to="stdout", ) @@ -76,10 +76,10 @@ index ee68b0e77f0304fea025b9b3c22b370fadccc42a..cae02268cacca43aa7db97ace9683b84 @cmdln.option('-m', '--message', metavar='TEXT', help='specify message TEXT') diff --git a/osc/core.py b/osc/core.py -index 6a86901b1fdf37e0178caffe9e39d1cceb9145f7..fc6410974f57815ac36abc7232972da7d925b82a 100644 +index d223caa7e686d9c00b0cbf2fae3ac08d5ada503c..356da278bdae46cbb6639f24e20b3f8b05c5fa5c 100644 --- a/osc/core.py +++ b/osc/core.py -@@ -6002,6 +6002,34 @@ def copy_pac( +@@ -6037,6 +6037,34 @@ def copy_pac( raise oscerr.APIError('failed to copy: %s' % ', '.join(todo)) return 'Done.' diff --git a/0003-Support-synchronous-copyproj.patch b/0003-Support-synchronous-copyproj.patch index ed881af9e303..c799cca68eaa 100644 --- a/0003-Support-synchronous-copyproj.patch +++ b/0003-Support-synchronous-copyproj.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Support synchronous copyproj 2 files changed, 7 insertions(+) diff --git a/osc/commandline.py b/osc/commandline.py -index cae02268cacca43aa7db97ace9683b841afbfe2c..481fb1c2090aa76e84aaac6e56bf74ab3f2cf811 100644 +index 797e3ffd5f248285507bbafc59350efe675ce607..ee540138cac2c66fd500a0cd1e78e670f57f5c46 100644 --- a/osc/commandline.py +++ b/osc/commandline.py -@@ -3410,6 +3410,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3409,6 +3409,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. ) @cmdln.option('-b', '--with-binaries', action='store_true', help='copy the built binaries over to avoid a rebuild') @@ -21,7 +21,7 @@ index cae02268cacca43aa7db97ace9683b841afbfe2c..481fb1c2090aa76e84aaac6e56bf74ab @cmdln.option('-x', '--with-history', action='store_true', help='replicate the history of each package.') @cmdln.option('-o', '--make-older', action='store_true', -@@ -3427,6 +3429,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3426,6 +3428,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. The user must be able to create DESTPRJ @@ -30,7 +30,7 @@ index cae02268cacca43aa7db97ace9683b841afbfe2c..481fb1c2090aa76e84aaac6e56bf74ab usage: osc copyprj SOURCEPRJ DESTPRJ ${cmd_option_list} -@@ -3456,6 +3460,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3455,6 +3459,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. withhistory = opts.with_history, makeolder = opts.make_older, resign = opts.re_sign, @@ -39,10 +39,10 @@ index cae02268cacca43aa7db97ace9683b841afbfe2c..481fb1c2090aa76e84aaac6e56bf74ab print("done cp") print(r) diff --git a/osc/core.py b/osc/core.py -index fc6410974f57815ac36abc7232972da7d925b82a..83123b240217f6b02bae9447b471e424d2bc9266 100644 +index 356da278bdae46cbb6639f24e20b3f8b05c5fa5c..64f69acb23a72b7d79c09532a956d930707a0c0e 100644 --- a/osc/core.py +++ b/osc/core.py -@@ -6026,6 +6026,8 @@ def copy_prj(src_apiurl, src_project, dst_project, +@@ -6061,6 +6061,8 @@ def copy_prj(src_apiurl, src_project, dst_project, query['resign'] = '1' if comment: query['comment'] = comment diff --git a/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch b/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch index 2b73fdad2647..7597c6f73c2f 100644 --- a/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch +++ b/0004-Add-p-to-copyprj-to-enable-copying-of-prjconf.patch @@ -9,10 +9,10 @@ Subject: [PATCH] Add -p to copyprj to enable copying of prjconf 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/osc/commandline.py b/osc/commandline.py -index 481fb1c2090aa76e84aaac6e56bf74ab3f2cf811..ccecdc43acc57f69899fa328672a22a76c547a04 100644 +index ee540138cac2c66fd500a0cd1e78e670f57f5c46..e6045ed4add369e7cbf52cc95af6d6c2ff90a780 100644 --- a/osc/commandline.py +++ b/osc/commandline.py -@@ -3416,6 +3416,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3415,6 +3415,8 @@ Please submit there instead, or use --nodevelproject to force direct submission. help='replicate the history of each package.') @cmdln.option('-o', '--make-older', action='store_true', help='No idea') @@ -21,7 +21,7 @@ index 481fb1c2090aa76e84aaac6e56bf74ab3f2cf811..ccecdc43acc57f69899fa328672a22a7 @cmdln.option('-r', '--re-sign', action='store_true', help='re-sign the binaries') @cmdln.option('-m', '--message', metavar='TEXT', -@@ -3460,7 +3462,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -3459,7 +3461,7 @@ Please submit there instead, or use --nodevelproject to force direct submission. withhistory = opts.with_history, makeolder = opts.make_older, resign = opts.re_sign, @@ -31,10 +31,10 @@ index 481fb1c2090aa76e84aaac6e56bf74ab3f2cf811..ccecdc43acc57f69899fa328672a22a7 print("done cp") print(r) diff --git a/osc/core.py b/osc/core.py -index 83123b240217f6b02bae9447b471e424d2bc9266..e94dd8139d39f3d6979f6bfe03f5c58ed3b579ff 100644 +index 64f69acb23a72b7d79c09532a956d930707a0c0e..e5e193cfa98f42f3b1456cca37bd2a19b2855d4c 100644 --- a/osc/core.py +++ b/osc/core.py -@@ -6007,6 +6007,8 @@ def copy_prj(src_apiurl, src_project, dst_project, +@@ -6042,6 +6042,8 @@ def copy_prj(src_apiurl, src_project, dst_project, withhistory = False, makeolder = False, resign = False, @@ -43,7 +43,7 @@ index 83123b240217f6b02bae9447b471e424d2bc9266..e94dd8139d39f3d6979f6bfe03f5c58e comment = None): """ Create a copy of a project. -@@ -6028,6 +6030,9 @@ def copy_prj(src_apiurl, src_project, dst_project, +@@ -6063,6 +6065,9 @@ def copy_prj(src_apiurl, src_project, dst_project, query['comment'] = comment if now: query['nodelay'] = '1' diff --git a/0005-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 61d624827120..1448068b32cd 100644 --- a/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch +++ b/0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch @@ -14,10 +14,10 @@ Subject: [PATCH] Add support for --rebuild and --chroot-only in build. 2 files changed, 10 insertions(+) diff --git a/osc/build.py b/osc/build.py -index d51b81c9cc66959d74194c48f2a6710649fd117f..cc6386da49aefb25e9cc3b88e6829039ac032953 100644 +index a93e10716de947b579823a065b6b4d207bc65466..eea57dd942d196191607eecc655e65690b0e3b51 100644 --- a/osc/build.py +++ b/osc/build.py -@@ -688,6 +688,12 @@ def main(apiurl, opts, argv): +@@ -696,6 +696,12 @@ def main(apiurl, opts, argv): buildargs.append('--norootforbuild') if opts.clean: buildargs.append('--clean') @@ -31,10 +31,10 @@ index d51b81c9cc66959d74194c48f2a6710649fd117f..cc6386da49aefb25e9cc3b88e6829039 buildargs.append('--no-checks') if not opts.no_changelog: diff --git a/osc/commandline.py b/osc/commandline.py -index ccecdc43acc57f69899fa328672a22a76c547a04..81171a3fa6530fd09d8c6e7235751dff8be3bbc7 100644 +index e6045ed4add369e7cbf52cc95af6d6c2ff90a780..0fc3b87287aad930f73458c665c8e34e8116ab6c 100644 --- a/osc/commandline.py +++ b/osc/commandline.py -@@ -6536,6 +6536,10 @@ Please submit there instead, or use --nodevelproject to force direct submission. +@@ -6538,6 +6538,10 @@ Please submit there instead, or use --nodevelproject to force direct submission. help='Copy overlay filesystem to buildroot after installing all RPMs .') @cmdln.option('--noinit', '--no-init', action='store_true', help='Skip initialization of build root and start with build immediately.') @@ -6,7 +6,7 @@ # Contributor : Patrick McCarty <pnorcks at gmail dot com> pkgname=osc -pkgver=1.0.0b3 +pkgver=1.0.0b4 pkgrel=1 pkgdesc="Command line client for the openSUSE Build Service" arch=(any) @@ -33,13 +33,13 @@ source=("https://github.com/openSUSE/${pkgname}/archive/${pkgver}.tar.gz" 0005-Add-support-for-rebuild-and-chroot-only-in-build.-re.patch 0006-Add-architecture-and-scheduler-maps.patch ) -sha256sums=('c02d03c9327abd7a6055b8d6d7170ee57011567536f8b41dbf68b2580f7b179e' +sha256sums=('9542585fbddadaaff914996b9e239c00ba6873a9ad4db5b28c00e841c9c582da' '2b045e03d2fdce12683ceb9792d491a32f00b256045456412e7bc18c8726218a' - '7478f2297ac87090979d19fd55d539aa1000792a8858796ba7c7f239b45d9ef6' - 'de9cd536d5b294b5ec702d6e57f014928e67f3678c1dd9ea2a7d986c2506469b' - '0ac6241d05061e85f4b7d38472180c138e266bf968d6c074105d7e528f44e336' - '1573dd86844d1eebeb93ff092f6345928fad4611f7634dadb17fcc579de4dc32' - '8ac9d5760333f76428f85ff6ee8cffabc12678be703ba285f708015d95039eb4' + '35ba6d6c03cbb1e437708251969ca8d71376744cdb8fd826fd971645224e1ec5' + '569519d45ef2d87d984e6828c6c2c1bc0aedbc9485ad303fd35d11a249cc2446' + 'add44ed6f71cadea8f43370ef2dc72516fd148db2e77879091bd812b4b95adc9' + '29e68a3e4142cbef52f2311d2ea3c34472de87b1f6eddf70b9d9cfb8395bd31e' + '0439a28bd3606fb298894c73f7d530090c31bdf638e9f3e4037bc68a36b24089' 'eae5f978b8385db3acae46df96fc4973f306c4a640389165a8ac54469d370e5b') prepare() { |