Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4

.gitignore

@@ -1,5 +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-*.tar.gz

sources

@@ -1 +1 @@
-SHA512 (zypper-1.13.32.tar.gz) = 231090120b0893b38016b0a504c11b67e4987e05f37d6ae88eafdc9f6747c9d4d21c1e1217331089513de4f46366c2f76f0cdb3228b9f1246501683bc7a43de9
+SHA512 (zypper-1.14.94.tar.gz) = 579f91def0c0e79ba81fe73341302ba1a8942a9878d2305ca11fb0a7747936612ed6eb91c68e6a0199687fd06ac0b9dc2fbae5dd9b895e484aa204b2b519dc2e

zypper.spec

@@ -1,16 +1,25 @@
-%global min_libzypp_ver 16.15.4
+# Force out of source build
+%undefine __cmake_in_source_build
+
+%global min_libzypp_ver 17.37.12
 
 Name:           zypper
-Version:        1.13.32
-Release:        1%{?dist}
+Version:        1.14.94
+Release:        2%{?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
 
+BuildRequires:  %{_bindir}/asciidoctor
+BuildRequires:  %{_bindir}/xsltproc
+BuildRequires:  cmake >= 3.5
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
 BuildRequires:  perl-generators
-BuildRequires:  cmake
+BuildRequires:  glibc-all-langpacks
 BuildRequires:  augeas-devel
 BuildRequires:  boost-devel
 BuildRequires:  gettext-devel
@@ -18,8 +27,9 @@ BuildRequires:  readline-devel
 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
@@ -29,6 +39,8 @@ Recommends:     zypper-log
 Provides:       zypper(oldpackage)
 Provides:       zypper(updatestack-only)
 Provides:       zypper(auto-agree-with-product-licenses)
+Provides:       zypper(purge-kernels)
+Provides:       zypper(include-all-archs)
 
 
 %description
@@ -50,7 +62,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
 
@@ -74,15 +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 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir}
-%make_build
-%make_build -C po translations
-%make_build -C tests
+%cmake  -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDOC_INSTALL_DIR=%{_docdir} -DENABLE_BUILD_TESTS=ON -DENABLE_BUILD_TRANS=ON
+%cmake_build
 
 
 %install
-%make_install
-%make_install -C po
+%cmake_install
 
 mkdir -p %{buildroot}%{_libexecdir}/zypper/commands
 
@@ -96,19 +104,22 @@ 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 
-
-# 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/
+%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
 
 %check
-pushd tests
-ctest .
+pushd %{_vpath_builddir}/tests
+ctest -VV --output-on-failure .
 popd
 
 %files -f %{name}.lang
@@ -117,9 +128,14 @@ 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
+%{_bindir}/zypp-needs-restarting
 %{_sbindir}/zypp-refresh
 %{_datadir}/zypper/
 %{_libexecdir}/zypper/
@@ -134,11 +150,161 @@ 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/*
 
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.94-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Fri Jan 16 2026 Neal Gompa <ngompa@fedoraproject.org> - 1.14.94-1
+- Update to 1.14.94
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.88-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Wed Mar 19 2025 Neal Gompa <ngompa@fedoraproject.org> - 1.14.88-1
+- Rebase to 1.14.88
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.73-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
+* Fri Jul 26 2024 Miroslav Suchý <msuchy@redhat.com> - 1.14.73-3
+- convert license to SPDX
+
+* Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.73-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Wed Jun 05 2024 Neal Gompa <ngompa@fedoraproject.org> - 1.14.73-1
+- Update to 1.14.73
+
+* Sun Apr 14 2024 Neal Gompa <ngompa@fedoraproject.org> - 1.14.68-2
+- Rebuild for libzypp-tui soname fix
+
+* Mon Mar 04 2024 Neal Gompa <ngompa@fedoraproject.org> - 1.14.68-1
+- Update to 1.14.68
+
+* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.59-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.59-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Mar 09 2023 Neal Gompa <ngompa@fedoraproject.org> - 1.14.59-1
+- Update to 1.14.59
+
+* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.55-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Sep 02 2022 Neal Gompa <ngompa@fedoraproject.org> - 1.14.55-1
+- Update to 1.14.55 (#1932773)
+
+* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.42-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jun 01 2022 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.42-5
+- Perl 5.36 rebuild
+
+* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.42-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.42-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri May 21 2021 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.42-2
+- Perl 5.34 rebuild
+
+* Thu Feb 11 2021 Neal Gompa <ngompa13@gmail.com> - 1.14.42-1
+- Update to 1.14.42 (#1823433)
+
+* Thu Jan 28 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.37-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Sat Aug 08 2020 Neal Gompa <ngompa13@gmail.com> - 1.14.37-1
+- Update to 1.14.37 (#1823433)
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.35-5
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.35-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jun 25 2020 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.35-3
+- Perl 5.32 rebuild
+
+* Fri Mar 20 2020 Neal Gompa <ngompa13@gmail.com> - 1.14.35-2
+- Backport fixup commit for building with C++17
+
+* Fri Mar 20 2020 Neal Gompa <ngompa13@gmail.com> - 1.14.35-1
+- Update to 1.14.35 (#1805837)
+
+* Sat Mar 07 2020 Neal Gompa <ngompa13@gmail.com> - 1.14.34-1
+- Update to 1.14.34
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.33-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 27 2020 Neal Gompa <ngompa13@gmail.com> - 1.14.33-1
+- Update to 1.14.33 (#1777955)
+
+* Tue Nov 12 2019 Neal Gompa <ngompa13@gmail.com> - 1.14.32-1
+- Update to 1.14.32 (#1747529)
+
+* Tue Aug 27 2019 Neal Gompa <ngompa13@gmail.com> - 1.14.29-1
+- Update to 1.14.29 (#1719278)
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.27-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu May 30 2019 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.27-3
+- Perl 5.30 rebuild
+
+* Tue May 28 2019 Björn Esser <besser82@fedoraproject.org> - 1.14.27-2
+- Rebuilt (libzypp)
+
+* Mon Mar 25 2019 Björn Esser <besser82@fedoraproject.org> - 1.14.27-1
+- Rebase to 1.14.27 (#1680605)
+
+* Mon Mar 25 2019 Björn Esser <besser82@fedoraproject.org> - 1.14.25-5
+- Explicitly enable translation on CMake command line
+
+* Mon Mar 25 2019 Björn Esser <besser82@fedoraproject.org> - 1.14.25-4
+- Explicitly enable tests on CMake command line
+
+* Sun Feb 17 2019 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.14.25-3
+- Rebuild for readline 8.0
+
+* Tue Feb 12 2019 Neal Gompa <ngompa13@gmail.com> - 1.14.25-2
+- Downgrade bash-completion dependency to Recommends (#1652183)
+
+* Tue Feb 12 2019 Neal Gompa <ngompa13@gmail.com> - 1.14.25-1
+- Rebase to 1.14.25 (#1667664)
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sat Nov 03 2018 Neal Gompa <ngompa13@gmail.com> - 1.14.15-1
+- Update to 1.14.15
+
+* Sun Aug 26 2018 Neal Gompa <ngompa13@gmail.com> - 1.14.8-1
+- Update to 1.14.8 (#1555114)
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Thu Jun 28 2018 Jitka Plesnikova <jplesnik@redhat.com> - 1.14.3-2
+- Perl 5.28 rebuild
+
+* Sun Mar 04 2018 Neal Gompa <ngompa13@gmail.com> - 1.14.3-1
+- Update to 1.14.3 (#1550768)
+
+* Wed Feb 07 2018 Neal Gompa <ngompa13@gmail.com> - 1.14.2-1
+- Update to 1.14.2 (#1489428)
+- Backport patch to fix build with GCC 8
+
 * Sun Sep 03 2017 Neal Gompa <ngompa13@gmail.com> - 1.13.32-1
 - Update to 1.13.32 (#1485336)