From f9401dad80066b2c0c68771eb230de3167e95b10 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 7 Feb 2018 06:40:26 -0500 Subject: [PATCH 01/57] Update to 1.14.2 (#1489428) - Backport patch to fix build with GCC 8 --- .gitignore | 1 + 0001-Fix-template-to-compile-fixes-146.patch | 25 ++++++++++++++++ sources | 2 +- zypper.spec | 30 +++++++++++++------- 4 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 0001-Fix-template-to-compile-fixes-146.patch diff --git a/.gitignore b/.gitignore index 789843e..78715a0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /zypper-1.13.30.tar.gz /zypper-1.13.31.tar.gz /zypper-1.13.32.tar.gz +/zypper-1.14.2.tar.gz diff --git a/0001-Fix-template-to-compile-fixes-146.patch b/0001-Fix-template-to-compile-fixes-146.patch new file mode 100644 index 0000000..9cdaa3b --- /dev/null +++ b/0001-Fix-template-to-compile-fixes-146.patch @@ -0,0 +1,25 @@ +From 7d3a784a8ca003a14a86859d8e16a6868c6754b9 Mon Sep 17 00:00:00 2001 +From: Michael Andres +Date: Wed, 7 Feb 2018 09:57:59 +0100 +Subject: [PATCH] Fix template to compile (fixes #146) + +--- + src/callbacks/rpm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/callbacks/rpm.h b/src/callbacks/rpm.h +index d8aeee76..c8492bc2 100644 +--- a/src/callbacks/rpm.h ++++ b/src/callbacks/rpm.h +@@ -121,7 +121,7 @@ namespace out + private: + template + static sat::Solvable asSolvable( const Tp_ & val_r ) +- { return sat::asSolvable( val_r ); } ++ { return sat::asSolvable()( val_r ); } + + static sat::Solvable asSolvable( int val_r ) // e.g. satQueues use int as SolvabeId + { return sat::Solvable( val_r ); } +-- +2.14.3 + diff --git a/sources b/sources index 967b408..6eb3839 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.13.32.tar.gz) = 231090120b0893b38016b0a504c11b67e4987e05f37d6ae88eafdc9f6747c9d4d21c1e1217331089513de4f46366c2f76f0cdb3228b9f1246501683bc7a43de9 +SHA512 (zypper-1.14.2.tar.gz) = 6679f9a4956355dd4fe5c4df6c5caacfebbf82d21d5af8de65bbfd362b024bb96baad9a8111177d2e6355c934bb3dbc4ed1e0d8d0c8d39e790eb8743332e7a33 diff --git a/zypper.spec b/zypper.spec index b6cafd3..1cff677 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 16.15.4 +%global min_libzypp_ver 17.0.2 Name: zypper -Version: 1.13.32 +Version: 1.14.2 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -9,6 +9,10 @@ License: GPLv2+ URL: http://en.opensuse.org/Portal:Zypper Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{version}.tar.gz +# Fix build with GCC 8 +# From: https://github.com/openSUSE/zypper/commit/7d3a784a8ca003a14a86859d8e16a6868c6754b9 +Patch0001: 0001-Fix-template-to-compile-fixes-146.patch + BuildRequires: perl-generators BuildRequires: cmake BuildRequires: augeas-devel @@ -74,15 +78,15 @@ 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 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} -%make_build -%make_build -C po translations -%make_build -C tests +%cmake . -B"%{_vpath_builddir}" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} +%make_build -C %{_vpath_builddir} +%make_build -C %{_vpath_builddir}/po translations +%make_build -C %{_vpath_builddir}/tests %install -%make_install -%make_install -C po +%make_install -C %{_vpath_builddir} +%make_install -C %{_vpath_builddir}/po mkdir -p %{buildroot}%{_libexecdir}/zypper/commands @@ -98,7 +102,7 @@ rm %{buildroot}%{_bindir}/apt-get ln -sf zypp-aptitude %{buildroot}%{_bindir}/zypp-apt-get # Fix shebang for zypper-log -sed -e "s|/usr/bin/env python|/usr/bin/python|g" -i %{buildroot}%{_sbindir}/zypper-log +sed -e "s|/usr/bin/env python|/usr/bin/python|g" -i %{buildroot}%{_sbindir}/zypper-log # Move the bash completion file mkdir -p %{buildroot}%{_datadir}/bash-completion/completions @@ -107,8 +111,8 @@ rm -rf %{buildroot}%{_sysconfdir}/bash_completion.d/ %check -pushd tests -ctest . +pushd %{_vpath_builddir}/tests +ctest -VV . popd %files -f %{name}.lang @@ -139,6 +143,10 @@ popd %changelog +* Wed Feb 07 2018 Neal Gompa - 1.14.2-1 +- Update to 1.14.2 (#1489428) +- Backport patch to fix build with GCC 8 + * Sun Sep 03 2017 Neal Gompa - 1.13.32-1 - Update to 1.13.32 (#1485336) From ef835fc007e7af370573e445ea670be6ffc140a8 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 4 Mar 2018 22:53:10 -0500 Subject: [PATCH 02/57] Update to 1.14.3 (#1550768) --- .gitignore | 1 + 0001-Fix-template-to-compile-fixes-146.patch | 25 -------------------- sources | 2 +- zypper.spec | 16 +++++++------ 4 files changed, 11 insertions(+), 33 deletions(-) delete mode 100644 0001-Fix-template-to-compile-fixes-146.patch diff --git a/.gitignore b/.gitignore index 78715a0..2845156 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zypper-1.13.31.tar.gz /zypper-1.13.32.tar.gz /zypper-1.14.2.tar.gz +/zypper-1.14.3.tar.gz diff --git a/0001-Fix-template-to-compile-fixes-146.patch b/0001-Fix-template-to-compile-fixes-146.patch deleted file mode 100644 index 9cdaa3b..0000000 --- a/0001-Fix-template-to-compile-fixes-146.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7d3a784a8ca003a14a86859d8e16a6868c6754b9 Mon Sep 17 00:00:00 2001 -From: Michael Andres -Date: Wed, 7 Feb 2018 09:57:59 +0100 -Subject: [PATCH] Fix template to compile (fixes #146) - ---- - src/callbacks/rpm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/callbacks/rpm.h b/src/callbacks/rpm.h -index d8aeee76..c8492bc2 100644 ---- a/src/callbacks/rpm.h -+++ b/src/callbacks/rpm.h -@@ -121,7 +121,7 @@ namespace out - private: - template - static sat::Solvable asSolvable( const Tp_ & val_r ) -- { return sat::asSolvable( val_r ); } -+ { return sat::asSolvable()( val_r ); } - - static sat::Solvable asSolvable( int val_r ) // e.g. satQueues use int as SolvabeId - { return sat::Solvable( val_r ); } --- -2.14.3 - diff --git a/sources b/sources index 6eb3839..6ce047d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.2.tar.gz) = 6679f9a4956355dd4fe5c4df6c5caacfebbf82d21d5af8de65bbfd362b024bb96baad9a8111177d2e6355c934bb3dbc4ed1e0d8d0c8d39e790eb8743332e7a33 +SHA512 (zypper-1.14.3.tar.gz) = 73a1f63cfb7d09c199f6493eab9a32af7d4fa73c4d872710816363263c30ced5943b350848b8598503f828c0137e61bb4a7611dc661ca368e2134b146aeaa16f diff --git a/zypper.spec b/zypper.spec index 1cff677..f4748a2 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 17.0.2 +%global min_libzypp_ver 17.1.4 Name: zypper -Version: 1.14.2 +Version: 1.14.3 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -9,12 +9,11 @@ License: GPLv2+ URL: http://en.opensuse.org/Portal:Zypper Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{version}.tar.gz -# Fix build with GCC 8 -# From: https://github.com/openSUSE/zypper/commit/7d3a784a8ca003a14a86859d8e16a6868c6754b9 -Patch0001: 0001-Fix-template-to-compile-fixes-146.patch - -BuildRequires: perl-generators +BuildRequires: asciidoc BuildRequires: cmake +BuildRequires: gcc +BuildRequires: gcc-c++ +BuildRequires: perl-generators BuildRequires: augeas-devel BuildRequires: boost-devel BuildRequires: gettext-devel @@ -143,6 +142,9 @@ popd %changelog +* Sun Mar 04 2018 Neal Gompa - 1.14.3-1 +- Update to 1.14.3 (#1550768) + * Wed Feb 07 2018 Neal Gompa - 1.14.2-1 - Update to 1.14.2 (#1489428) - Backport patch to fix build with GCC 8 From 6283c36f4bf0d614fc60b96e187dfe5cd9d7078d Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 7 Mar 2018 05:05:26 -0500 Subject: [PATCH 03/57] Update to 1.13.41 - Drop recommends for cron --- .gitignore | 1 + sources | 2 +- zypper.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 789843e..615d533 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /zypper-1.13.30.tar.gz /zypper-1.13.31.tar.gz /zypper-1.13.32.tar.gz +/zypper-1.13.41.tar.gz diff --git a/sources b/sources index 967b408..2606f26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.13.32.tar.gz) = 231090120b0893b38016b0a504c11b67e4987e05f37d6ae88eafdc9f6747c9d4d21c1e1217331089513de4f46366c2f76f0cdb3228b9f1246501683bc7a43de9 +SHA512 (zypper-1.13.41.tar.gz) = 59b0ac1f4eefdf9840df6400cb0227aedefb69ebc93d5079ba93d5cfdf7d21616b6b93751bca977ec82d706c5e40e29e98f82eb1939e23b82c990454d217060d diff --git a/zypper.spec b/zypper.spec index b6cafd3..55c281d 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 16.15.4 +%global min_libzypp_ver 16.17.5 Name: zypper -Version: 1.13.32 +Version: 1.13.41 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -22,7 +22,6 @@ Requires: procps Requires: bash-completion Recommends: logrotate -Recommends: cron Recommends: zypper-log # Zypper specific virtual provides @@ -139,6 +138,10 @@ popd %changelog +* Wed Mar 07 2018 Neal Gompa - 1.13.41-1 +- Update to 1.13.41 +- Drop recommends for cron + * Sun Sep 03 2017 Neal Gompa - 1.13.32-1 - Update to 1.13.32 (#1485336) From 4ef5a247d5b550985efff9a3df3eb2cdda964fcb Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Thu, 28 Jun 2018 04:49:34 +0200 Subject: [PATCH 04/57] Perl 5.28 rebuild --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index f4748a2..a5e2f21 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -142,6 +142,9 @@ popd %changelog +* Thu Jun 28 2018 Jitka Plesnikova - 1.14.3-2 +- Perl 5.28 rebuild + * Sun Mar 04 2018 Neal Gompa - 1.14.3-1 - Update to 1.14.3 (#1550768) From f9b8266b617f75524d3cc5582ead50c1517a7f35 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:54:19 +0000 Subject: [PATCH 05/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 a5e2f21..09c66c0 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.3 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -142,6 +142,9 @@ popd %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.14.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 28 2018 Jitka Plesnikova - 1.14.3-2 - Perl 5.28 rebuild From 0457600c02b65a4bf66fbbf63c1b9bfc09e9b23c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 26 Aug 2018 06:20:02 -0400 Subject: [PATCH 06/57] Update to 1.14.8 (#1555114) --- .gitignore | 1 + sources | 2 +- zypper.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 2845156..ec1860f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /zypper-1.13.32.tar.gz /zypper-1.14.2.tar.gz /zypper-1.14.3.tar.gz +/zypper-1.14.8.tar.gz diff --git a/sources b/sources index 6ce047d..ec57531 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.3.tar.gz) = 73a1f63cfb7d09c199f6493eab9a32af7d4fa73c4d872710816363263c30ced5943b350848b8598503f828c0137e61bb4a7611dc661ca368e2134b146aeaa16f +SHA512 (zypper-1.14.8.tar.gz) = 57c6ed6be2491bd9714d8af626036c28427e991f900d132d2515f5b55a75fa38ebfcadfa593f8919bf76771805bd25157b42bc4cd398320078b8728bc8783877 diff --git a/zypper.spec b/zypper.spec index 09c66c0..b3e75b0 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,15 +1,16 @@ -%global min_libzypp_ver 17.1.4 +%global min_libzypp_ver 17.6.0 Name: zypper -Version: 1.14.3 -Release: 3%{?dist} +Version: 1.14.8 +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 -BuildRequires: asciidoc +BuildRequires: %{_bindir}/asciidoctor +BuildRequires: %{_bindir}/xsltproc BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ @@ -142,6 +143,9 @@ popd %changelog +* Sun Aug 26 2018 Neal Gompa - 1.14.8-1 +- Update to 1.14.8 (#1555114) + * Sat Jul 14 2018 Fedora Release Engineering - 1.14.3-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 108b84acdd3435f0ad3c4ffd56d934158975bf75 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sun, 26 Aug 2018 06:33:10 -0400 Subject: [PATCH 07/57] Package zypp-apt symlink in zypper-aptitude --- zypper.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/zypper.spec b/zypper.spec index b3e75b0..06a183c 100644 --- a/zypper.spec +++ b/zypper.spec @@ -100,6 +100,8 @@ mv %{buildroot}%{_bindir}/aptitude %{buildroot}%{_bindir}/zypp-aptitude # Redo the symlink to point to the new binary name rm %{buildroot}%{_bindir}/apt-get 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/python|g" -i %{buildroot}%{_sbindir}/zypper-log @@ -138,6 +140,7 @@ popd %files aptitude %{_bindir}/zypp-aptitude %{_bindir}/zypp-apt-get +%{_bindir}/zypp-apt %dir %{_sysconfdir}/zypp/apt-packagemap.d/ %config(noreplace) %{_sysconfdir}/zypp/apt-packagemap.d/* From 8409185caaddc88f8e85b4dcf9ac9a554ad56b21 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 5 Sep 2018 20:35:47 -0400 Subject: [PATCH 08/57] Update to 1.13.45 --- .gitignore | 1 + sources | 2 +- zypper.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 615d533..b6263ec 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /zypper-1.13.31.tar.gz /zypper-1.13.32.tar.gz /zypper-1.13.41.tar.gz +/zypper-1.13.45.tar.gz diff --git a/sources b/sources index 2606f26..7c37ad9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.13.41.tar.gz) = 59b0ac1f4eefdf9840df6400cb0227aedefb69ebc93d5079ba93d5cfdf7d21616b6b93751bca977ec82d706c5e40e29e98f82eb1939e23b82c990454d217060d +SHA512 (zypper-1.13.45.tar.gz) = b16a3d83100c10136f360bb7e172f4893ceb87a203c52598984741230363fc3d630c51cf24f88835867657459e7ba163955a6dd928ee8541d253c9cd33461c66 diff --git a/zypper.spec b/zypper.spec index 55c281d..1cc5da9 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 16.17.5 +%global min_libzypp_ver 16.17.16 Name: zypper -Version: 1.13.41 +Version: 1.13.45 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -138,6 +138,9 @@ popd %changelog +* Wed Sep 05 2018 Neal Gompa - 1.13.45-1 +- Update to 1.13.45 + * Wed Mar 07 2018 Neal Gompa - 1.13.41-1 - Update to 1.13.41 - Drop recommends for cron From 1eeac978cbea6494705e3f5785c12de458a1aa2b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Sat, 3 Nov 2018 14:24:04 -0400 Subject: [PATCH 09/57] Update to 1.14.15 --- .gitignore | 1 + ...-zypper-log-Make-Python-3-compatible.patch | 116 ++++++++++++++++++ sources | 2 +- zypper.spec | 17 ++- 4 files changed, 132 insertions(+), 4 deletions(-) create mode 100644 0001-zypper-log-Make-Python-3-compatible.patch diff --git a/.gitignore b/.gitignore index ec1860f..63e7bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /zypper-1.14.2.tar.gz /zypper-1.14.3.tar.gz /zypper-1.14.8.tar.gz +/zypper-1.14.15.tar.gz diff --git a/0001-zypper-log-Make-Python-3-compatible.patch b/0001-zypper-log-Make-Python-3-compatible.patch new file mode 100644 index 0000000..ac73bf1 --- /dev/null +++ b/0001-zypper-log-Make-Python-3-compatible.patch @@ -0,0 +1,116 @@ +From bd9fabba88a532a4d8146c975a4be7e8de1a941c Mon Sep 17 00:00:00 2001 +From: Neal Gompa +Date: Sat, 3 Nov 2018 13:42:50 -0400 +Subject: [PATCH] zypper-log: Make Python 3 compatible + +As part of the effort to cull Python 2 dependencies in Fedora, +this code was trivially ported to Python 3 to remove the Python 2 +dependency in Zypper. + +Reference: https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 +Reference: https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal +--- + tools/zypper-log | 27 ++++++++++++++------------- + 1 file changed, 14 insertions(+), 13 deletions(-) + +diff --git a/tools/zypper-log b/tools/zypper-log +index 710ebae7..e28d01fa 100755 +--- a/tools/zypper-log ++++ b/tools/zypper-log +@@ -5,6 +5,7 @@ + # + # Author: Dominik Heidler + ++from __future__ import print_function + import os, string, re, bz2, zlib, sys, time, argparse, errno + import subprocess + +@@ -32,8 +33,8 @@ def getLogFiles(rotate = 0): + def readFile(logfile): + try: + logtxt = open(logfile).read() +- except IOError, e: +- print >> sys.stderr, "\rIOError: %s: '%s'" % (e.strerror, e.filename) ++ except IOError as e: ++ print("\rIOError: %s: '%s'" % (e.strerror, e.filename), file=sys.stderr) + sys.exit(1) + fext = logfile.split('.')[-1] + if fext == 'xz': +@@ -53,7 +54,7 @@ def getListFromLogFiles(logfiles): + c = re.compile(r"===== Hi, me zypper (\d+.\d+.\d+).*$\s(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}).+\((\d+)\).+=====\s(.+)\s=====|genericfrontend.cc.*Launched (YaST2) component (.*)$\s(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}).+\((\d+)\)", re.M) + + for logfile in logfiles: +- print >> sys.stderr, "Reading %s" % logfile, '.' * (filenamelen - len(logfile) + 3), ++ print("Reading %s" % logfile, '.' * (filenamelen - len(logfile) + 3), end=' ', file=sys.stderr) + sys.stderr.flush() + for run in c.findall(readFile(logfile)): + if run[4] == 'YaST2': +@@ -75,9 +76,9 @@ def getListFromLogFiles(logfiles): + 'time': time.strptime(tim, "%Y-%m-%d %H:%M:%S"), + 'pid': pid, + 'cmd': cmd.replace("'", "")}) +- print >> sys.stderr, "DONE" ++ print("DONE", file=sys.stderr) + sys.stderr.flush() +- print >> sys.stderr, "" ++ print("", file=sys.stderr) + sys.stderr.flush() + return logindex + +@@ -85,7 +86,7 @@ def printList(logindex, date = False): + global pidlen, verlen + rows, columns = os.popen('stty size', 'r').read().split() + +- print "TIME PID", ' ' * (pidlen - 3), "VER", ' ' * (verlen - 3), "CMD" ++ print("TIME PID", ' ' * (pidlen - 3), "VER", ' ' * (verlen - 3), "CMD") + for logentry in logindex: + if date and date != time.strftime("%Y-%m-%d", logentry['time']): + continue +@@ -93,7 +94,7 @@ def printList(logindex, date = False): + spaceleft = int(columns) - (22 + pidlen + len(logentry['version']) + len(logentry['cmd'])) + if spaceleft < 0 and sys.stdout.isatty(): + logentry['cmd'] = logentry['cmd'][:spaceleft-3] + '...' +- print "%(ptime)s %(pid)s" % logentry, ' ' * (pidlen - len(logentry['pid'])), "%(version)s" % logentry, ' ' * (verlen - len(logentry['version'])), "%(cmd)s" % logentry ++ print("%(ptime)s %(pid)s" % logentry, ' ' * (pidlen - len(logentry['pid'])), "%(version)s" % logentry, ' ' * (verlen - len(logentry['version'])), "%(cmd)s" % logentry) + + def printLogByPID(logfiles, pid, date = False): + if not date: +@@ -102,14 +103,14 @@ def printLogByPID(logfiles, pid, date = False): + c = re.compile(r"%s \d{2}:\d{2}:\d{2} \<\d+\> [^(]+\(%d\).+" % (date, pid)) + + for logfile in logfiles: +- print >> sys.stderr, "Reading %s" % logfile, '.' * (filenamelen - len(logfile) + 3), ++ print("Reading %s" % logfile, '.' * (filenamelen - len(logfile) + 3), end=' ', file=sys.stderr) + sys.stderr.flush() + output.extend( c.findall(readFile(logfile)) ) +- print >> sys.stderr, "DONE" ++ print("DONE", file=sys.stderr) + sys.stderr.flush() +- print >> sys.stderr, "" ++ print("", file=sys.stderr) + sys.stderr.flush() +- print "\n".join(output) ++ print("\n".join(output)) + + def main(): + parser = argparse.ArgumentParser(description='This tool helps you to access the zypper logfile. Run this command without any arguments to get a list of your zypper runs. Provide the PID-File of a zypper run as an argument to query the log for this run.') +@@ -130,7 +131,7 @@ def main(): + try: + args.date = time.strftime("%Y-%m-%d", time.strptime(args.date, "%Y-%m-%d")) + except ValueError: +- print >> sys.stderr, "ValueError: Time data '%s' does not match format 'YYYY-MM-DD'" % args.date ++ print("ValueError: Time data '%s' does not match format 'YYYY-MM-DD'" % args.date, file=sys.stderr) + sys.exit(1) + if args.pid: + printLogByPID(logfiles, args.pid, args.date) +@@ -142,6 +143,6 @@ def main(): + if __name__ == "__main__": + try: + main() +- except IOError, e: ++ except IOError as e: + if e.errno != errno.EPIPE: + raise +-- +2.17.2 + diff --git a/sources b/sources index ec57531..a715a60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.8.tar.gz) = 57c6ed6be2491bd9714d8af626036c28427e991f900d132d2515f5b55a75fa38ebfcadfa593f8919bf76771805bd25157b42bc4cd398320078b8728bc8783877 +SHA512 (zypper-1.14.15.tar.gz) = e258dea2836d7ca85b328daae56da446b700663b3003b54e2f90ff7f2fba5b8bfd960056f79b3b56def47e35483bebc7600d92bfc1a0a34bb46b9ff2c6caa736 diff --git a/zypper.spec b/zypper.spec index 06a183c..77022a9 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,7 +1,7 @@ -%global min_libzypp_ver 17.6.0 +%global min_libzypp_ver 17.8.1 Name: zypper -Version: 1.14.8 +Version: 1.14.15 Release: 1%{?dist} Summary: Command line package manager using libzypp @@ -9,6 +9,10 @@ License: GPLv2+ URL: http://en.opensuse.org/Portal:Zypper Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{version}.tar.gz +# Make zypper-log Python 3 compatible +# From: https://github.com/openSUSE/zypper/pull/217 +Patch0101: 0001-zypper-log-Make-Python-3-compatible.patch + BuildRequires: %{_bindir}/asciidoctor BuildRequires: %{_bindir}/xsltproc BuildRequires: cmake @@ -104,13 +108,16 @@ 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/python|g" -i %{buildroot}%{_sbindir}/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 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 %check pushd %{_vpath_builddir}/tests @@ -126,6 +133,7 @@ popd %{_datadir}/bash-completion/completions/zypper %{_bindir}/zypper %{_bindir}/installation_sources +%{_bindir}/zypp-needs-restarting %{_sbindir}/zypp-refresh %{_datadir}/zypper/ %{_libexecdir}/zypper/ @@ -146,6 +154,9 @@ popd %changelog +* Sat Nov 03 2018 Neal Gompa - 1.14.15-1 +- Update to 1.14.15 + * Sun Aug 26 2018 Neal Gompa - 1.14.8-1 - Update to 1.14.8 (#1555114) From 656a7d8611c8d31e85fea82d4cbb43d9f1cf5705 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 13:16:31 +0000 Subject: [PATCH 10/57] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 77022a9..0827e80 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.15 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -154,6 +154,9 @@ popd %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.14.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Nov 03 2018 Neal Gompa - 1.14.15-1 - Update to 1.14.15 From 4b6056857f8fb5f14cc7b30de0806e565b4196b8 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 12 Feb 2019 09:32:38 -0500 Subject: [PATCH 11/57] Rebase to 1.14.25 (#1667664) --- .gitignore | 1 + ....69-requiring-explicit-casts-tribool.patch | 185 ++++++++++++++++++ ...-zypper-log-Make-Python-3-compatible.patch | 116 ----------- sources | 2 +- zypper.spec | 16 +- 5 files changed, 197 insertions(+), 123 deletions(-) create mode 100644 0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch delete mode 100644 0001-zypper-log-Make-Python-3-compatible.patch diff --git a/.gitignore b/.gitignore index 63e7bf9..5c58d79 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /zypper-1.14.3.tar.gz /zypper-1.14.8.tar.gz /zypper-1.14.15.tar.gz +/zypper-1.14.25.tar.gz diff --git a/0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch b/0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch new file mode 100644 index 0000000..e4e27ed --- /dev/null +++ b/0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch @@ -0,0 +1,185 @@ +From 9869bd5d2ea342c43e9c3d557fdc44fed8ea6aa4 Mon Sep 17 00:00:00 2001 +From: Michael Andres +Date: Tue, 12 Feb 2019 14:32:10 +0100 +Subject: [PATCH] Adapt to boost-1.69 requiring explicit casts tribool->bool + (fixes #255) + +--- + src/commands/optionsets.cc | 2 +- + .../search/search-packages-hinthack.cc | 2 +- + src/commands/services/modify.cc | 4 ++-- + src/output/Out.h | 2 +- + src/repos.cc | 14 ++++++------ + src/solve-commit.cc | 22 +++++++++---------- + 6 files changed, 23 insertions(+), 23 deletions(-) + +diff --git a/src/commands/optionsets.cc b/src/commands/optionsets.cc +index db45dd9d..fd114261 100644 +--- a/src/commands/optionsets.cc ++++ b/src/commands/optionsets.cc +@@ -329,7 +329,7 @@ bool InteractiveUpdatesOptionSet::skipInteractive() const + { + bool skip_interactive = false; + if ( !indeterminate( _withInteractive ) ) +- skip_interactive = ! _withInteractive; ++ skip_interactive = ! bool(_withInteractive); + // bnc #497711 + else if ( Zypper::instance().config().non_interactive ) + skip_interactive = true; +diff --git a/src/commands/search/search-packages-hinthack.cc b/src/commands/search/search-packages-hinthack.cc +index 33444825..48fba7c1 100644 +--- a/src/commands/search/search-packages-hinthack.cc ++++ b/src/commands/search/search-packages-hinthack.cc +@@ -115,7 +115,7 @@ namespace searchPackagesHintHack + } + zypper_r.out().gap(); + +- return( callSP == true ); ++ return bool(callSP); + } + + /** Forward the search request to search-packages subcommand. */ +diff --git a/src/commands/services/modify.cc b/src/commands/services/modify.cc +index 405d5312..cafc523d 100644 +--- a/src/commands/services/modify.cc ++++ b/src/commands/services/modify.cc +@@ -146,14 +146,14 @@ int ModifyServiceCmd::modifyService( Zypper & zypper, const std::string & alias + { + if ( enable != srv.enabled() ) + changed_enabled = true; +- srv.setEnabled( enable ); ++ srv.setEnabled( bool(enable) ); + } + + if ( !indeterminate(autoref) ) + { + if ( autoref != srv.autorefresh() ) + changed_autoref = true; +- srv.setAutorefresh( autoref ); ++ srv.setAutorefresh( bool(autoref) ); + } + + const std::string &name = _commonProperties._name; +diff --git a/src/output/Out.h b/src/output/Out.h +index 55896700..6b5ef062 100644 +--- a/src/output/Out.h ++++ b/src/output/Out.h +@@ -1005,7 +1005,7 @@ public: + _progress.noSend(); // suppress ~ProgressData final report + if ( indeterminate( _error ) ) + _error = ( _progress.reportValue() != 100 && _progress.reportPercent() ); +- _out.progressEnd( _progressId, outLabel( _progress.name() ), _error ); ++ _out.progressEnd( _progressId, outLabel( _progress.name() ), bool(_error) ); + } + + /** Immediately print the progress bar not waiting for a new trigger. */ +diff --git a/src/repos.cc b/src/repos.cc +index b93c3144..f91d0d42 100644 +--- a/src/repos.cc ++++ b/src/repos.cc +@@ -1330,7 +1330,7 @@ void add_repo_by_url( Zypper & zypper, + repo.setPriority( repoProps._priority ); + + if ( !indeterminate( repoProps._keepPackages ) ) +- repo.setKeepPackages( repoProps._keepPackages ); ++ repo.setKeepPackages( bool(repoProps._keepPackages) ); + + RepoInfo::GpgCheck gpgCheck = repoProps._gpgCheck; + if ( gpgCheck != RepoInfo::GpgCheck::indeterminate ) +@@ -1409,13 +1409,13 @@ void add_repo_from_file( Zypper & zypper, + repo.setName( opts._name ); + + if ( !indeterminate(opts._enable) ) +- repo.setEnabled( opts._enable ); ++ repo.setEnabled( bool(opts._enable) ); + + if ( !indeterminate( opts._enableAutoRefresh) ) +- repo.setAutorefresh( opts._enableAutoRefresh ); ++ repo.setAutorefresh( bool(opts._enableAutoRefresh) ); + + if ( !indeterminate( repoProps._keepPackages ) ) +- repo.setKeepPackages( repoProps._keepPackages ); ++ repo.setKeepPackages( bool(repoProps._keepPackages) ); + + if ( gpgCheck != RepoInfo::GpgCheck::indeterminate ) + repo.setGpgCheck( gpgCheck ); +@@ -1571,21 +1571,21 @@ void modify_repo( Zypper & zypper, const std::string & alias, const RepoServiceC + { + if ( enable != repo.enabled() ) + changed_enabled = true; +- repo.setEnabled( enable ); ++ repo.setEnabled( bool(enable) ); + } + + if ( !indeterminate(autoref) ) + { + if ( autoref != repo.autorefresh()) + changed_autoref = true; +- repo.setAutorefresh( autoref ); ++ repo.setAutorefresh( bool(autoref) ); + } + + if ( !indeterminate(keepPackages) ) + { + if ( keepPackages != repo.keepPackages() ) + changed_keeppackages = true; +- repo.setKeepPackages( keepPackages ); ++ repo.setKeepPackages( bool(keepPackages) ); + } + + if ( gpgCheck != RepoInfo::GpgCheck::indeterminate ) +diff --git a/src/solve-commit.cc b/src/solve-commit.cc +index d725a1cb..6e7d1371 100755 +--- a/src/solve-commit.cc ++++ b/src/solve-commit.cc +@@ -171,7 +171,7 @@ static bool show_problems( Zypper & zypper ) + TriBool stopnow = show_problem( zypper, *probPtr, todo ); + if ( !indeterminate( stopnow ) ) + { +- retry = stopnow; ++ retry = bool(stopnow); + break; + } + } +@@ -239,10 +239,10 @@ static void set_force_resolution( Zypper & zypper ) + + DBG << "force resolution: " << force_resolution << endl; + std::ostringstream s; +- s << _("Force resolution:") << " " << asYesNo( force_resolution ); ++ s << _("Force resolution:") << " " << asYesNo( bool(force_resolution) ); + zypper.out().info(s.str(), Out::HIGH); + +- God->resolver()->setForceResolve( force_resolution ); ++ God->resolver()->setForceResolve( bool(force_resolution) ); + } + + static void set_clean_deps( Zypper & zypper ) +@@ -305,17 +305,17 @@ static void set_solver_flags( Zypper & zypper ) + const auto &solverSettings = SolverSettings::instance(); + if ( zypper.command() == ZypperCommand::DIST_UPGRADE ) + { +- if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->dupSetAllowDowngrade( solverSettings._allowDowngrade ); +- if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->dupSetAllowNameChange( solverSettings._allowNameChange ); +- if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->dupSetAllowArchChange( solverSettings._allowArchChange ); +- if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->dupSetAllowVendorChange( solverSettings._allowVendorChange ); ++ if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->dupSetAllowDowngrade( bool(solverSettings._allowDowngrade) ); ++ if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->dupSetAllowNameChange( bool(solverSettings._allowNameChange) ); ++ if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->dupSetAllowArchChange( bool(solverSettings._allowArchChange) ); ++ if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->dupSetAllowVendorChange( bool(solverSettings._allowVendorChange) ); + } + else + { +- if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->setAllowDowngrade( solverSettings._allowDowngrade ); +- if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->setAllowNameChange( solverSettings._allowNameChange ); +- if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->setAllowArchChange( solverSettings._allowArchChange ); +- if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->setAllowVendorChange( solverSettings._allowVendorChange ); ++ if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->setAllowDowngrade( bool(solverSettings._allowDowngrade) ); ++ if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->setAllowNameChange( bool(solverSettings._allowNameChange) ); ++ if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->setAllowArchChange( bool(solverSettings._allowArchChange) ); ++ if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->setAllowVendorChange( bool(solverSettings._allowVendorChange) ); + } + } + +-- +2.20.1 + diff --git a/0001-zypper-log-Make-Python-3-compatible.patch b/0001-zypper-log-Make-Python-3-compatible.patch deleted file mode 100644 index ac73bf1..0000000 --- a/0001-zypper-log-Make-Python-3-compatible.patch +++ /dev/null @@ -1,116 +0,0 @@ -From bd9fabba88a532a4d8146c975a4be7e8de1a941c Mon Sep 17 00:00:00 2001 -From: Neal Gompa -Date: Sat, 3 Nov 2018 13:42:50 -0400 -Subject: [PATCH] zypper-log: Make Python 3 compatible - -As part of the effort to cull Python 2 dependencies in Fedora, -this code was trivially ported to Python 3 to remove the Python 2 -dependency in Zypper. - -Reference: https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 -Reference: https://fedoraproject.org/wiki/Changes/Mass_Python_2_Package_Removal ---- - tools/zypper-log | 27 ++++++++++++++------------- - 1 file changed, 14 insertions(+), 13 deletions(-) - -diff --git a/tools/zypper-log b/tools/zypper-log -index 710ebae7..e28d01fa 100755 ---- a/tools/zypper-log -+++ b/tools/zypper-log -@@ -5,6 +5,7 @@ - # - # Author: Dominik Heidler - -+from __future__ import print_function - import os, string, re, bz2, zlib, sys, time, argparse, errno - import subprocess - -@@ -32,8 +33,8 @@ def getLogFiles(rotate = 0): - def readFile(logfile): - try: - logtxt = open(logfile).read() -- except IOError, e: -- print >> sys.stderr, "\rIOError: %s: '%s'" % (e.strerror, e.filename) -+ except IOError as e: -+ print("\rIOError: %s: '%s'" % (e.strerror, e.filename), file=sys.stderr) - sys.exit(1) - fext = logfile.split('.')[-1] - if fext == 'xz': -@@ -53,7 +54,7 @@ def getListFromLogFiles(logfiles): - c = re.compile(r"===== Hi, me zypper (\d+.\d+.\d+).*$\s(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}).+\((\d+)\).+=====\s(.+)\s=====|genericfrontend.cc.*Launched (YaST2) component (.*)$\s(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}).+\((\d+)\)", re.M) - - for logfile in logfiles: -- print >> sys.stderr, "Reading %s" % logfile, '.' * (filenamelen - len(logfile) + 3), -+ print("Reading %s" % logfile, '.' * (filenamelen - len(logfile) + 3), end=' ', file=sys.stderr) - sys.stderr.flush() - for run in c.findall(readFile(logfile)): - if run[4] == 'YaST2': -@@ -75,9 +76,9 @@ def getListFromLogFiles(logfiles): - 'time': time.strptime(tim, "%Y-%m-%d %H:%M:%S"), - 'pid': pid, - 'cmd': cmd.replace("'", "")}) -- print >> sys.stderr, "DONE" -+ print("DONE", file=sys.stderr) - sys.stderr.flush() -- print >> sys.stderr, "" -+ print("", file=sys.stderr) - sys.stderr.flush() - return logindex - -@@ -85,7 +86,7 @@ def printList(logindex, date = False): - global pidlen, verlen - rows, columns = os.popen('stty size', 'r').read().split() - -- print "TIME PID", ' ' * (pidlen - 3), "VER", ' ' * (verlen - 3), "CMD" -+ print("TIME PID", ' ' * (pidlen - 3), "VER", ' ' * (verlen - 3), "CMD") - for logentry in logindex: - if date and date != time.strftime("%Y-%m-%d", logentry['time']): - continue -@@ -93,7 +94,7 @@ def printList(logindex, date = False): - spaceleft = int(columns) - (22 + pidlen + len(logentry['version']) + len(logentry['cmd'])) - if spaceleft < 0 and sys.stdout.isatty(): - logentry['cmd'] = logentry['cmd'][:spaceleft-3] + '...' -- print "%(ptime)s %(pid)s" % logentry, ' ' * (pidlen - len(logentry['pid'])), "%(version)s" % logentry, ' ' * (verlen - len(logentry['version'])), "%(cmd)s" % logentry -+ print("%(ptime)s %(pid)s" % logentry, ' ' * (pidlen - len(logentry['pid'])), "%(version)s" % logentry, ' ' * (verlen - len(logentry['version'])), "%(cmd)s" % logentry) - - def printLogByPID(logfiles, pid, date = False): - if not date: -@@ -102,14 +103,14 @@ def printLogByPID(logfiles, pid, date = False): - c = re.compile(r"%s \d{2}:\d{2}:\d{2} \<\d+\> [^(]+\(%d\).+" % (date, pid)) - - for logfile in logfiles: -- print >> sys.stderr, "Reading %s" % logfile, '.' * (filenamelen - len(logfile) + 3), -+ print("Reading %s" % logfile, '.' * (filenamelen - len(logfile) + 3), end=' ', file=sys.stderr) - sys.stderr.flush() - output.extend( c.findall(readFile(logfile)) ) -- print >> sys.stderr, "DONE" -+ print("DONE", file=sys.stderr) - sys.stderr.flush() -- print >> sys.stderr, "" -+ print("", file=sys.stderr) - sys.stderr.flush() -- print "\n".join(output) -+ print("\n".join(output)) - - def main(): - parser = argparse.ArgumentParser(description='This tool helps you to access the zypper logfile. Run this command without any arguments to get a list of your zypper runs. Provide the PID-File of a zypper run as an argument to query the log for this run.') -@@ -130,7 +131,7 @@ def main(): - try: - args.date = time.strftime("%Y-%m-%d", time.strptime(args.date, "%Y-%m-%d")) - except ValueError: -- print >> sys.stderr, "ValueError: Time data '%s' does not match format 'YYYY-MM-DD'" % args.date -+ print("ValueError: Time data '%s' does not match format 'YYYY-MM-DD'" % args.date, file=sys.stderr) - sys.exit(1) - if args.pid: - printLogByPID(logfiles, args.pid, args.date) -@@ -142,6 +143,6 @@ def main(): - if __name__ == "__main__": - try: - main() -- except IOError, e: -+ except IOError as e: - if e.errno != errno.EPIPE: - raise --- -2.17.2 - diff --git a/sources b/sources index a715a60..f575122 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.15.tar.gz) = e258dea2836d7ca85b328daae56da446b700663b3003b54e2f90ff7f2fba5b8bfd960056f79b3b56def47e35483bebc7600d92bfc1a0a34bb46b9ff2c6caa736 +SHA512 (zypper-1.14.25.tar.gz) = 61cc1de1b57fdfcb6a05f6b3e2e6e4f5b8ef148823fd98816e90d200866813009fdf375aad3a124335664f7350b9b52f4d51e4cf116661715087ac3237ff42ee diff --git a/zypper.spec b/zypper.spec index 0827e80..9a2ca49 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,17 +1,17 @@ -%global min_libzypp_ver 17.8.1 +%global min_libzypp_ver 17.11.0 Name: zypper -Version: 1.14.15 -Release: 2%{?dist} +Version: 1.14.25 +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 -# Make zypper-log Python 3 compatible -# From: https://github.com/openSUSE/zypper/pull/217 -Patch0101: 0001-zypper-log-Make-Python-3-compatible.patch +# Backports from upstream +## Fix building with Boost 1.69 +Patch0001: 0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch BuildRequires: %{_bindir}/asciidoctor BuildRequires: %{_bindir}/xsltproc @@ -19,6 +19,7 @@ BuildRequires: cmake BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: perl-generators +BuildRequires: glibc-all-langpacks BuildRequires: augeas-devel BuildRequires: boost-devel BuildRequires: gettext-devel @@ -154,6 +155,9 @@ popd %changelog +* Tue Feb 12 2019 Neal Gompa - 1.14.25-1 +- Rebase to 1.14.25 (#1667664) + * Sun Feb 03 2019 Fedora Release Engineering - 1.14.15-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 3b3f58cd5ef18d45914f3937c5ed77f5e58d163c Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 12 Feb 2019 10:46:29 -0500 Subject: [PATCH 12/57] Downgrade bash-completion dependency to Recommends (#1652183) --- zypper.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/zypper.spec b/zypper.spec index 9a2ca49..cf9567e 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.25 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -28,7 +28,9 @@ BuildRequires: libxml2-devel BuildRequires: libzypp-devel >= %{min_libzypp_ver} Requires: libzypp%{?_isa} >= %{min_libzypp_ver} Requires: procps -Requires: bash-completion + +# Blech, apparently we don't want bash-completion always... Cf. rhbz#1652183 +Recommends: bash-completion Recommends: logrotate Recommends: cron @@ -131,6 +133,10 @@ popd %config(noreplace) %{_sysconfdir}/zypp/zypper.conf %config(noreplace) %{_sysconfdir}/logrotate.d/zypper.lr %config(noreplace) %{_sysconfdir}/logrotate.d/zypp-refresh.lr +# Co-own bash-completion directories... Cf. rhbz#1652183 +## This really should be owned by filesystem... +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/zypper %{_bindir}/zypper %{_bindir}/installation_sources @@ -155,6 +161,9 @@ popd %changelog +* Tue Feb 12 2019 Neal Gompa - 1.14.25-2 +- Downgrade bash-completion dependency to Recommends (#1652183) + * Tue Feb 12 2019 Neal Gompa - 1.14.25-1 - Rebase to 1.14.25 (#1667664) From a9c72a910ac842948340be2ef61712d06b0d335b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:54 +0100 Subject: [PATCH 13/57] Rebuild for readline 8.0 --- zypper.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zypper.spec b/zypper.spec index cf9567e..9cddcee 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.25 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -161,6 +161,9 @@ popd %changelog +* Sun Feb 17 2019 Igor Gnatenko - 1.14.25-3 +- Rebuild for readline 8.0 + * Tue Feb 12 2019 Neal Gompa - 1.14.25-2 - Downgrade bash-completion dependency to Recommends (#1652183) From b2373c828287edacdf31e7c91156c41106fa2189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 25 Mar 2019 11:13:44 +0100 Subject: [PATCH 14/57] Explicitly enable tests on CMake command line --- zypper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zypper.spec b/zypper.spec index 9cddcee..2bab163 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.25 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -85,7 +85,7 @@ 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} +%cmake . -B"%{_vpath_builddir}" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} -DENABLE_BUILD_TESTS=ON %make_build -C %{_vpath_builddir} %make_build -C %{_vpath_builddir}/po translations %make_build -C %{_vpath_builddir}/tests @@ -161,6 +161,9 @@ popd %changelog +* Mon Mar 25 2019 Björn Esser - 1.14.25-4 +- Explicitly enable tests on CMake command line + * Sun Feb 17 2019 Igor Gnatenko - 1.14.25-3 - Rebuild for readline 8.0 From 706c0b913028a8ab05bab7a6ee8c8864f37d9026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 25 Mar 2019 14:10:06 +0100 Subject: [PATCH 15/57] Explicitly enable translation on CMake command line --- zypper.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/zypper.spec b/zypper.spec index 2bab163..fca468d 100644 --- a/zypper.spec +++ b/zypper.spec @@ -2,7 +2,7 @@ Name: zypper Version: 1.14.25 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -85,7 +85,7 @@ 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 +%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 @@ -161,6 +161,9 @@ popd %changelog +* Mon Mar 25 2019 Björn Esser - 1.14.25-5 +- Explicitly enable translation on CMake command line + * Mon Mar 25 2019 Björn Esser - 1.14.25-4 - Explicitly enable tests on CMake command line From c59b928ac718dd81e79d1488fbabef7f2c25e018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 25 Mar 2019 14:31:54 +0100 Subject: [PATCH 16/57] Drop patches applied in upstream tarball --- ....69-requiring-explicit-casts-tribool.patch | 185 ------------------ zypper.spec | 4 - 2 files changed, 189 deletions(-) delete mode 100644 0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch diff --git a/0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch b/0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch deleted file mode 100644 index e4e27ed..0000000 --- a/0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 9869bd5d2ea342c43e9c3d557fdc44fed8ea6aa4 Mon Sep 17 00:00:00 2001 -From: Michael Andres -Date: Tue, 12 Feb 2019 14:32:10 +0100 -Subject: [PATCH] Adapt to boost-1.69 requiring explicit casts tribool->bool - (fixes #255) - ---- - src/commands/optionsets.cc | 2 +- - .../search/search-packages-hinthack.cc | 2 +- - src/commands/services/modify.cc | 4 ++-- - src/output/Out.h | 2 +- - src/repos.cc | 14 ++++++------ - src/solve-commit.cc | 22 +++++++++---------- - 6 files changed, 23 insertions(+), 23 deletions(-) - -diff --git a/src/commands/optionsets.cc b/src/commands/optionsets.cc -index db45dd9d..fd114261 100644 ---- a/src/commands/optionsets.cc -+++ b/src/commands/optionsets.cc -@@ -329,7 +329,7 @@ bool InteractiveUpdatesOptionSet::skipInteractive() const - { - bool skip_interactive = false; - if ( !indeterminate( _withInteractive ) ) -- skip_interactive = ! _withInteractive; -+ skip_interactive = ! bool(_withInteractive); - // bnc #497711 - else if ( Zypper::instance().config().non_interactive ) - skip_interactive = true; -diff --git a/src/commands/search/search-packages-hinthack.cc b/src/commands/search/search-packages-hinthack.cc -index 33444825..48fba7c1 100644 ---- a/src/commands/search/search-packages-hinthack.cc -+++ b/src/commands/search/search-packages-hinthack.cc -@@ -115,7 +115,7 @@ namespace searchPackagesHintHack - } - zypper_r.out().gap(); - -- return( callSP == true ); -+ return bool(callSP); - } - - /** Forward the search request to search-packages subcommand. */ -diff --git a/src/commands/services/modify.cc b/src/commands/services/modify.cc -index 405d5312..cafc523d 100644 ---- a/src/commands/services/modify.cc -+++ b/src/commands/services/modify.cc -@@ -146,14 +146,14 @@ int ModifyServiceCmd::modifyService( Zypper & zypper, const std::string & alias - { - if ( enable != srv.enabled() ) - changed_enabled = true; -- srv.setEnabled( enable ); -+ srv.setEnabled( bool(enable) ); - } - - if ( !indeterminate(autoref) ) - { - if ( autoref != srv.autorefresh() ) - changed_autoref = true; -- srv.setAutorefresh( autoref ); -+ srv.setAutorefresh( bool(autoref) ); - } - - const std::string &name = _commonProperties._name; -diff --git a/src/output/Out.h b/src/output/Out.h -index 55896700..6b5ef062 100644 ---- a/src/output/Out.h -+++ b/src/output/Out.h -@@ -1005,7 +1005,7 @@ public: - _progress.noSend(); // suppress ~ProgressData final report - if ( indeterminate( _error ) ) - _error = ( _progress.reportValue() != 100 && _progress.reportPercent() ); -- _out.progressEnd( _progressId, outLabel( _progress.name() ), _error ); -+ _out.progressEnd( _progressId, outLabel( _progress.name() ), bool(_error) ); - } - - /** Immediately print the progress bar not waiting for a new trigger. */ -diff --git a/src/repos.cc b/src/repos.cc -index b93c3144..f91d0d42 100644 ---- a/src/repos.cc -+++ b/src/repos.cc -@@ -1330,7 +1330,7 @@ void add_repo_by_url( Zypper & zypper, - repo.setPriority( repoProps._priority ); - - if ( !indeterminate( repoProps._keepPackages ) ) -- repo.setKeepPackages( repoProps._keepPackages ); -+ repo.setKeepPackages( bool(repoProps._keepPackages) ); - - RepoInfo::GpgCheck gpgCheck = repoProps._gpgCheck; - if ( gpgCheck != RepoInfo::GpgCheck::indeterminate ) -@@ -1409,13 +1409,13 @@ void add_repo_from_file( Zypper & zypper, - repo.setName( opts._name ); - - if ( !indeterminate(opts._enable) ) -- repo.setEnabled( opts._enable ); -+ repo.setEnabled( bool(opts._enable) ); - - if ( !indeterminate( opts._enableAutoRefresh) ) -- repo.setAutorefresh( opts._enableAutoRefresh ); -+ repo.setAutorefresh( bool(opts._enableAutoRefresh) ); - - if ( !indeterminate( repoProps._keepPackages ) ) -- repo.setKeepPackages( repoProps._keepPackages ); -+ repo.setKeepPackages( bool(repoProps._keepPackages) ); - - if ( gpgCheck != RepoInfo::GpgCheck::indeterminate ) - repo.setGpgCheck( gpgCheck ); -@@ -1571,21 +1571,21 @@ void modify_repo( Zypper & zypper, const std::string & alias, const RepoServiceC - { - if ( enable != repo.enabled() ) - changed_enabled = true; -- repo.setEnabled( enable ); -+ repo.setEnabled( bool(enable) ); - } - - if ( !indeterminate(autoref) ) - { - if ( autoref != repo.autorefresh()) - changed_autoref = true; -- repo.setAutorefresh( autoref ); -+ repo.setAutorefresh( bool(autoref) ); - } - - if ( !indeterminate(keepPackages) ) - { - if ( keepPackages != repo.keepPackages() ) - changed_keeppackages = true; -- repo.setKeepPackages( keepPackages ); -+ repo.setKeepPackages( bool(keepPackages) ); - } - - if ( gpgCheck != RepoInfo::GpgCheck::indeterminate ) -diff --git a/src/solve-commit.cc b/src/solve-commit.cc -index d725a1cb..6e7d1371 100755 ---- a/src/solve-commit.cc -+++ b/src/solve-commit.cc -@@ -171,7 +171,7 @@ static bool show_problems( Zypper & zypper ) - TriBool stopnow = show_problem( zypper, *probPtr, todo ); - if ( !indeterminate( stopnow ) ) - { -- retry = stopnow; -+ retry = bool(stopnow); - break; - } - } -@@ -239,10 +239,10 @@ static void set_force_resolution( Zypper & zypper ) - - DBG << "force resolution: " << force_resolution << endl; - std::ostringstream s; -- s << _("Force resolution:") << " " << asYesNo( force_resolution ); -+ s << _("Force resolution:") << " " << asYesNo( bool(force_resolution) ); - zypper.out().info(s.str(), Out::HIGH); - -- God->resolver()->setForceResolve( force_resolution ); -+ God->resolver()->setForceResolve( bool(force_resolution) ); - } - - static void set_clean_deps( Zypper & zypper ) -@@ -305,17 +305,17 @@ static void set_solver_flags( Zypper & zypper ) - const auto &solverSettings = SolverSettings::instance(); - if ( zypper.command() == ZypperCommand::DIST_UPGRADE ) - { -- if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->dupSetAllowDowngrade( solverSettings._allowDowngrade ); -- if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->dupSetAllowNameChange( solverSettings._allowNameChange ); -- if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->dupSetAllowArchChange( solverSettings._allowArchChange ); -- if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->dupSetAllowVendorChange( solverSettings._allowVendorChange ); -+ if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->dupSetAllowDowngrade( bool(solverSettings._allowDowngrade) ); -+ if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->dupSetAllowNameChange( bool(solverSettings._allowNameChange) ); -+ if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->dupSetAllowArchChange( bool(solverSettings._allowArchChange) ); -+ if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->dupSetAllowVendorChange( bool(solverSettings._allowVendorChange) ); - } - else - { -- if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->setAllowDowngrade( solverSettings._allowDowngrade ); -- if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->setAllowNameChange( solverSettings._allowNameChange ); -- if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->setAllowArchChange( solverSettings._allowArchChange ); -- if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->setAllowVendorChange( solverSettings._allowVendorChange ); -+ if ( !indeterminate( solverSettings._allowDowngrade ) ) God->resolver()->setAllowDowngrade( bool(solverSettings._allowDowngrade) ); -+ if ( !indeterminate( solverSettings._allowNameChange ) ) God->resolver()->setAllowNameChange( bool(solverSettings._allowNameChange) ); -+ if ( !indeterminate( solverSettings._allowArchChange ) ) God->resolver()->setAllowArchChange( bool(solverSettings._allowArchChange) ); -+ if ( !indeterminate( solverSettings._allowVendorChange ) ) God->resolver()->setAllowVendorChange( bool(solverSettings._allowVendorChange) ); - } - } - --- -2.20.1 - diff --git a/zypper.spec b/zypper.spec index fca468d..af02258 100644 --- a/zypper.spec +++ b/zypper.spec @@ -9,10 +9,6 @@ License: GPLv2+ URL: http://en.opensuse.org/Portal:Zypper Source0: https://github.com/openSUSE/zypper/archive/%{version}/%{name}-%{version}.tar.gz -# Backports from upstream -## Fix building with Boost 1.69 -Patch0001: 0001-Adapt-to-boost-1.69-requiring-explicit-casts-tribool.patch - BuildRequires: %{_bindir}/asciidoctor BuildRequires: %{_bindir}/xsltproc BuildRequires: cmake From e475bff3db42e1f1badc969b851810dbfed2ef00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 25 Mar 2019 14:33:37 +0100 Subject: [PATCH 17/57] Rebase to 1.14.27 (#1680605) --- .gitignore | 11 +---------- sources | 2 +- zypper.spec | 7 +++++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 5c58d79..6ff53c1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1 @@ -/zypper-1.13.22.tar.gz -/zypper-1.13.28.tar.gz -/zypper-1.13.30.tar.gz -/zypper-1.13.31.tar.gz -/zypper-1.13.32.tar.gz -/zypper-1.14.2.tar.gz -/zypper-1.14.3.tar.gz -/zypper-1.14.8.tar.gz -/zypper-1.14.15.tar.gz -/zypper-1.14.25.tar.gz +/zypper-*.tar.gz diff --git a/sources b/sources index f575122..fc4c10e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zypper-1.14.25.tar.gz) = 61cc1de1b57fdfcb6a05f6b3e2e6e4f5b8ef148823fd98816e90d200866813009fdf375aad3a124335664f7350b9b52f4d51e4cf116661715087ac3237ff42ee +SHA512 (zypper-1.14.27.tar.gz) = cb5115c57b32bfed06ffd5be13ddc463457161f132ff44270377bfa047e858ca156fb057b19e650d5c211f8496786060e3c2e8237d19266a34af8f168a5ef2fc diff --git a/zypper.spec b/zypper.spec index af02258..21ce278 100644 --- a/zypper.spec +++ b/zypper.spec @@ -1,8 +1,8 @@ %global min_libzypp_ver 17.11.0 Name: zypper -Version: 1.14.25 -Release: 5%{?dist} +Version: 1.14.27 +Release: 1%{?dist} Summary: Command line package manager using libzypp License: GPLv2+ @@ -157,6 +157,9 @@ popd %changelog +* Mon Mar 25 2019 Björn Esser - 1.14.27-1 +- Rebase to 1.14.27 (#1680605) + * Mon Mar 25 2019 Björn Esser - 1.14.25-5 - Explicitly enable translation on CMake command line 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 18/57] 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 19/57] 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 20/57] - 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 21/57] 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 22/57] 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 23/57] 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 24/57] - 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 25/57] 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 26/57] 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 27/57] 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 28/57] 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 29/57] 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 30/57] 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 31/57] - 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 32/57] - 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 33/57] 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 34/57] - 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 35/57] 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 36/57] 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 37/57] - 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 38/57] - 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 39/57] 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 40/57] 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 41/57] 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 42/57] 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 43/57] 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 44/57] 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 45/57] 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 46/57] 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 47/57] 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 48/57] 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 49/57] 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 50/57] 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 51/57] 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 52/57] 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 53/57] 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 54/57] 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 55/57] 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 56/57] 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 57/57] 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