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

@@ -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')

debian.changelog

@@ -1,4 +1,4 @@
-osc (1.4.0-0) unstable; urgency=low
+osc (1.4.1-0) unstable; urgency=low
 
   * Placeholder
 

osc-1.4.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bc083473d5677ba75e2b9adf867c32fc17bb11adc38d863cf9c7a2d8c1d01287
-size 354269

osc-1.4.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:33d0f33fce7f9d85c07d4dde320dc2a9d2e7de3e23b3810149cb9a821ab6834d
+size 354814

osc.changes

@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Oct 10 18:12:00 UTC 2023 - Daniel Mach <daniel.mach@suse.com>
+
+- 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 <daniel.mach@suse.com>
 
@@ -594,7 +613,6 @@ Thu Dec  2 08:18:20 UTC 2021 - Marco Strigl <marco.strigl@suse.com>
   * fix hdmrd5 check of local cached files
   * improve logic for conffile mode handling
 
-
 -------------------------------------------------------------------
 Wed Jul 21 08:51:23 UTC 2021 - Marcus Hüwe <suse-tux@gmx.de>
 
@@ -667,9 +685,9 @@ Tue Nov 10 13:42:55 UTC 2020 - Marco Strigl <marco.strigl@suse.com>
   * 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". 
+  * 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
 
 -------------------------------------------------------------------
@@ -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)
-

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 <adrian@suse.de>
 Architecture: any

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