From 269c01d26d84f4db44decff7829aeb8d9fa3bb6cbd5b93752658a1abbbbf95de Mon Sep 17 00:00:00 2001 From: Daniel Mach Date: Tue, 10 Oct 2023 18:22:58 +0000 Subject: [PATCH] Accepting request 1116734 from home:dmach:branches:openSUSE:Tools - 1.4.1 - Configuration: - Always display apiurl when asking for credentials - Ask for new credentials when user is missing from an apiurl section in the config file - Library: - Fix testing revision for being empty - Fix core.change_request_state_template() to always return a string - Tests: - Replace 'git init -b' with 'git init' and 'git checkout -b' - Spec: - Run fdupes after install - List the python sitelib paths explicitly - Mark csh completion files as configs - Own zsh completion dirs to mute rpmlint errors - Move bash completion from /etc to /usr/share - Fix whitespaces in the changes file OBS-URL: https://build.opensuse.org/request/show/1116734 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=412 --- PKGBUILD | 2 +- debian.changelog | 2 +- osc-1.4.0.tar.gz | 3 - osc-1.4.1.tar.gz | 3 + osc.changes | 151 ++++++++++++++++++++++++++--------------------- osc.dsc | 2 +- osc.spec | 29 ++++++--- 7 files changed, 111 insertions(+), 81 deletions(-) delete mode 100644 osc-1.4.0.tar.gz create mode 100644 osc-1.4.1.tar.gz diff --git a/PKGBUILD b/PKGBUILD index e41ca64..530845f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,5 +1,5 @@ pkgname=osc -pkgver=1.4.0 +pkgver=1.4.1 pkgrel=0 pkgdesc="Command-line client for the Open Build Service" arch=('x86_64') diff --git a/debian.changelog b/debian.changelog index 1d3ae4c..e44c475 100644 --- a/debian.changelog +++ b/debian.changelog @@ -1,4 +1,4 @@ -osc (1.4.0-0) unstable; urgency=low +osc (1.4.1-0) unstable; urgency=low * Placeholder diff --git a/osc-1.4.0.tar.gz b/osc-1.4.0.tar.gz deleted file mode 100644 index dd8d36f..0000000 --- a/osc-1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bc083473d5677ba75e2b9adf867c32fc17bb11adc38d863cf9c7a2d8c1d01287 -size 354269 diff --git a/osc-1.4.1.tar.gz b/osc-1.4.1.tar.gz new file mode 100644 index 0000000..7c440ed --- /dev/null +++ b/osc-1.4.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:33d0f33fce7f9d85c07d4dde320dc2a9d2e7de3e23b3810149cb9a821ab6834d +size 354814 diff --git a/osc.changes b/osc.changes index 97452eb..3ece1cb 100644 --- a/osc.changes +++ b/osc.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Oct 10 18:12:00 UTC 2023 - Daniel Mach + +- 1.4.1 + - Configuration: + - Always display apiurl when asking for credentials + - Ask for new credentials when user is missing from an apiurl section in the config file + - Library: + - Fix testing revision for being empty + - Fix core.change_request_state_template() to always return a string + - Tests: + - Replace 'git init -b' with 'git init' and 'git checkout -b' + - Spec: + - Run fdupes after install + - List the python sitelib paths explicitly + - Mark csh completion files as configs + - Own zsh completion dirs to mute rpmlint errors + - Move bash completion from /etc to /usr/share + ------------------------------------------------------------------- Wed Oct 4 10:01:35 UTC 2023 - Daniel Mach @@ -470,7 +489,7 @@ Tue Jul 26 19:37:46 UTC 2022 - Daniel Mach - revert "interpretation of string literals in messages" that broke unicode handling - fix product build rpm caching - enable md5 revisions in osc log - - parseRevisionOption(): raise an exception on invalid revisions + - parseRevisionOption(): raise an exception on invalid revisions ------------------------------------------------------------------- Fri Jun 24 13:33:36 UTC 2022 - Daniel Mach @@ -481,7 +500,7 @@ Fri Jun 24 13:33:36 UTC 2022 - Daniel Mach - don't traceback on invalid credentials manager - improve README, rename it to README.md - declare OscHTTPSignatureAuthHandler as a new-style class - - remove illegal character in comment + - remove illegal character in comment ------------------------------------------------------------------- Thu Jun 2 12:31:16 UTC 2022 - Daniel Mach @@ -543,7 +562,7 @@ Tue Apr 26 07:53:48 UTC 2022 - Marco Strigl is issued on project level or in multibuild case - spec file: - * recommed python-keyring-keyutils for new kernel keyring backend + * recommed python-keyring-keyutils for new kernel keyring backend ------------------------------------------------------------------- Mon Feb 28 17:34:00 UTC 2022 - Daniel Mach @@ -593,7 +612,6 @@ Thu Dec 2 08:18:20 UTC 2021 - Marco Strigl * avoid sending entire projects on "osc mr" * fix hdmrd5 check of local cached files * improve logic for conffile mode handling - ------------------------------------------------------------------- Wed Jul 21 08:51:23 UTC 2021 - Marcus Hüwe @@ -664,13 +682,13 @@ Wed Jan 27 13:31:51 UTC 2021 - Marcus Hüwe Tue Nov 10 13:42:55 UTC 2020 - Marco Strigl - 0.171.1 - * maintainer search: lookup via package name by default and binary as fallback - * fix crash on console resize when downloading files during build - * add proper repourls to osc reporuls - * new command osc releaserequest: This command is used to transfer sources and   -   binaries without rebuilding them. -    It requires defined release targets set to trigger="manual". - * some improvements on output of help and error messages + * maintainer search: lookup via package name by default and binary as fallback + * fix crash on console resize when downloading files during build + * add proper repourls to osc reporuls + * new command osc releaserequest: This command is used to transfer sources and + binaries without rebuilding them. + It requires defined release targets set to trigger="manual". + * some improvements on output of help and error messages ------------------------------------------------------------------- Thu Jul 9 08:06:35 UTC 2020 - Marco Strigl @@ -703,19 +721,19 @@ Thu Jul 9 08:06:35 UTC 2020 - Marco Strigl ------------------------------------------------------------------- Thu Jul 2 12:46:33 UTC 2020 - Frederic Crozat -- Really fix path for fish completion file to +- Really fix path for fish completion file to /usr/share/fish/vendor_completions.d and fix its permissions. ------------------------------------------------------------------- Fri May 29 18:40:18 UTC 2020 - Marco Strigl - 0.169.1 - * add --ccache option to osc getbinaries + * add --ccache option to osc getbinaries ------------------------------------------------------------------- Wed May 27 12:54:14 UTC 2020 - Marco Strigl -- 0.169.0 +- 0.169.0 * improve speed and usability of osc bash completion * switch packagequery.py to return only bytes * improved some error messages @@ -724,7 +742,7 @@ Wed May 27 12:54:14 UTC 2020 - Marco Strigl * support for osc build --shell-cmd * Fix kiwi build with --prefer-pkgs * add pkg-ccache support for osc build - * fix security issue (bsc#1122675, CVE-2019-3681) do not allow '/' in filename + * fix security issue (bsc#1122675, CVE-2019-3681) do not allow '/' in filename ------------------------------------------------------------------- Fri Mar 13 06:49:27 UTC 2020 - Marco Strigl @@ -748,7 +766,7 @@ Mon Mar 9 08:14:46 UTC 2020 - Tomáš Chvátal Thu Mar 5 08:30:46 UTC 2020 - Marco Strigl - Spec: - * fix destination of fish completion file to /usr/share/fish/vendor_completions.d + * fix destination of fish completion file to /usr/share/fish/vendor_completions.d ------------------------------------------------------------------- Wed Mar 4 09:27:41 UTC 2020 - Marco Strigl @@ -791,7 +809,7 @@ Tue Jan 7 10:54:25 UTC 2020 - Marco Strigl - 0.167.2 * fix regression in osc chroot - * fix broken importsrcpkg + * fix broken importsrcpkg ------------------------------------------------------------------- Tue Dec 10 12:44:18 UTC 2019 - Marco Strigl @@ -823,9 +841,9 @@ Thu Dec 5 09:47:54 UTC 2019 - Marco Strigl - added Conflicts: build < 20191205. The new osc shell/chroot features might not work with older build scripts - removed version dpendency for Recommends: build. Does not work anyway. -- added 0%{?centos_version} >= 800 to some %if statemets to enable build of +- added 0%{?centos_version} >= 800 to some %if statemets to enable build of python3 version on CentOS 8 and higer - + ------------------------------------------------------------------- Wed Nov 13 12:05:26 UTC 2019 - Marco Strigl @@ -841,7 +859,7 @@ Wed Nov 13 12:05:26 UTC 2019 - Marco Strigl (boo#1155953) * fix output for missing pubkey when using http_debug=1 on osc build - * fix crash of osc linkpac when there is already a _link + * fix crash of osc linkpac when there is already a _link ------------------------------------------------------------------- Tue Oct 29 10:18:24 UTC 2019 - Marco Strigl @@ -850,7 +868,7 @@ Tue Oct 29 10:18:24 UTC 2019 - Marco Strigl * emergency fix for credentials handling: - in case of an old passx entry in oscrc osc did not work at all. Now we check in - the compat code if we have an passx entry. + the compat code if we have an passx entry. ------------------------------------------------------------------- Thu Oct 24 10:05:06 UTC 2019 - Marco Strigl @@ -875,7 +893,7 @@ Thu Oct 24 10:05:06 UTC 2019 - Marco Strigl * new option --incoming for osc rq and osc review to only show only incoming reqeusts for a project. - new Recommends for xdg-utils. osc-browse uses xdg-open to open - the url to the project/package in an internet browser + the url to the project/package in an internet browser ------------------------------------------------------------------- Mon Aug 5 06:51:32 UTC 2019 - Marco Strigl @@ -885,7 +903,7 @@ Mon Aug 5 06:51:32 UTC 2019 - Marco Strigl * fix RPMError fallback * fix local caching for all package formats * fix appname for trusted cert store - * osc -h does not break anymore when using plugins + * osc -h does not break anymore when using plugins ------------------------------------------------------------------- Wed Jul 24 13:18:01 UTC 2019 - Marco Strigl @@ -895,7 +913,7 @@ Wed Jul 24 13:18:01 UTC 2019 - Marco Strigl This will fix all decoding issues with osc diff, osc ci and osc rq -d * fix osc ls -lb handling empty size and mtime * removed decoding on osc api command. - * fixed broken TLS certificate handling (boo#1142518, CVE-2019-3685) + * fixed broken TLS certificate handling (boo#1142518, CVE-2019-3685) ------------------------------------------------------------------- Mon Jul 8 11:11:58 UTC 2019 - Marco Strigl @@ -908,9 +926,9 @@ Mon Jul 8 11:11:58 UTC 2019 - Marco Strigl * some spelling fixes * properly parse the error message on osc meta -e * osc maintainer -s now works with python3 - * simplified and fixed osc meta -e (boo#1138977) + * simplified and fixed osc meta -e (boo#1138977) * osc lbl now works with non utf8 encoding (boo#1129889) - * add simpleimage as local build type + * add simpleimage as local build type ------------------------------------------------------------------- Tue May 21 09:10:33 UTC 2019 - Marco Strigl @@ -930,11 +948,11 @@ Mon May 20 06:39:33 UTC 2019 - Marco Strigl * osc add in compressed mode now works with python3 * osc getbinaries now prints the output instead of using the quiet mode as a default - + ------------------------------------------------------------------- Wed Apr 24 11:20:12 UTC 2019 - Marco Strigl -- osc-0.165.0.tar.gz now contains the correct version (tag 0.165.0) +- osc-0.165.0.tar.gz now contains the correct version (tag 0.165.0) ------------------------------------------------------------------- Wed Apr 24 09:55:14 UTC 2019 - Marco Strigl @@ -952,7 +970,7 @@ Thu Apr 18 12:45:04 UTC 2019 - Marco Strigl * removed following patches (now upstream): 001_helper.patch 002_man_page_building.patch - 003_setup.patch + 003_setup.patch 004_babysitter.patch 005_oscssl.patch 006_build.patch @@ -969,14 +987,14 @@ Thu Apr 18 12:45:04 UTC 2019 - Marco Strigl ------------------------------------------------------------------- Tue Apr 9 15:04:19 UTC 2019 - Marco Strigl -- moved Recommends for diffstat to suse specific section. +- moved Recommends for diffstat to suse specific section. ------------------------------------------------------------------- Tue Apr 9 13:32:17 UTC 2019 - Marco Strigl - added Buildrequires and Requires for python-chardet * needed for determining the encoding of objects (Requires) - * needed also for testing in %check section (BuildRequires) + * needed also for testing in %check section (BuildRequires) ------------------------------------------------------------------- Sun Apr 7 19:49:25 UTC 2019 - Marco Strigl @@ -1032,27 +1050,27 @@ Tue Feb 12 14:21:39 UTC 2019 - marco.strigl@suse.com - rewrite 009_fetch.patch some versions of python do not support rb'some_text' - overwrite python_sitelib on Tumbleweed and SLE >= 15 -- swich to python3-rpm on Tumbleweed and SLE >= 15. Otherwise +- swich to python3-rpm on Tumbleweed and SLE >= 15. Otherwise python2 will be installed ------------------------------------------------------------------- Tue Feb 12 13:49:32 UTC 2019 - marco.strigl@suse.com -- use python3 on Tumbleweed and SLE >= 15 +- use python3 on Tumbleweed and SLE >= 15 ------------------------------------------------------------------- Tue Feb 12 13:12:17 UTC 2019 - marco.strigl@suse.com - cpio download of needed packages during build is not - possible, because cpio.py has now a bytes only api and - the decoding needs to be done in the fetch module instead. - added: 009_fetch.patch + possible, because cpio.py has now a bytes only api and + the decoding needs to be done in the fetch module instead. + added: 009_fetch.patch ------------------------------------------------------------------- Tue Feb 12 10:46:11 UTC 2019 - marco.strigl@suse.com -- added patches to support python3 until the PR are merged - upstream (bsc#1125243): +- added patches to support python3 until the PR are merged + upstream (bsc#1125243): - 001_helper.patch - 002_man_page_building.patch - 003_setup.patch @@ -1070,7 +1088,7 @@ Tue Feb 12 08:14:30 UTC 2019 - marco.strigl@suse.com - rewrite packagequery to support python3 - rewrite oscerr module to support python3 - rewrite archqeury and debquery to support python3 - - Export vc env vars when running a source service + - Export vc env vars when running a source service ------------------------------------------------------------------- Wed Jan 16 13:11:41 UTC 2019 - marco.strigl@suse.com @@ -1098,7 +1116,7 @@ Wed Jan 9 12:44:29 UTC 2019 - marco.strigl@suse.com - run release job immediately (osc release --no-delay) - build results on project level can now be watched (osc prjresults --watch) - removed python-urlgrabber requieres. (Not used with 0.164.0) -- added recommends for python[2]-progressbar +- added recommends for python[2]-progressbar ------------------------------------------------------------------- Mon Aug 20 11:24:25 UTC 2018 - Adrian Schröter @@ -1118,10 +1136,10 @@ Mon Aug 20 11:24:25 UTC 2018 - Adrian Schröter ------------------------------------------------------------------- Fri Jun 29 07:23:57 UTC 2018 - marco.strigl@suse.com -- add Requires: python2 for Tumbleweed. +- add Requires: python2 for Tumbleweed. Otherwise just python-base is installed which does not contain ssl.py [bnc#1097996] -- removed duplicate entry in appimage.yml to prevent double builds +- removed duplicate entry in appimage.yml to prevent double builds ------------------------------------------------------------------- Tue Dec 5 13:41:04 UTC 2017 - marco.strigl@suse.com @@ -1140,7 +1158,7 @@ Tue Nov 28 14:14:22 UTC 2017 - adrian@suse.de Thu Oct 26 12:41:25 UTC 2017 - marco.strigl@suse.com - 0.161.1 - - Fix python 2.6 SyntaxError (multiple context expressions) + - Fix python 2.6 SyntaxError (multiple context expressions) ------------------------------------------------------------------- Thu Oct 26 11:39:49 UTC 2017 - marco.strigl@suse.com @@ -1158,7 +1176,7 @@ Thu Oct 26 11:39:49 UTC 2017 - marco.strigl@suse.com Wed Oct 4 08:56:38 UTC 2017 - marco.strigl@suse.com - add Recommends: ca-certificates to enable TLS verification - without manually installing them. [bnc#1061500] + without manually installing them. [bnc#1061500] ------------------------------------------------------------------- Fri Sep 22 07:07:33 UTC 2017 - adrian@suse.de @@ -1208,7 +1226,7 @@ Tue May 9 07:51:06 UTC 2017 - marco.strigl@suse.com - fix github issue #236 (--no-cleanup not working) - fix wipebinaries to prevent wiping of complete repository - add '--build-opt' to osc build command - - fix requests codebase to fit old obs versions + - fix requests codebase to fit old obs versions ------------------------------------------------------------------- Tue Mar 21 12:51:00 UTC 2017 - marco.strigl@suse.com @@ -1217,13 +1235,13 @@ Tue Mar 21 12:51:00 UTC 2017 - marco.strigl@suse.com - add compat code for older apis that do not support multibuild - fix ssl.connection instantiation in case of old M2Crypto - highly experimental support for appimage - - fix local service run for non-existent (server-side) package + - fix local service run for non-existent (server-side) package ------------------------------------------------------------------- Wed Mar 8 12:14:32 UTC 2017 - marco.strigl@suse.com - 0.157.1 - - fix local build of kiwi images using obsrepositories:// + - fix local build of kiwi images using obsrepositories:// ------------------------------------------------------------------- Wed Mar 8 08:57:31 UTC 2017 - marco.strigl@suse.com @@ -1338,7 +1356,7 @@ Mon Apr 20 07:18:40 UTC 2015 - bwiedemann@suse.com ------------------------------------------------------------------- Thu Mar 26 13:52:34 UTC 2015 - adrian@suse.de -- 0.151.2 +- 0.151.2 - improved error loging ------------------------------------------------------------------- @@ -1479,7 +1497,7 @@ Fri Jan 24 09:38:32 UTC 2014 - adrian@suse.de - plugin loading - bugowner handling - download of server side generated source "up -S" - - wipebinaries command + - wipebinaries command ------------------------------------------------------------------- Tue Dec 31 19:24:43 UTC 2013 - andreas.stieger@gmx.de @@ -1844,7 +1862,7 @@ Mon Dec 6 20:33:16 UTC 2010 - suse-tux@gmx.de instance to enter a passwd) - added template support for a submitrequest accept/decline message - lots of internal rewrites (new working copy handling etc.) - - support added for osc search 'perl(Foo::Bar)' + - support added for osc search 'perl(Foo::Bar)' - New "service" command to run source services locally or trigger a re-run on the server. - setlinkrev is setting now the revision to xsrcmd5 by default to avoid later breakage on indirect links by default. # @@ -1872,7 +1890,7 @@ Mon Aug 30 17:40:37 UTC 2010 - suse-tux@gmx.de Fri Aug 27 15:23:54 UTC 2010 - suse-tux@gmx.de - recommend build >= 2010.05.04 -- update to 0.129 +- update to 0.129 - "dists" command to show the configured default base repos from the server. - "review list" command to list open review requests - "review add" command to add another reviewer for a request (either user or group) @@ -1916,7 +1934,7 @@ Wed Jun 9 10:55:52 UTC 2010 - adrian@suse.de - --csv/--format options for results command - using format user can explicitly specify what he wants print - osc branch reads project/package in package directory - fix creation of package link, when target project has the package via linked project - - add "osc rq approvenew $PROJECT" command to show and accept all request in new state. + - add "osc rq approvenew $PROJECT" command to show and accept all request in new state. This makes sense esp. for projects which work with default reviewers before. - support external source validator scripts before commiting - support request creation with multiple actions @@ -1973,7 +1991,7 @@ Wed Apr 7 13:55:54 UTC 2010 - suse-tux@gmx.de ------------------------------------------------------------------- Sun Mar 21 22:03:07 UTC 2010 - suse-tux@gmx.de -- fixed rpmlint warning +- fixed rpmlint warning ------------------------------------------------------------------- Sun Mar 21 21:49:19 UTC 2010 - suse-tux@gmx.de @@ -2335,7 +2353,7 @@ Thu Jan 22 17:35:38 CET 2009 - poeml@suse.de - don't use a hardcoded path for the rpm binary otherwise it fails on distributions like debian - osc meta: be more verbose in case of failure (bnc#459292) - - osc mkpac: add info how to enable the package tracking feature (bnc#459288) + - osc mkpac: add info how to enable the package tracking feature (bnc#459288) ------------------------------------------------------------------- Fri Dec 12 11:26:56 CET 2008 - poeml@suse.de @@ -2439,7 +2457,7 @@ Fri Jul 11 12:43:00 CEST 2008 - poeml@suse.de - update to r4428 (version 0.106): - osc rdiff / osc submitreq show: diff the _expanded_ sources [bnc#408267] - - osc submitreq list: show author's name + - osc submitreq list: show author's name - osc submitreq: shortcut alias 'sr' added ------------------------------------------------------------------- @@ -2507,7 +2525,7 @@ Tue Jun 3 17:15:26 CEST 2008 - poeml@suse.de - update to r4089 (version 0.102) - osc branch: Show the actually created branch project name, not - a guessed one. Add --nodevelproject. + a guessed one. Add --nodevelproject. - osc submitreq: look up the develproject of the target, and if there is one, don't create the request, unless forced with --nodevelproject. @@ -2591,15 +2609,15 @@ Tue Apr 1 09:43:12 CEST 2008 - poeml@suse.de and built locally. Missing: commit support. Newly introduced options are: - * osc checkout: --expand-link - * osc update: --expand-link and --unexpand-link + * osc checkout: --expand-link + * osc update: --expand-link and --unexpand-link - osc build: add --debuginfo switch (Thanks, Juergen!) [bnc#368524] - osc req: add option -a / --add-header to inject arbitrary request headers - osc addremove (and others): ignore _all_ dot files (the buildservice doesn't handle them) [bnc#370476] - copypac: do a server-side copy (via a single api call) when - used with -s / --server-side. + used with -s / --server-side. - prjresults: csv export uses ';' as default (Pavol) - osc update/checkout: enable to use md5sum as revision id - osc info: make it show info about expanded and non-expanded links @@ -2630,7 +2648,7 @@ Tue Apr 1 09:43:12 CEST 2008 - poeml@suse.de The behaviour for a list is unchanged for the reason of backward compatibility. - add Linkinfo class to osc.core - - Package class: + - Package class: - add linkinfo when reading in package data via update_datastructs() - add islink() and isexpanded() methods - added 3 new methods: @@ -2844,7 +2862,7 @@ Thu Jul 19 14:28:51 CEST 2007 - poeml@suse.de Wed Jul 18 15:21:48 CEST 2007 - poeml@suse.de - update to r1861: - - commit (using the currently documented way): + - commit (using the currently documented way): - do DELETEs _before_ generating an "upload" revision with PUTs. The DELETEs would be invalidated by the commit. - switch to new commit mode also if the -F switch is used @@ -3007,7 +3025,7 @@ Sat May 12 23:25:15 CEST 2007 - poeml@suse.de - update to r1655: - build: fix bug introduced with r1652: for the buildinfo, POST - the specfile's content, not its name... + the specfile's content, not its name... ------------------------------------------------------------------- Thu May 10 16:33:57 CEST 2007 - poeml@suse.de @@ -3033,7 +3051,7 @@ Sat May 5 00:02:55 CEST 2007 - poeml@suse.de - version 0.96 - following suggestions by Christian Boltz and Michal Marek, osc now memorizes where a working copy was checked out from, saving - the api server url to .osc/_apiurl. + the api server url to .osc/_apiurl. - implement 'info' subcommand - buildhistory works again - copypac: implement package copy from one buildservice instance to another @@ -3088,7 +3106,7 @@ Fri Apr 20 02:09:11 CEST 2007 - poeml@suse.de - rewrite the HTTP handling - adding http_GET/POST/PUT/DELETE() functions, which dispatch to http_request(), and use them everywhere - - removing othermethods.py + - removing othermethods.py - keeping urlopen(), in case it is used from externally, but have it print out a "depracated" message - finally, implementing a global HTTP debug mode @@ -3102,7 +3120,7 @@ Fri Mar 30 00:25:24 CEST 2007 - poeml@suse.de - update to r1551: - update: when updating multiple packages, print each package name -- build: +- build: - use preinstall attribute instead of obsolete element - use runscripts attribute and hand it over to build in the buildinfo - results: quote parameter in the new URL @@ -3163,7 +3181,7 @@ Fri Oct 13 08:37:38 CEST 2006 - poeml@suse.de ------------------------------------------------------------------- Thu Oct 12 15:35:53 CEST 2006 - poeml@suse.de -- update to 0.9 (r761): +- update to 0.9 (r761): - "iChain-ready" (works with API server now using iChain authentication) - add runtime check for build.rpm version, so the rpm package @@ -3362,4 +3380,3 @@ Fri May 12 00:00:00 CEST 2006 - poeml@suse.de Wed May 10 00:00:00 CEST 2006 - poeml@suse.de - created package (version 0.2) - diff --git a/osc.dsc b/osc.dsc index 3fcbab0..7281047 100644 --- a/osc.dsc +++ b/osc.dsc @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 1.4.0-0 +Version: 1.4.1-0 Binary: osc Maintainer: Adrian Schroeter Architecture: any diff --git a/osc.spec b/osc.spec index d860d02..9cca7d0 100644 --- a/osc.spec +++ b/osc.spec @@ -33,10 +33,6 @@ # need to override python_sitelib because it is not set as we would expect on many distros %define python_sitelib %(RPM_BUILD_ROOT= %{use_python} -Ic "import sysconfig; print(sysconfig.get_path('purelib'))") -%if 0%{?is_opensuse} -%define completion_dir_bash %{_sysconfdir}/bash_completion.d -%endif - # generate manpages on distros where argparse-manpage >= 3 is available %if 0%{?suse_version} > 1500 || 0%{?fedora} >= 37 %bcond_without man @@ -44,6 +40,13 @@ %bcond_with man %endif +# whether to use fdupes to deduplicate python bytecode +%if 0%{?suse_version} || 0%{?fedora} +%bcond_without fdupes +%else +%bcond_with fdupes +%endif + %define argparse_manpage_pkg %{use_python_pkg}-argparse-manpage %define sphinx_pkg %{use_python_pkg}-Sphinx @@ -53,7 +56,7 @@ %endif Name: osc -Version: 1.4.0 +Version: 1.4.1 Release: 0 Summary: Command-line client for the Open Build Service License: GPL-2.0-or-later @@ -80,9 +83,11 @@ BuildRequires: %{use_python_pkg}-rpm BuildRequires: %{use_python_pkg}-setuptools BuildRequires: %{use_python_pkg}-urllib3 BuildRequires: diffstat +%if %{with fdupes} +BuildRequires: fdupes +%endif # needed for git scm tests BuildRequires: git-core -BuildRequires: zsh Requires: %{use_python_pkg}-cryptography Requires: %{use_python_pkg}-rpm @@ -187,6 +192,10 @@ install -Dm0644 osc.1 %{buildroot}%{_mandir}/man1/osc.1 install -Dm0644 oscrc.5 %{buildroot}%{_mandir}/man5/oscrc.5 %endif +%if %{with fdupes} +%fdupes %buildroot +%endif + %check %{use_python} setup.py test @@ -204,7 +213,8 @@ install -Dm0644 oscrc.5 %{buildroot}%{_mandir}/man5/oscrc.5 %{_bindir}/* # python modules -%{python_sitelib}/* +%{python_sitelib}/osc +%{python_sitelib}/osc-*-info # rpm macros %{_rpmmacrodir}/* @@ -217,8 +227,11 @@ install -Dm0644 oscrc.5 %{buildroot}%{_mandir}/man5/oscrc.5 %dir %{_datadir}/osc %{_datadir}/osc/complete %{completion_dir_bash}/* -%{completion_dir_csh}/* +%config %{completion_dir_csh}/* %{completion_dir_fish}/* +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/functions +%dir %{_datadir}/zsh/functions/Completion %{completion_dir_zsh}/* # osc owns the dirs to avoid the "directories not owned by a package" build error