From ee2e72b477e9e8f8fdf94b08793027fc98d091d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:49:23 +0000 Subject: [PATCH 01/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 7319afc..c772461 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.59 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -154,6 +154,9 @@ popd %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.14.59-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Mar 09 2023 Neal Gompa - 1.14.59-1 - Update to 1.14.59 From c9fee3b0381b01af46aa3211cbea868343b2865f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:21:39 +0000 Subject: [PATCH 02/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index c772461..0d67658 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.59 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -154,6 +154,9 @@ popd %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.14.59-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jul 22 2023 Fedora Release Engineering - 1.14.59-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 422dc538e0d71df0d2a433ceca87e2dfc72857ab Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 4 Mar 2024 05:55:01 -0500 Subject: [PATCH 03/13] Update to 1.14.68 --- sources | 2 +- zypper.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index dceffb7..d2ed7ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.59.tar.gz) = 301155c438eb1726e5225c13a751d5d8aee3000cba86921905775519bd57c7909b0640255e20219b8e66527d16f4a1d4902197e77dabc1dcb0a4275b91016528 +SHA512 (zypper-1.14.68.tar.gz) = d8cb1ef28080ebdfe22c0eb8a009ef1e51b30f24a15e463e80e62dee04af6245e8daa87ad7d30904bbf5e337580e39c5c2c784193a05224786f7c697eaf41c1a diff --git a/zypper.spec b/zypper.spec index 0d67658..e7ceb1a 100644 --- a/zypper.spec +++ b/zypper.spec @@ -4,8 +4,8 @@ %global min_libzypp_ver 17.31.7 Name: zypper -Version: 1.14.59 -Release: 3%{?dist} +Version: 1.14.68 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -154,6 +154,9 @@ popd %changelog +* Mon Mar 04 2024 Neal Gompa - 1.14.68-1 +- Update to 1.14.68 + * Sat Jan 27 2024 Fedora Release Engineering - 1.14.59-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 0e5420e30deb6c1bfee5879826eb13ade5f205ef Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 4 Mar 2024 06:02:56 -0500 Subject: [PATCH 04/13] Drop unneeded logic to install bash completion file --- zypper.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/zypper.spec b/zypper.spec index e7ceb1a..0babc8b 100644 --- a/zypper.spec +++ b/zypper.spec @@ -106,11 +106,6 @@ ln -sf zypp-aptitude %{buildroot}%{_bindir}/zypp-apt-get rm %{buildroot}%{_bindir}/apt ln -sf zypp-aptitude %{buildroot}%{_bindir}/zypp-apt -# Move the bash completion file -mkdir -p %{buildroot}%{_datadir}/bash-completion/completions -mv %{buildroot}%{_sysconfdir}/bash_completion.d/zypper.sh %{buildroot}%{_datadir}/bash-completion/completions/zypper -rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/ - # Remove conflicting man page and rename needs-restarting rm %{buildroot}%{_mandir}/man1/needs-restarting.1* mv %{buildroot}%{_bindir}/needs-restarting %{buildroot}%{_bindir}/zypp-needs-restarting From 4943021216d77aeae6d5ca32a4156c662bd4be3a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 14 Apr 2024 19:50:31 -0400 Subject: [PATCH 05/13] Rebuild for libzypp-tui soname fix --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 0babc8b..d7f71b0 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.68 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -149,6 +149,9 @@ popd %changelog +* Sun Apr 14 2024 Neal Gompa - 1.14.68-2 +- Rebuild for libzypp-tui soname fix + * Mon Mar 04 2024 Neal Gompa - 1.14.68-1 - Update to 1.14.68 From 6b93994cdc8c5ae26bc53f500d7819f4fc17c1ca Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 5 Jun 2024 18:13:05 -0400 Subject: [PATCH 06/13] Update to 1.14.73 --- sources | 2 +- zypper.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index d2ed7ed..7866dc3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.68.tar.gz) = d8cb1ef28080ebdfe22c0eb8a009ef1e51b30f24a15e463e80e62dee04af6245e8daa87ad7d30904bbf5e337580e39c5c2c784193a05224786f7c697eaf41c1a +SHA512 (zypper-1.14.73.tar.gz) = 6463cbc196a0759ba297c77bb08b0d24aad9500a1d61e8f10fe13927e041c5659f1cf5c3761621a824bd4aaa5789c9386c85b6be12b9031871fe11d8b1221ae3 diff --git a/zypper.spec b/zypper.spec index d7f71b0..4fee474 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,11 +1,11 @@ # Force out of source build %undefine __cmake_in_source_build -%global min_libzypp_ver 17.31.7 +%global min_libzypp_ver 17.34.1 Name: zypper -Version: 1.14.68 -Release: 2%{?dist} +Version: 1.14.73 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -149,6 +149,9 @@ popd %changelog +* Wed Jun 05 2024 Neal Gompa - 1.14.73-1 +- Update to 1.14.73 + * Sun Apr 14 2024 Neal Gompa - 1.14.68-2 - Rebuild for libzypp-tui soname fix From a6f438b357804fb0a4d36d4b27c221cc976d9f7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:59:38 +0000 Subject: [PATCH 07/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 4fee474..b6e20a4 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.73 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -149,6 +149,9 @@ popd %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.14.73-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 05 2024 Neal Gompa - 1.14.73-1 - Update to 1.14.73 From 8f5df3d14641d0b47e68d9150edf7686af850a40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 04:06:22 +0200 Subject: [PATCH 08/13] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- zypper.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/zypper.spec b/zypper.spec index b6e20a4..9041229 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,10 +5,11 @@ Name: zypper Version: 1.14.73 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command line package manager using libzypp -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://en.opensuse.org/Portal:Zypper Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{version}.tar.gz @@ -149,6 +150,9 @@ popd %changelog +* Fri Jul 26 2024 Miroslav Suchý - 1.14.73-3 +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 1.14.73-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 90758dbd9b4a4a5ca7972f7209f578e01a3c95dc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:55:29 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 9041229..a860d63 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.73 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Command line package manager using libzypp # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -150,6 +150,9 @@ popd %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.14.73-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 1.14.73-3 - convert license to SPDX From b04b95e76475a7390153346e82538b41a4bdcb8b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 19 Mar 2025 16:33:33 -0400 Subject: [PATCH 10/13] Rebase to 1.14.88 --- sources | 2 +- zypper.spec | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 7866dc3..a0ea5af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.73.tar.gz) = 6463cbc196a0759ba297c77bb08b0d24aad9500a1d61e8f10fe13927e041c5659f1cf5c3761621a824bd4aaa5789c9386c85b6be12b9031871fe11d8b1221ae3 +SHA512 (zypper-1.14.88.tar.gz) = e905d981d99aa23a0d32973da90885ca986ad371fc87bfeed4f701ad652fc010625324971275270ddcd6f4b8c860161b264d2e16cd047d94de49bce3229372ee diff --git a/zypper.spec b/zypper.spec index a860d63..36fbe72 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,11 +1,11 @@ # Force out of source build %undefine __cmake_in_source_build -%global min_libzypp_ver 17.34.1 +%global min_libzypp_ver 17.36.4 Name: zypper -Version: 1.14.73 -Release: 4%{?dist} +Version: 1.14.88 +Release: 1%{?dist} Summary: Command line package manager using libzypp # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -15,7 +15,7 @@ Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{ BuildRequires: %{_bindir}/asciidoctor BuildRequires: %{_bindir}/xsltproc -BuildRequires: cmake >= 3.1 +BuildRequires: cmake >= 3.5 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: perl-generators @@ -27,7 +27,6 @@ BuildRequires: readline-devel BuildRequires: libxml2-devel BuildRequires: libzypp-devel >= %{min_libzypp_ver} Requires: libzypp%{?_isa} >= %{min_libzypp_ver} -Requires: procps # Blech, apparently we don't want bash-completion always... Cf. rhbz#1652183 Recommends: bash-completion @@ -41,6 +40,7 @@ Provides: zypper(oldpackage) Provides: zypper(updatestack-only) Provides: zypper(auto-agree-with-product-licenses) Provides: zypper(purge-kernels) +Provides: zypper(include-all-archs) %description @@ -107,6 +107,12 @@ ln -sf zypp-aptitude %{buildroot}%{_bindir}/zypp-apt-get rm %{buildroot}%{_bindir}/apt ln -sf zypp-aptitude %{buildroot}%{_bindir}/zypp-apt +%if "%{_sbindir}" != "/usr/sbin" +# If sbin-bin merge, move everything accordingly +mv %{buildroot}%{_prefix}/sbin/* %{buildroot}%{_sbindir} +rmdir %{buildroot}%{_prefix}/sbin +%endif + # Remove conflicting man page and rename needs-restarting rm %{buildroot}%{_mandir}/man1/needs-restarting.1* mv %{buildroot}%{_bindir}/needs-restarting %{buildroot}%{_bindir}/zypp-needs-restarting @@ -150,6 +156,9 @@ popd %changelog +* Wed Mar 19 2025 Neal Gompa - 1.14.88-1 +- Rebase to 1.14.88 + * Sun Jan 19 2025 Fedora Release Engineering - 1.14.73-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7ce7087eb1a67d69633625d381a8c193878e59f3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:22:22 +0000 Subject: [PATCH 11/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 36fbe72..66c9265 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.88 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -156,6 +156,9 @@ popd %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.14.88-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Mar 19 2025 Neal Gompa - 1.14.88-1 - Rebase to 1.14.88 From 668a5f4ac7a9850e5934ce9c373f820200877ef9 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 16 Jan 2026 06:59:43 -0500 Subject: [PATCH 12/13] Update to 1.14.94 --- sources | 2 +- zypper.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index a0ea5af..e96c468 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.88.tar.gz) = e905d981d99aa23a0d32973da90885ca986ad371fc87bfeed4f701ad652fc010625324971275270ddcd6f4b8c860161b264d2e16cd047d94de49bce3229372ee +SHA512 (zypper-1.14.94.tar.gz) = 579f91def0c0e79ba81fe73341302ba1a8942a9878d2305ca11fb0a7747936612ed6eb91c68e6a0199687fd06ac0b9dc2fbae5dd9b895e484aa204b2b519dc2e diff --git a/zypper.spec b/zypper.spec index 66c9265..24970b9 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,11 +1,11 @@ # Force out of source build %undefine __cmake_in_source_build -%global min_libzypp_ver 17.36.4 +%global min_libzypp_ver 17.37.12 Name: zypper -Version: 1.14.88 -Release: 2%{?dist} +Version: 1.14.94 +Release: 1%{?dist} Summary: Command line package manager using libzypp # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -156,6 +156,9 @@ popd %changelog +* Fri Jan 16 2026 Neal Gompa - 1.14.94-1 +- Update to 1.14.94 + * Fri Jul 25 2025 Fedora Release Engineering - 1.14.88-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 360355bfb5e1e0741dada86d9e50c3a45969d229 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:45:07 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 24970b9..472978a 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.94 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp # Automatically converted from old format: GPLv2+ - review is highly recommended. @@ -156,6 +156,9 @@ popd %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.14.94-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Jan 16 2026 Neal Gompa - 1.14.94-1 - Update to 1.14.94