Sync from SUSE:SLFO:Main zypper revision 63aa575e9402ff65d5fbe279c2f8e077
This commit is contained in:
parent
bb2f8ccc66
commit
ee0bc9d339
BIN
zypper-1.14.68.tar.bz2
(Stored with Git LFS)
BIN
zypper-1.14.68.tar.bz2
(Stored with Git LFS)
Binary file not shown.
BIN
zypper-1.14.73.tar.bz2
(Stored with Git LFS)
Normal file
BIN
zypper-1.14.73.tar.bz2
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,3 +1,86 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 3 12:37:42 CEST 2024 - ma@suse.de
|
||||||
|
|
||||||
|
- Fixed check for outdated repo metadata as non-root user
|
||||||
|
(bsc#1222086)
|
||||||
|
- BuildRequires: libzypp-devel >= 17.33.0.
|
||||||
|
- Delay zypp lock until command options are parsed (bsc#1223766)
|
||||||
|
- version 1.14.73
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 29 12:41:23 CEST 2024 - ma@suse.de
|
||||||
|
|
||||||
|
- Unify message format(fixes #485)
|
||||||
|
- version 1.14.72
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Apr 24 07:42:28 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- switch cmake build type to RelWithDebInfo
|
||||||
|
- modernize spec file (remove Authors section, use proper macros,
|
||||||
|
remove redundant clean section, don't mark man pages as doc)
|
||||||
|
- switch to -O2 -fvisibility=hidden -fpie:
|
||||||
|
* PIC is not needed as no shared lib is built
|
||||||
|
* fstack-protector-strong is default on modern dists and would
|
||||||
|
be downgraded by fstack-protector
|
||||||
|
* default visibility hidden allows better optimisation
|
||||||
|
* O2 is reducing inlining bloat
|
||||||
|
-> 18% reduced binary size
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 22 13:11:49 UTC 2024 - Dirk Müller <dmueller@suse.com>
|
||||||
|
|
||||||
|
- remove procps requires (was only for ZMD which is dropped)
|
||||||
|
(jsc#PED-8153)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Apr 15 13:02:18 CEST 2024 - ma@suse.de
|
||||||
|
|
||||||
|
- Do not try to refresh repo metadata as non-root user
|
||||||
|
(bsc#1222086)
|
||||||
|
Instead show refresh stats and hint how to update them.
|
||||||
|
- man: Explain how to protect orphaned packages by collecting
|
||||||
|
them in a plaindir repo.
|
||||||
|
- packages: Add --autoinstalled and --userinstalled options to
|
||||||
|
list them.
|
||||||
|
- Don't print 'reboot required' message if download-only or
|
||||||
|
dry-run (fixes #529)
|
||||||
|
Instead point out that a reboot would be required if the option
|
||||||
|
was not used.
|
||||||
|
- Resepect zypper.conf option `showAlias` search commands
|
||||||
|
(bsc#1221963)
|
||||||
|
Repository::asUserString (or Repository::label) respects the
|
||||||
|
zypper.conf option, while name/alias return the property.
|
||||||
|
- version 1.14.71
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 25 17:48:54 CET 2024 - ma@suse.de
|
||||||
|
|
||||||
|
- dup: New option --remove-orphaned to remove all orphaned
|
||||||
|
packages in dup (bsc#1221525)
|
||||||
|
- version 1.14.70
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Mar 22 18:09:02 CET 2024 - ma@suse.de
|
||||||
|
|
||||||
|
- info,summary: Support VendorSupportOption flag
|
||||||
|
VendorSupportSuperseded (jsc#OBS-301, jsc#PED-8014)
|
||||||
|
- BuildRequires: libzypp-devel >= 17.32.0.
|
||||||
|
API cleanup and changes for VendorSupportSuperseded.
|
||||||
|
- Show active dry-run/download-only at the commit propmpt.
|
||||||
|
- patch: Add --skip-not-applicable-patches option (closes #514)
|
||||||
|
- Fix printing detailed solver problem description.
|
||||||
|
The problem description() is one rule out possibly many in
|
||||||
|
completeProblemInfo() the solver has chosen to represent the
|
||||||
|
problem. So either description or completeProblemInfo should be
|
||||||
|
printed, but not both.
|
||||||
|
- Fix bash-completion to work with right adjusted numbers in the
|
||||||
|
1st column too (closes #505)
|
||||||
|
- Set libzypp shutdown request signal on Ctrl+C (fixes #522)
|
||||||
|
- lr REPO: In the detailed view show all baseurls not just the
|
||||||
|
first one (bsc#1218171)
|
||||||
|
- version 1.14.69
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Dec 14 10:55:34 CET 2023 - ma@suse.de
|
Thu Dec 14 10:55:34 CET 2023 - ma@suse.de
|
||||||
|
|
||||||
|
104
zypper.spec
104
zypper.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package zypper
|
# spec file for package zypper.spec
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -17,6 +17,11 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: zypper
|
Name: zypper
|
||||||
|
Version: 1.14.73
|
||||||
|
Release: 0
|
||||||
|
Source: %{name}-%{version}.tar.bz2
|
||||||
|
Source1: %{name}-rpmlintrc
|
||||||
|
URL: https://github.com/openSUSE/zypper
|
||||||
BuildRequires: augeas-devel >= 1.10.0
|
BuildRequires: augeas-devel >= 1.10.0
|
||||||
%if 0%{?suse_version} > 1325
|
%if 0%{?suse_version} > 1325
|
||||||
BuildRequires: libboost_headers-devel
|
BuildRequires: libboost_headers-devel
|
||||||
@ -26,18 +31,9 @@ BuildRequires: boost-devel >= 1.33.1
|
|||||||
BuildRequires: cmake >= 3.1
|
BuildRequires: cmake >= 3.1
|
||||||
BuildRequires: gcc-c++ >= 7
|
BuildRequires: gcc-c++ >= 7
|
||||||
BuildRequires: gettext-devel >= 0.15
|
BuildRequires: gettext-devel >= 0.15
|
||||||
BuildRequires: libzypp-devel >= 17.31.7
|
BuildRequires: libzypp-devel >= 17.33.0
|
||||||
BuildRequires: readline-devel >= 5.1
|
BuildRequires: readline-devel >= 5.1
|
||||||
BuildRequires: libxml2-devel
|
BuildRequires: libxml2-devel
|
||||||
Requires: procps
|
|
||||||
%if 0%{?suse_version}
|
|
||||||
Requires: libaugeas0 >= 1.10.0
|
|
||||||
%requires_ge libzypp
|
|
||||||
Recommends: logrotate
|
|
||||||
Recommends: zypper-log
|
|
||||||
%else
|
|
||||||
Requires: augeas >= 1.10.0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# required for documentation
|
# required for documentation
|
||||||
BuildRequires: rubygem(asciidoctor)
|
BuildRequires: rubygem(asciidoctor)
|
||||||
@ -49,18 +45,22 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|||||||
Summary: Command line software manager using libzypp
|
Summary: Command line software manager using libzypp
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
Group: System/Packages
|
Group: System/Packages
|
||||||
Version: 1.14.68
|
|
||||||
Release: 0
|
|
||||||
Source: %{name}-%{version}.tar.bz2
|
|
||||||
Source1: %{name}-rpmlintrc
|
|
||||||
Url: https://github.com/openSUSE/zypper
|
|
||||||
Provides: y2pmsh
|
Provides: y2pmsh
|
||||||
Obsoletes: y2pmsh
|
Obsoletes: y2pmsh
|
||||||
|
|
||||||
Provides: zypper(auto-agree-with-product-licenses)
|
Provides: zypper(auto-agree-with-product-licenses)
|
||||||
Provides: zypper(oldpackage)
|
Provides: zypper(oldpackage)
|
||||||
Provides: zypper(updatestack-only)
|
Provides: zypper(updatestack-only)
|
||||||
Provides: zypper(purge-kernels)
|
Provides: zypper(purge-kernels)
|
||||||
|
%if 0%{?suse_version}
|
||||||
|
Requires: libaugeas0 >= 1.10.0
|
||||||
|
%requires_ge libzypp
|
||||||
|
Recommends: logrotate
|
||||||
|
Recommends: zypper-log
|
||||||
|
%else
|
||||||
|
Requires: augeas >= 1.10.0
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Zypper is a command line tool for managing software. It can be used to add
|
Zypper is a command line tool for managing software. It can be used to add
|
||||||
@ -70,21 +70,13 @@ install patches, hardware drivers, verify dependencies, and more.
|
|||||||
Zypper can be used interactively or non-interactively by user, from scripts,
|
Zypper can be used interactively or non-interactively by user, from scripts,
|
||||||
or front-ends.
|
or front-ends.
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Jan Kupec <jkupec@suse.cz>
|
|
||||||
Michael Andres <ma@suse.de>
|
|
||||||
Duncan Mac-Vicar <dmacvicar@suse.de>
|
|
||||||
Martin Vidner <mvidner@suse.cz>
|
|
||||||
Josef Reidinger <jreidinger@suse.cz>
|
|
||||||
|
|
||||||
%package log
|
%package log
|
||||||
Requires: /bin/bash
|
|
||||||
Requires: /usr/bin/awk
|
|
||||||
Requires: /usr/bin/grep
|
|
||||||
BuildArch: noarch
|
|
||||||
Summary: CLI for accessing the zypper logfile
|
Summary: CLI for accessing the zypper logfile
|
||||||
Group: System/Packages
|
Group: System/Packages
|
||||||
|
Requires: %{_bindir}/awk
|
||||||
|
Requires: %{_bindir}/grep
|
||||||
|
Requires: /bin/bash
|
||||||
|
BuildArch: noarch
|
||||||
|
|
||||||
%description -n zypper-log
|
%description -n zypper-log
|
||||||
CLI for accessing the zypper logfile
|
CLI for accessing the zypper logfile
|
||||||
@ -99,28 +91,20 @@ BuildArch: noarch
|
|||||||
%description aptitude
|
%description aptitude
|
||||||
provides compatibility to Debian's aptitude command using zypper
|
provides compatibility to Debian's aptitude command using zypper
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Bernhard M. Wiedemann <bernhard+aptitude4zypp lsmod de>
|
|
||||||
|
|
||||||
%package needs-restarting
|
%package needs-restarting
|
||||||
Summary: needs-restarting compatibility with zypper
|
Summary: needs-restarting compatibility with zypper
|
||||||
Group: System/Packages
|
Group: System/Packages
|
||||||
Requires: zypper
|
Requires: zypper
|
||||||
|
BuildArch: noarch
|
||||||
%if 0%{?suse_version}
|
%if 0%{?suse_version}
|
||||||
Supplements: zypper
|
Supplements: zypper
|
||||||
%endif
|
%endif
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description needs-restarting
|
%description needs-restarting
|
||||||
provides compatibility to YUM needs-restarting command using zypper
|
provides compatibility to YUM needs-restarting command using zypper
|
||||||
|
|
||||||
Authors:
|
|
||||||
--------
|
|
||||||
Michael Andres <ma@suse.de>
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p build
|
mkdir -p build
|
||||||
@ -135,19 +119,21 @@ CMAKE_FLAGS=
|
|||||||
CMAKE_FLAGS="$CMAKE_FLAGS -DLEGACY_ENABLE_LONGOPT_ABBREV=1"
|
CMAKE_FLAGS="$CMAKE_FLAGS -DLEGACY_ENABLE_LONGOPT_ABBREV=1"
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
export CFLAGS="%{optflags}"
|
||||||
|
export CXXFLAGS="%{optflags}"
|
||||||
|
export LDFLAGS="-Wl,--as-needed -fpie %{optflags}"
|
||||||
|
|
||||||
cmake $CMAKE_FLAGS \
|
cmake $CMAKE_FLAGS \
|
||||||
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
|
||||||
-DSYSCONFDIR=%{_sysconfdir} \
|
-DSYSCONFDIR=%{_sysconfdir} \
|
||||||
-DMANDIR=%{_mandir} \
|
-DMANDIR=%{_mandir} \
|
||||||
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
|
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
|
||||||
-DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
|
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
|
||||||
-DENABLE_BUILD_TESTS=ON \
|
-DENABLE_BUILD_TESTS=ON \
|
||||||
..
|
..
|
||||||
|
|
||||||
#gettextize -f
|
#gettextize -f
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
%check
|
%check
|
||||||
pushd build/tests
|
pushd build/tests
|
||||||
@ -156,19 +142,19 @@ popd
|
|||||||
|
|
||||||
%install
|
%install
|
||||||
cd build
|
cd build
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT
|
%make_install
|
||||||
|
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypper
|
mkdir -p %{buildroot}%{_prefix}/lib/zypper
|
||||||
mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/zypper/commands
|
mkdir -p %{buildroot}%{_prefix}/lib/zypper/commands
|
||||||
|
|
||||||
# yzpper symlink
|
# yzpper symlink
|
||||||
ln -s zypper $RPM_BUILD_ROOT%{_bindir}/yzpper
|
ln -s zypper %{buildroot}%{_bindir}/yzpper
|
||||||
|
|
||||||
# Create filelist with translations
|
# Create filelist with translations
|
||||||
cd ..
|
cd ..
|
||||||
%{find_lang} zypper
|
%find_lang zypper
|
||||||
%{__install} -d -m755 $RPM_BUILD_ROOT%{_var}/log
|
install -d -m755 %{buildroot}%{_var}/log
|
||||||
touch $RPM_BUILD_ROOT%{_var}/log/zypper.log
|
touch %{buildroot}%{_var}/log/zypper.log
|
||||||
|
|
||||||
%if %{defined _distconfdir}
|
%if %{defined _distconfdir}
|
||||||
# Move logratate files form /etc/logrotate.d to /usr/etc/logrotate.d
|
# Move logratate files form /etc/logrotate.d to /usr/etc/logrotate.d
|
||||||
@ -177,9 +163,6 @@ mv %{buildroot}/%{_sysconfdir}/logrotate.d/zypper.lr %{buildroot}%{_distconfdir}
|
|||||||
mv %{buildroot}/%{_sysconfdir}/logrotate.d/zypp-refresh.lr %{buildroot}%{_distconfdir}/logrotate.d
|
mv %{buildroot}/%{_sysconfdir}/logrotate.d/zypp-refresh.lr %{buildroot}%{_distconfdir}/logrotate.d
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%clean
|
|
||||||
rm -rf "$RPM_BUILD_ROOT"
|
|
||||||
|
|
||||||
%if %{defined _distconfdir}
|
%if %{defined _distconfdir}
|
||||||
%pre
|
%pre
|
||||||
# Prepare for migration to /usr/etc; save any old .rpmsave
|
# Prepare for migration to /usr/etc; save any old .rpmsave
|
||||||
@ -219,10 +202,10 @@ done
|
|||||||
%dir %{_datadir}/zypper/xml
|
%dir %{_datadir}/zypper/xml
|
||||||
%{_datadir}/zypper/xml/xmlout.rnc
|
%{_datadir}/zypper/xml/xmlout.rnc
|
||||||
%{_prefix}/lib/zypper
|
%{_prefix}/lib/zypper
|
||||||
%doc %{_mandir}/man8/zypper.8*
|
%{_mandir}/man8/zypper.8%{?ext_man}
|
||||||
%doc %{_mandir}/man8/zypp-refresh.8*
|
%{_mandir}/man8/zypp-refresh.8%{?ext_man}
|
||||||
%doc %dir %{_datadir}/doc/packages/zypper
|
%doc %dir %{_docdir}/zypper
|
||||||
%doc %{_datadir}/doc/packages/zypper/HACKING
|
%doc %{_docdir}/zypper/HACKING
|
||||||
# declare ownership of the log file but prevent
|
# declare ownership of the log file but prevent
|
||||||
# it from being erased by rpm -e
|
# it from being erased by rpm -e
|
||||||
%ghost %config(noreplace) %attr (640,root,root) %{_var}/log/zypper.log
|
%ghost %config(noreplace) %attr (640,root,root) %{_var}/log/zypper.log
|
||||||
@ -230,10 +213,9 @@ done
|
|||||||
%files log
|
%files log
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_sbindir}/zypper-log
|
%{_sbindir}/zypper-log
|
||||||
%doc %{_mandir}/man8/zypper-log.8*
|
%{_mandir}/man8/zypper-log.8%{?ext_man}
|
||||||
|
|
||||||
%files aptitude
|
%files aptitude
|
||||||
%defattr(-,root,root)
|
|
||||||
%{_bindir}/aptitude
|
%{_bindir}/aptitude
|
||||||
%{_bindir}/apt-get
|
%{_bindir}/apt-get
|
||||||
%{_bindir}/apt
|
%{_bindir}/apt
|
||||||
@ -243,6 +225,6 @@ done
|
|||||||
%files needs-restarting
|
%files needs-restarting
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_bindir}/needs-restarting
|
%{_bindir}/needs-restarting
|
||||||
%doc %{_mandir}/man1/needs-restarting.1*
|
%{_mandir}/man1/needs-restarting.1%{?ext_man}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user