From f90b318f56fa9dcd85feb58f4bff48d06b382879 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 28 May 2019 19:20:17 +0200 Subject: [PATCH 01/40] Rebuilt (libzypp) --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 21ce278..a385943 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.27 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -157,6 +157,9 @@ popd %changelog +* Tue May 28 2019 Björn Esser - 1.14.27-2 +- Rebuilt (libzypp) + * Mon Mar 25 2019 Björn Esser - 1.14.27-1 - Rebase to 1.14.27 (#1680605) From 2053043b82700c90de68612e0deda05a09165e5d Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 30 May 2019 13:33:40 +0200 Subject: [PATCH 02/40] Perl 5.30 rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index a385943..88b715d 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.27 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -157,6 +157,9 @@ popd %changelog +* Thu May 30 2019 Jitka Plesnikova - 1.14.27-3 +- Perl 5.30 rebuild + * Tue May 28 2019 Björn Esser - 1.14.27-2 - Rebuilt (libzypp) From bc47761d0e1aa8bc16fe465d796932171543cb73 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 05:06:37 +0000 Subject: [PATCH 03/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 88b715d..b226b22 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.27 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -157,6 +157,9 @@ popd %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.14.27-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu May 30 2019 Jitka Plesnikova - 1.14.27-3 - Perl 5.30 rebuild From 42c0dd08551fbdd30aa0429c503c48d8eb07a356 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 27 Aug 2019 18:09:44 -0400 Subject: [PATCH 04/40] Update to 1.14.29 (#1719278) --- sources | 2 +- zypper.spec | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sources b/sources index fc4c10e..fbce4f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.27.tar.gz) = cb5115c57b32bfed06ffd5be13ddc463457161f132ff44270377bfa047e858ca156fb057b19e650d5c211f8496786060e3c2e8237d19266a34af8f168a5ef2fc +SHA512 (zypper-1.14.29.tar.gz) = 69e10243bcce627bc323839251a374e756aad531640b1dc924c21c25a5317ebab95f50dc09c7ddc5f4aeaabbae9fb03dc5b8c968342ec1534ce987c911891822 diff --git a/zypper.spec b/zypper.spec index b226b22..2ca8265 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,8 +1,8 @@ -%global min_libzypp_ver 17.11.0 +%global min_libzypp_ver 17.14.0 Name: zypper -Version: 1.14.27 -Release: 4%{?dist} +Version: 1.14.29 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -83,13 +83,10 @@ find -type f -exec sed -i -e "s|\${INSTALL_PREFIX}/share/doc/packages/\${PACKAGE %build %cmake . -B"%{_vpath_builddir}" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} -DENABLE_BUILD_TESTS=ON -DENABLE_BUILD_TRANS=ON %make_build -C %{_vpath_builddir} -%make_build -C %{_vpath_builddir}/po translations -%make_build -C %{_vpath_builddir}/tests %install %make_install -C %{_vpath_builddir} -%make_install -C %{_vpath_builddir}/po mkdir -p %{buildroot}%{_libexecdir}/zypper/commands @@ -120,7 +117,7 @@ mv %{buildroot}%{_bindir}/needs-restarting %{buildroot}%{_bindir}/zypp-needs-res %check pushd %{_vpath_builddir}/tests -ctest -VV . +ctest -VV --output-on-failure . popd %files -f %{name}.lang @@ -157,6 +154,9 @@ popd %changelog +* Tue Aug 27 2019 Neal Gompa - 1.14.29-1 +- Update to 1.14.29 (#1719278) + * Sat Jul 27 2019 Fedora Release Engineering - 1.14.27-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 3f4ea1be179a63fcaf8ebbbd7d10cf07f2e910e5 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 12 Nov 2019 19:43:45 -0500 Subject: [PATCH 05/40] Update to 1.14.32 (#1747529) --- sources | 2 +- zypper.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index fbce4f3..40b7617 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.29.tar.gz) = 69e10243bcce627bc323839251a374e756aad531640b1dc924c21c25a5317ebab95f50dc09c7ddc5f4aeaabbae9fb03dc5b8c968342ec1534ce987c911891822 +SHA512 (zypper-1.14.32.tar.gz) = 6878f47eaaa447d8a42aab0f189146216996fb11605169bd30aaaed6e544140c7a3d8ed7f41da353f1da0fffbc70a889e0df9c02f5e993fdd5646e86323bb2ee diff --git a/zypper.spec b/zypper.spec index 2ca8265..5cb2ac1 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 17.14.0 +%global min_libzypp_ver 17.15.0 Name: zypper -Version: 1.14.29 +Version: 1.14.32 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -154,6 +154,9 @@ popd %changelog +* Tue Nov 12 2019 Neal Gompa - 1.14.32-1 +- Update to 1.14.32 (#1747529) + * Tue Aug 27 2019 Neal Gompa - 1.14.29-1 - Update to 1.14.29 (#1719278) From 38d4be3bb519070fa96590292ccbe7c563bece17 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 27 Jan 2020 03:33:38 -0500 Subject: [PATCH 06/40] Update to 1.14.33 (#1777955) --- sources | 2 +- zypper.spec | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/sources b/sources index 40b7617..cd26b92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.32.tar.gz) = 6878f47eaaa447d8a42aab0f189146216996fb11605169bd30aaaed6e544140c7a3d8ed7f41da353f1da0fffbc70a889e0df9c02f5e993fdd5646e86323bb2ee +SHA512 (zypper-1.14.33.tar.gz) = 15f8ba6ad7120dd06284ae2d7ecd85fe538214eca090b173de8eae7fe4a66dc3433af9b0f788dcf868bf073531c7c565bc8d41e2f76f51286a8315ede565b898 diff --git a/zypper.spec b/zypper.spec index 5cb2ac1..179fdba 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 17.15.0 +%global min_libzypp_ver 17.16.1 Name: zypper -Version: 1.14.32 +Version: 1.14.33 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -36,6 +36,7 @@ Recommends: zypper-log Provides: zypper(oldpackage) Provides: zypper(updatestack-only) Provides: zypper(auto-agree-with-product-licenses) +Provides: zypper(purge-kernels) %description @@ -103,9 +104,6 @@ ln -sf zypp-aptitude %{buildroot}%{_bindir}/zypp-apt-get rm %{buildroot}%{_bindir}/apt ln -sf zypp-aptitude %{buildroot}%{_bindir}/zypp-apt -# Fix shebang for zypper-log -sed -e "s|/usr/bin/env python|/usr/bin/python3|g" -i %{buildroot}%{_sbindir}/zypper-log - # 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 @@ -154,6 +152,9 @@ popd %changelog +* Mon Jan 27 2020 Neal Gompa - 1.14.33-1 +- Update to 1.14.33 (#1777955) + * Tue Nov 12 2019 Neal Gompa - 1.14.32-1 - Update to 1.14.32 (#1747529) From 9505268a30824b0132dc50cbee0afa9b9812f95f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 05:25:19 +0000 Subject: [PATCH 07/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 179fdba..ad4870e 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.33 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -152,6 +152,9 @@ popd %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.14.33-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Mon Jan 27 2020 Neal Gompa - 1.14.33-1 - Update to 1.14.33 (#1777955) From 2bcdae58e97688ad8d1c84d7e9352e7de2fdd9a5 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 7 Mar 2020 19:15:05 -0500 Subject: [PATCH 08/40] Update to 1.14.34 (#1805837) --- sources | 2 +- zypper.spec | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sources b/sources index cd26b92..d8011a1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.33.tar.gz) = 15f8ba6ad7120dd06284ae2d7ecd85fe538214eca090b173de8eae7fe4a66dc3433af9b0f788dcf868bf073531c7c565bc8d41e2f76f51286a8315ede565b898 +SHA512 (zypper-1.14.34.tar.gz) = a022cc6489175806ce9449cbff5002b228427bd616acdeed6c7831394abd8f3a845660b3487854328d182f3a164eef33ab3ac7f453f8fb731bf55e8ca04fd4d1 diff --git a/zypper.spec b/zypper.spec index ad4870e..e22dd6c 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,8 +1,8 @@ %global min_libzypp_ver 17.16.1 Name: zypper -Version: 1.14.33 -Release: 2%{?dist} +Version: 1.14.34 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -152,6 +152,9 @@ popd %changelog +* Sat Mar 07 2020 Neal Gompa - 1.14.34-1 +- Update to 1.14.34 (#1805837) + * Fri Jan 31 2020 Fedora Release Engineering - 1.14.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 668843f6a82806ebbfac1eb08927aa8b8a9f343a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 14 Mar 2020 03:09:14 -0400 Subject: [PATCH 09/40] Enable -fcommon workaround to fix FTBFS (#1800295) --- zypper.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index e22dd6c..36c57b8 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,3 +1,7 @@ +# Cf. https://github.com/openSUSE/zypper/issues/328 +# Cf. https://bugzilla.redhat.com/show_bug.cgi?id=1800295 +%define _legacy_common_support 1 + %global min_libzypp_ver 17.16.1 Name: zypper @@ -152,8 +156,9 @@ popd %changelog -* Sat Mar 07 2020 Neal Gompa - 1.14.34-1 +* Sat Mar 14 2020 Neal Gompa - 1.14.34-1 - Update to 1.14.34 (#1805837) +- Enable -fcommon workaround to fix FTBFS (#1800295) * Fri Jan 31 2020 Fedora Release Engineering - 1.14.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From ac509899f6c5e1919531f847beeb74730c9344ec Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 14 Mar 2020 03:25:40 -0400 Subject: [PATCH 10/40] Revert "Enable -fcommon workaround to fix FTBFS (#1800295)" It doesn't actually fix anything... This reverts commit 668843f6a82806ebbfac1eb08927aa8b8a9f343a. --- zypper.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/zypper.spec b/zypper.spec index 36c57b8..e22dd6c 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,3 @@ -# Cf. https://github.com/openSUSE/zypper/issues/328 -# Cf. https://bugzilla.redhat.com/show_bug.cgi?id=1800295 -%define _legacy_common_support 1 - %global min_libzypp_ver 17.16.1 Name: zypper @@ -156,9 +152,8 @@ popd %changelog -* Sat Mar 14 2020 Neal Gompa - 1.14.34-1 +* Sat Mar 07 2020 Neal Gompa - 1.14.34-1 - Update to 1.14.34 (#1805837) -- Enable -fcommon workaround to fix FTBFS (#1800295) * Fri Jan 31 2020 Fedora Release Engineering - 1.14.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 78703e0f0b30baa2c035a81146907ce679a4d5c5 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 20 Mar 2020 09:42:48 -0400 Subject: [PATCH 11/40] Update to 1.14.35 (#1805837) --- ...bject-must-be-invocable-as-const-err.patch | 62 +++++++++++++++++++ sources | 2 +- zypper.spec | 14 +++-- 3 files changed, 73 insertions(+), 5 deletions(-) create mode 100644 0001-Fix-comparison-object-must-be-invocable-as-const-err.patch diff --git a/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch b/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch new file mode 100644 index 0000000..269dffb --- /dev/null +++ b/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch @@ -0,0 +1,62 @@ +From 84592db9db303d4010dd0138b8d0ee40fd668167 Mon Sep 17 00:00:00 2001 +From: Michael Andres +Date: Fri, 20 Mar 2020 13:44:09 +0100 +Subject: [PATCH] Fix comparison object must be invocable as const errors + +--- + src/repos.cc | 2 +- + src/update.cc | 2 +- + src/utils/misc.h | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/repos.cc b/src/repos.cc +index da543f56..e5f2b016 100644 +--- a/src/repos.cc ++++ b/src/repos.cc +@@ -1473,7 +1473,7 @@ RepoInfoSet collect_repos_by_option( Zypper & zypper, const RepoServiceCommonSel + + if ( selectOpts._all ) + { +- std::for_each( repos.begin(), repos.end(), [&toModify] (const RepoInfo &info) { toModify.insert( info ); } ); ++ //std::for_each( repos.begin(), repos.end(), [&toModify] (const RepoInfo &info) { toModify.insert( info ); } ); + } + else + { +diff --git a/src/update.cc b/src/update.cc +index 0b004af3..38ca38cb 100755 +--- a/src/update.cc ++++ b/src/update.cc +@@ -248,7 +248,7 @@ namespace + + struct CategorySort + { +- bool operator()( const Patch::Category & lhs, const Patch::Category & rhs ) ++ bool operator()( const Patch::Category & lhs, const Patch::Category & rhs ) const + { + if ( lhs == rhs ) + return false; +diff --git a/src/utils/misc.h b/src/utils/misc.h +index cec76127..4de5b301 100644 +--- a/src/utils/misc.h ++++ b/src/utils/misc.h +@@ -182,7 +182,7 @@ std::string & indent( std::string & text, int columns ); + // comparator for RepoInfo set + struct RepoInfoAliasComparator + { +- bool operator()( const RepoInfo & a, const RepoInfo & b ) ++ bool operator()( const RepoInfo & a, const RepoInfo & b ) const + { return a.alias() < b.alias(); } + }; + +@@ -190,7 +190,7 @@ struct RepoInfoAliasComparator + // comparator for Service set + struct ServiceAliasComparator + { +- bool operator()( const repo::RepoInfoBase_Ptr & a, const repo::RepoInfoBase_Ptr & b ) ++ bool operator()( const repo::RepoInfoBase_Ptr & a, const repo::RepoInfoBase_Ptr & b ) const + { return a->alias() < b->alias(); } + }; + +-- +2.24.1 + diff --git a/sources b/sources index d8011a1..c233702 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.34.tar.gz) = a022cc6489175806ce9449cbff5002b228427bd616acdeed6c7831394abd8f3a845660b3487854328d182f3a164eef33ab3ac7f453f8fb731bf55e8ca04fd4d1 +SHA512 (zypper-1.14.35.tar.gz) = c8be4ea7403f2cd3824bc18b11c41ada542ef3033dbe830e3dddf84118d7afaa912552c2e47ab852b8883eb93c2f0586f92866beaec4c3dba20cf9c11886491e diff --git a/zypper.spec b/zypper.spec index e22dd6c..cd18816 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 17.16.1 +%global min_libzypp_ver 17.23.2 Name: zypper -Version: 1.14.34 +Version: 1.14.35 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -9,9 +9,12 @@ License: GPLv2+ URL: http://en.opensuse.org/Portal:Zypper Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{version}.tar.gz +# Backports from upstream +Patch0001: 0001-Fix-comparison-object-must-be-invocable-as-const-err.patch + BuildRequires: %{_bindir}/asciidoctor BuildRequires: %{_bindir}/xsltproc -BuildRequires: cmake +BuildRequires: cmake >= 3.1 BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: perl-generators @@ -152,8 +155,11 @@ popd %changelog +* Fri Mar 20 2020 Neal Gompa - 1.14.35-1 +- Update to 1.14.35 (#1805837) + * Sat Mar 07 2020 Neal Gompa - 1.14.34-1 -- Update to 1.14.34 (#1805837) +- Update to 1.14.34 * Fri Jan 31 2020 Fedora Release Engineering - 1.14.33-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 2d322cb16b517e8f6986c35796ce4bf12032be3a Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 20 Mar 2020 10:28:48 -0400 Subject: [PATCH 12/40] Backport fixup commit for building with C++17 --- ...bject-must-be-invocable-as-const-err.patch | 2 +- ...ison-object-must-be-invocable-as-con.patch | 26 +++++++++++++++++++ zypper.spec | 6 ++++- 3 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch diff --git a/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch b/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch index 269dffb..db044a8 100644 --- a/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch +++ b/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch @@ -1,7 +1,7 @@ From 84592db9db303d4010dd0138b8d0ee40fd668167 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Fri, 20 Mar 2020 13:44:09 +0100 -Subject: [PATCH] Fix comparison object must be invocable as const errors +Subject: [PATCH 1/2] Fix comparison object must be invocable as const errors --- src/repos.cc | 2 +- diff --git a/0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch b/0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch new file mode 100644 index 0000000..522bd61 --- /dev/null +++ b/0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch @@ -0,0 +1,26 @@ +From 1a37b2a4631470a11c6b9ff00935978dcf8a0539 Mon Sep 17 00:00:00 2001 +From: Michael Andres +Date: Fri, 20 Mar 2020 15:14:24 +0100 +Subject: [PATCH 2/2] fixup! Fix comparison object must be invocable as const + errors + +--- + src/repos.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/repos.cc b/src/repos.cc +index e5f2b016..da543f56 100644 +--- a/src/repos.cc ++++ b/src/repos.cc +@@ -1473,7 +1473,7 @@ RepoInfoSet collect_repos_by_option( Zypper & zypper, const RepoServiceCommonSel + + if ( selectOpts._all ) + { +- //std::for_each( repos.begin(), repos.end(), [&toModify] (const RepoInfo &info) { toModify.insert( info ); } ); ++ std::for_each( repos.begin(), repos.end(), [&toModify] (const RepoInfo &info) { toModify.insert( info ); } ); + } + else + { +-- +2.24.1 + diff --git a/zypper.spec b/zypper.spec index cd18816..ce5de92 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -11,6 +11,7 @@ Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{ # Backports from upstream Patch0001: 0001-Fix-comparison-object-must-be-invocable-as-const-err.patch +Patch0002: 0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch BuildRequires: %{_bindir}/asciidoctor BuildRequires: %{_bindir}/xsltproc @@ -155,6 +156,9 @@ popd %changelog +* Fri Mar 20 2020 Neal Gompa - 1.14.35-2 +- Backport fixup commit for building with C++17 + * Fri Mar 20 2020 Neal Gompa - 1.14.35-1 - Update to 1.14.35 (#1805837) From 078c9e91388ad64a1246650330b97ddd441bdb5c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 25 Jun 2020 15:14:25 +0200 Subject: [PATCH 13/40] Perl 5.32 rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index ce5de92..aec5bf8 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.35 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -156,6 +156,9 @@ popd %changelog +* Thu Jun 25 2020 Jitka Plesnikova - 1.14.35-3 +- Perl 5.32 rebuild + * Fri Mar 20 2020 Neal Gompa - 1.14.35-2 - Backport fixup commit for building with C++17 From 709818af6487149e2b17ebd6f4eb44af40c85e3d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:28:57 +0000 Subject: [PATCH 14/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 aec5bf8..7a47bb7 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.35 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -156,6 +156,9 @@ popd %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.14.35-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jun 25 2020 Jitka Plesnikova - 1.14.35-3 - Perl 5.32 rebuild From bcaeac08366c4c5953a838139ee91dddb287867f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:50:41 +0000 Subject: [PATCH 15/40] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zypper.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 7a47bb7..d06f9a6 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.35 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -156,6 +156,10 @@ popd %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 1.14.35-5 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 1.14.35-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1dafd3ee841c132df0588712822d7e13e81f0a74 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 8 Aug 2020 23:01:44 -0400 Subject: [PATCH 16/40] Update to 1.14.37 (#1823433) --- ...bject-must-be-invocable-as-const-err.patch | 62 ------------------- ...ison-object-must-be-invocable-as-con.patch | 26 -------- sources | 2 +- zypper.spec | 22 ++++--- 4 files changed, 13 insertions(+), 99 deletions(-) delete mode 100644 0001-Fix-comparison-object-must-be-invocable-as-const-err.patch delete mode 100644 0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch diff --git a/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch b/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch deleted file mode 100644 index db044a8..0000000 --- a/0001-Fix-comparison-object-must-be-invocable-as-const-err.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 84592db9db303d4010dd0138b8d0ee40fd668167 Mon Sep 17 00:00:00 2001 -From: Michael Andres -Date: Fri, 20 Mar 2020 13:44:09 +0100 -Subject: [PATCH 1/2] Fix comparison object must be invocable as const errors - ---- - src/repos.cc | 2 +- - src/update.cc | 2 +- - src/utils/misc.h | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/repos.cc b/src/repos.cc -index da543f56..e5f2b016 100644 ---- a/src/repos.cc -+++ b/src/repos.cc -@@ -1473,7 +1473,7 @@ RepoInfoSet collect_repos_by_option( Zypper & zypper, const RepoServiceCommonSel - - if ( selectOpts._all ) - { -- std::for_each( repos.begin(), repos.end(), [&toModify] (const RepoInfo &info) { toModify.insert( info ); } ); -+ //std::for_each( repos.begin(), repos.end(), [&toModify] (const RepoInfo &info) { toModify.insert( info ); } ); - } - else - { -diff --git a/src/update.cc b/src/update.cc -index 0b004af3..38ca38cb 100755 ---- a/src/update.cc -+++ b/src/update.cc -@@ -248,7 +248,7 @@ namespace - - struct CategorySort - { -- bool operator()( const Patch::Category & lhs, const Patch::Category & rhs ) -+ bool operator()( const Patch::Category & lhs, const Patch::Category & rhs ) const - { - if ( lhs == rhs ) - return false; -diff --git a/src/utils/misc.h b/src/utils/misc.h -index cec76127..4de5b301 100644 ---- a/src/utils/misc.h -+++ b/src/utils/misc.h -@@ -182,7 +182,7 @@ std::string & indent( std::string & text, int columns ); - // comparator for RepoInfo set - struct RepoInfoAliasComparator - { -- bool operator()( const RepoInfo & a, const RepoInfo & b ) -+ bool operator()( const RepoInfo & a, const RepoInfo & b ) const - { return a.alias() < b.alias(); } - }; - -@@ -190,7 +190,7 @@ struct RepoInfoAliasComparator - // comparator for Service set - struct ServiceAliasComparator - { -- bool operator()( const repo::RepoInfoBase_Ptr & a, const repo::RepoInfoBase_Ptr & b ) -+ bool operator()( const repo::RepoInfoBase_Ptr & a, const repo::RepoInfoBase_Ptr & b ) const - { return a->alias() < b->alias(); } - }; - --- -2.24.1 - diff --git a/0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch b/0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch deleted file mode 100644 index 522bd61..0000000 --- a/0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 1a37b2a4631470a11c6b9ff00935978dcf8a0539 Mon Sep 17 00:00:00 2001 -From: Michael Andres -Date: Fri, 20 Mar 2020 15:14:24 +0100 -Subject: [PATCH 2/2] fixup! Fix comparison object must be invocable as const - errors - ---- - src/repos.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/repos.cc b/src/repos.cc -index e5f2b016..da543f56 100644 ---- a/src/repos.cc -+++ b/src/repos.cc -@@ -1473,7 +1473,7 @@ RepoInfoSet collect_repos_by_option( Zypper & zypper, const RepoServiceCommonSel - - if ( selectOpts._all ) - { -- //std::for_each( repos.begin(), repos.end(), [&toModify] (const RepoInfo &info) { toModify.insert( info ); } ); -+ std::for_each( repos.begin(), repos.end(), [&toModify] (const RepoInfo &info) { toModify.insert( info ); } ); - } - else - { --- -2.24.1 - diff --git a/sources b/sources index c233702..fbaf648 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.35.tar.gz) = c8be4ea7403f2cd3824bc18b11c41ada542ef3033dbe830e3dddf84118d7afaa912552c2e47ab852b8883eb93c2f0586f92866beaec4c3dba20cf9c11886491e +SHA512 (zypper-1.14.37.tar.gz) = 955fb5fdf98bf0d8fb9ba677fae418de89f70ba201118a67e71e9d916c8c486f8226b07c910566aed70f9ad7e169ca93432fce114e1b9c2a41e2ce5f18f6af06 diff --git a/zypper.spec b/zypper.spec index d06f9a6..abb8e2e 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,18 +1,17 @@ -%global min_libzypp_ver 17.23.2 +# Force out of source build +%undefine __cmake_in_source_build + +%global min_libzypp_ver 17.24.1 Name: zypper -Version: 1.14.35 -Release: 5%{?dist} +Version: 1.14.37 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ URL: http://en.opensuse.org/Portal:Zypper Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{version}.tar.gz -# Backports from upstream -Patch0001: 0001-Fix-comparison-object-must-be-invocable-as-const-err.patch -Patch0002: 0002-fixup-Fix-comparison-object-must-be-invocable-as-con.patch - BuildRequires: %{_bindir}/asciidoctor BuildRequires: %{_bindir}/xsltproc BuildRequires: cmake >= 3.1 @@ -86,12 +85,12 @@ find -type f -exec sed -i -e "s|\${CMAKE_INSTALL_PREFIX}/lib/\${PACKAGE}|\${CMAK find -type f -exec sed -i -e "s|\${INSTALL_PREFIX}/share/doc/packages/\${PACKAGE}|\${INSTALL_PREFIX}/share/doc/\${PACKAGE}|g" {} ';' %build -%cmake . -B"%{_vpath_builddir}" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} -DENABLE_BUILD_TESTS=ON -DENABLE_BUILD_TRANS=ON -%make_build -C %{_vpath_builddir} +%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} -DENABLE_BUILD_TESTS=ON -DENABLE_BUILD_TRANS=ON +%cmake_build %install -%make_install -C %{_vpath_builddir} +%cmake_install mkdir -p %{buildroot}%{_libexecdir}/zypper/commands @@ -156,6 +155,9 @@ popd %changelog +* Sat Aug 08 2020 Neal Gompa - 1.14.37-1 +- Update to 1.14.37 (#1823433) + * Sat Aug 01 2020 Fedora Release Engineering - 1.14.35-5 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From cff3cd11a805c2eb94067a4478e9776d1db69cf2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:47:15 +0000 Subject: [PATCH 17/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 abb8e2e..c4103cc 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.37 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -155,6 +155,9 @@ popd %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 1.14.37-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Aug 08 2020 Neal Gompa - 1.14.37-1 - Update to 1.14.37 (#1823433) From 47cdd83b50f3c104a75dd845f6e0aeae9fd000ab Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 11 Feb 2021 08:08:35 -0500 Subject: [PATCH 18/40] Update to 1.14.42 (#1823433) --- sources | 2 +- zypper.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index fbaf648..21da145 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.37.tar.gz) = 955fb5fdf98bf0d8fb9ba677fae418de89f70ba201118a67e71e9d916c8c486f8226b07c910566aed70f9ad7e169ca93432fce114e1b9c2a41e2ce5f18f6af06 +SHA512 (zypper-1.14.42.tar.gz) = 7ab4e2489e5bcc39e4f83de65aa9cdbcaf4066dcb996e23a833d40fd7dceb97cafcefd9cbdb6ccc9e85cfe94a1f2fd47d453856fd5625b864de62c139338a310 diff --git a/zypper.spec b/zypper.spec index c4103cc..1f50d96 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.24.1 +%global min_libzypp_ver 17.25.6 Name: zypper -Version: 1.14.37 -Release: 2%{?dist} +Version: 1.14.42 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -155,6 +155,9 @@ popd %changelog +* Thu Feb 11 2021 Neal Gompa - 1.14.42-1 +- Update to 1.14.42 (#1823433) + * Thu Jan 28 2021 Fedora Release Engineering - 1.14.37-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From af949ec5a032fa229869d3a3d755bd1a1babf7e0 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 12:20:34 +0200 Subject: [PATCH 19/40] Perl 5.34 rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 1f50d96..043e2ca 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.42 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -155,6 +155,9 @@ popd %changelog +* Fri May 21 2021 Jitka Plesnikova - 1.14.42-2 +- Perl 5.34 rebuild + * Thu Feb 11 2021 Neal Gompa - 1.14.42-1 - Update to 1.14.42 (#1823433) From 91e565728ee62457ba1bbb02d61344b06fd333eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:24:17 +0000 Subject: [PATCH 20/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 043e2ca..d40fa88 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.42 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -155,6 +155,9 @@ popd %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.14.42-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 21 2021 Jitka Plesnikova - 1.14.42-2 - Perl 5.34 rebuild From 8365212dca8c8ba683eaa3e414012712e57d9d45 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:58:17 +0000 Subject: [PATCH 21/40] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 d40fa88..434ea4b 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.42 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -155,6 +155,9 @@ popd %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.14.42-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 1.14.42-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3b999f6f9413b2c7555a75fc4214275ed0025de2 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 1 Jun 2022 02:28:04 +0200 Subject: [PATCH 22/40] Perl 5.36 rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index 434ea4b..00cfed1 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.42 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -155,6 +155,9 @@ popd %changelog +* Wed Jun 01 2022 Jitka Plesnikova - 1.14.42-5 +- Perl 5.36 rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.14.42-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From aa24893a7c54a2c9c123b4ca56a4fef25796e330 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 14:02:22 +0000 Subject: [PATCH 23/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 00cfed1..e3e2b81 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.42 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -155,6 +155,9 @@ popd %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.14.42-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 01 2022 Jitka Plesnikova - 1.14.42-5 - Perl 5.36 rebuild From e98481a38893b93653010c97c45b09b882c6f90c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Fri, 2 Sep 2022 09:32:51 -0400 Subject: [PATCH 24/40] Update to 1.14.55 (#1932773) --- sources | 2 +- zypper.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 21da145..f6c411e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.42.tar.gz) = 7ab4e2489e5bcc39e4f83de65aa9cdbcaf4066dcb996e23a833d40fd7dceb97cafcefd9cbdb6ccc9e85cfe94a1f2fd47d453856fd5625b864de62c139338a310 +SHA512 (zypper-1.14.55.tar.gz) = ab3a79165c29b1ad6dc35795853edc3eafa80e337a22ea79dab47a094a1910d9a7052acea20b07ec6402653ba9c083551a187d366f2517639cc1dd431d008358 diff --git a/zypper.spec b/zypper.spec index e3e2b81..db7b63b 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.25.6 +%global min_libzypp_ver 17.29.0 Name: zypper -Version: 1.14.42 -Release: 6%{?dist} +Version: 1.14.55 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -155,6 +155,9 @@ popd %changelog +* Fri Sep 02 2022 Neal Gompa - 1.14.55-1 +- Update to 1.14.55 (#1932773) + * Sat Jul 23 2022 Fedora Release Engineering - 1.14.42-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 2fc7ceaec098ec0438ee1f74c348a0cf8d2119ab Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:19:27 +0100 Subject: [PATCH 25/40] Remove perl(MODULE_COMPAT), it will be replaced by generators --- zypper.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index db7b63b..31f4b3d 100644 --- a/zypper.spec +++ b/zypper.spec @@ -61,7 +61,6 @@ accessing the Zypper log file. Summary: apt/aptitude CLI compatibility interface for Zypper Provides: %{name}-apt = %{version}-%{release} Requires: %{name} = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Enhances: zypper BuildArch: noarch From b06dc1ffd32e180f65b0f8e9353588ecdc42958c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:22:55 +0000 Subject: [PATCH 26/40] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_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 31f4b3d..35a47ee 100644 --- a/zypper.spec +++ b/zypper.spec @@ -5,7 +5,7 @@ Name: zypper Version: 1.14.55 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -154,6 +154,9 @@ popd %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.14.55-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Sep 02 2022 Neal Gompa - 1.14.55-1 - Update to 1.14.55 (#1932773) From fa7a7e908678785c750925a22f6530352382ec0c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Thu, 9 Mar 2023 09:31:46 -0500 Subject: [PATCH 27/40] Update to 1.14.59 --- sources | 2 +- zypper.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index f6c411e..dceffb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.55.tar.gz) = ab3a79165c29b1ad6dc35795853edc3eafa80e337a22ea79dab47a094a1910d9a7052acea20b07ec6402653ba9c083551a187d366f2517639cc1dd431d008358 +SHA512 (zypper-1.14.59.tar.gz) = 301155c438eb1726e5225c13a751d5d8aee3000cba86921905775519bd57c7909b0640255e20219b8e66527d16f4a1d4902197e77dabc1dcb0a4275b91016528 diff --git a/zypper.spec b/zypper.spec index 35a47ee..7319afc 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.29.0 +%global min_libzypp_ver 17.31.7 Name: zypper -Version: 1.14.55 -Release: 2%{?dist} +Version: 1.14.59 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -154,6 +154,9 @@ popd %changelog +* Thu Mar 09 2023 Neal Gompa - 1.14.59-1 +- Update to 1.14.59 + * Sat Jan 21 2023 Fedora Release Engineering - 1.14.55-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From ee2e72b477e9e8f8fdf94b08793027fc98d091d2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:49:23 +0000 Subject: [PATCH 28/40] 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 29/40] 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 30/40] 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 31/40] 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 32/40] 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 33/40] 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 34/40] 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 35/40] 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 36/40] 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 37/40] 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 38/40] 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 39/40] 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 40/40] 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