From 6c341c910b47c70013cf321cdb3101a6f32cb84096b41d45f34273f7c656c1d5 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Thu, 23 Nov 2023 09:28:12 +0000
Subject: [PATCH] Accepting request 1128028 from
 home:dmach:branches:openSUSE:Tools

- 1.5.0
  - Command-line:
    - Change 'rdiff' command to display diff for _project if no package is specified
    - Update 'build' command with initial support for 'productcompose' build type
    - Change 'build' command to disable preinstall images in rootless builds
  - Configuration:
    - Fix conf.write_initial_config() to use read_file() instead of deprecated readfp()
  - Other:
    - Support installing osc into virtualenv
  - Spec:
    - Recommend 'build' on openSUSE/SLE and 'obs-build' on all other distros

OBS-URL: https://build.opensuse.org/request/show/1128028
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/osc?expand=0&rev=424
---
 PKGBUILD         |  2 +-
 debian.changelog |  2 +-
 osc-1.4.4.tar.gz |  3 ---
 osc-1.5.0.tar.gz |  3 +++
 osc.changes      | 15 +++++++++++++++
 osc.dsc          |  2 +-
 osc.spec         | 10 +++++++---
 7 files changed, 28 insertions(+), 9 deletions(-)
 delete mode 100644 osc-1.4.4.tar.gz
 create mode 100644 osc-1.5.0.tar.gz

diff --git a/PKGBUILD b/PKGBUILD
index 6c2446a..23666a4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=osc
-pkgver=1.4.4
+pkgver=1.5.0
 pkgrel=0
 pkgdesc="Command-line client for the Open Build Service"
 arch=('x86_64')
diff --git a/debian.changelog b/debian.changelog
index 024a7a7..0449ba3 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,4 +1,4 @@
-osc (1.4.4-0) unstable; urgency=low
+osc (1.5.0-0) unstable; urgency=low
 
   * Placeholder
 
diff --git a/osc-1.4.4.tar.gz b/osc-1.4.4.tar.gz
deleted file mode 100644
index 041caa8..0000000
--- a/osc-1.4.4.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ff2d675bdc569f7d6a6cb4b958307757559810219b7e53aef6b1c12a99f4d599
-size 356118
diff --git a/osc-1.5.0.tar.gz b/osc-1.5.0.tar.gz
new file mode 100644
index 0000000..7206844
--- /dev/null
+++ b/osc-1.5.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7d3be5b17338f11767441c451c50137356756b51786d0296e751f2fef1c87e27
+size 356611
diff --git a/osc.changes b/osc.changes
index ba1ac7c..03e3390 100644
--- a/osc.changes
+++ b/osc.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Wed Nov 22 07:57:53 UTC 2023 - Daniel Mach <daniel.mach@suse.com>
+
+- 1.5.0
+  - Command-line:
+    - Change 'rdiff' command to display diff for _project if no package is specified
+    - Update 'build' command with initial support for 'productcompose' build type
+    - Change 'build' command to disable preinstall images in rootless builds
+  - Configuration:
+    - Fix conf.write_initial_config() to use read_file() instead of deprecated readfp()
+  - Other:
+    - Support installing osc into virtualenv
+  - Spec:
+    - Recommend 'build' on openSUSE/SLE and 'obs-build' on all other distros
+
 -------------------------------------------------------------------
 Thu Nov  2 14:51:36 UTC 2023 - Daniel Mach <daniel.mach@suse.com>
 
diff --git a/osc.dsc b/osc.dsc
index 0025b9d..8944b71 100644
--- a/osc.dsc
+++ b/osc.dsc
@@ -1,6 +1,6 @@
 Format: 1.0
 Source: osc
-Version: 1.4.4-0
+Version: 1.5.0-0
 Binary: osc
 Maintainer: Adrian Schroeter <adrian@suse.de>
 Architecture: any
diff --git a/osc.spec b/osc.spec
index 9e0ca6c..f6d50ed 100644
--- a/osc.spec
+++ b/osc.spec
@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
-
 %define use_python python3
 %define use_python_pkg python3
 
@@ -48,6 +47,7 @@
 %endif
 
 %define argparse_manpage_pkg %{use_python_pkg}-argparse-manpage
+%define obs_build_pkg obs-build
 %define sphinx_pkg %{use_python_pkg}-Sphinx
 
 %if 0%{?fedora}
@@ -55,8 +55,12 @@
 %define sphinx_pkg %{use_python_pkg}-sphinx
 %endif
 
+%if 0%{?suse_version}
+%define obs_build_pkg build
+%endif
+
 Name:           osc
-Version:        1.4.4
+Version:        1.5.0
 Release:        0
 Summary:        Command-line client for the Open Build Service
 License:        GPL-2.0-or-later
@@ -103,7 +107,7 @@ Recommends:     %{use_python_pkg}-distro
 Recommends:     %{use_python_pkg}-keyring
 Recommends:     %{use_python_pkg}-keyring-keyutils
 
-Recommends:     build
+Recommends:     %{obs_build_pkg}
 Recommends:     ca-certificates
 Recommends:     diffstat
 Recommends:     powerpc32