Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package unzip for openSUSE:Factory checked
in at 2025-06-01 21:36:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/unzip (Old)
and /work/SRC/openSUSE:Factory/.unzip.new.16005 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "unzip"
Sun Jun 1 21:36:15 2025 rev:51 rq:1281150 version:6.00
Changes:
--------
--- /work/SRC/openSUSE:Factory/unzip/unzip-rcc.changes 2025-04-03
18:43:57.218156665 +0200
+++ /work/SRC/openSUSE:Factory/.unzip.new.16005/unzip-rcc.changes
2025-06-01 21:36:26.052991687 +0200
@@ -1,0 +2,10 @@
+Thu May 29 04:36:02 UTC 2025 - Martin Schreiner <martin.schrei...@suse.com>
+
+- Migrate away from update-alternatives (bsc#1240103).
+- 'unzip' and 'unzip-rcc' now conflict with each other, meaning only
+ one of them can be installed at the same time.
+- 'unzip-rcc-doc' now provides man pages as well.
+- Upon installation of the newer packages, the old alternatives
+ are purged from the system.
+
+-------------------------------------------------------------------
unzip.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ unzip-rcc.spec ++++++
--- /var/tmp/diff_new_pack.b9vi7h/_old 2025-06-01 21:36:27.433048850 +0200
+++ /var/tmp/diff_new_pack.b9vi7h/_new 2025-06-01 21:36:27.433048850 +0200
@@ -1,7 +1,7 @@
#
# spec file for package unzip-rcc
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,19 +18,19 @@
%define _name unzip
%define fileversion 60
+
%bcond_without rcc
%if %{with rcc}
-%define update_weight 20
-%define _suffix rcc
BuildRequires: librcc-devel
Suggests: librcc0
Provides: %{_name} = %{version}
+Conflicts: %{_name}
%else
-%define update_weight 10
-%define _suffix plain
+Conflicts: %{_name}-rcc
%endif
# NOTE: unzip.spec is the major file, if you want to update unzip-rcc.spec
# call pre_checkin.sh after editing unzip.spec
+
Name: unzip-rcc
Version: 6.00
Release: 0
@@ -67,7 +67,6 @@
Patch25: CVE-2022-0529.patch
Patch26: unzip-time-decl.patch
Requires(post): update-alternatives
-Requires(postun): update-alternatives
Recommends: %{_name}-doc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -82,6 +81,11 @@
Summary: Documentation files for unzip
Group: Productivity/Archiving/Compression
BuildArch: noarch
+%if %{with rcc}
+Conflicts: %{_name}-doc
+%else
+Conflicts: %{_name}-rcc-doc
+%endif
%description doc
UnZip is an extraction utility for archives compressed in .zip format
@@ -131,59 +135,44 @@
make %{?_smp_mflags} -f unix/Makefile check
%install
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1}
+mkdir -p %{buildroot}%{_bindir}
+# unzip funzip unzipsfx
for i in unzip funzip unzipsfx; do
- install $i "%{buildroot}%{_bindir}/$i-"%{_suffix}
+ install $i "%{buildroot}%{_bindir}/$i"
done
+
+# zipinfo is just a symlink to unzip
ln -s unzip %{buildroot}%{_bindir}/zipinfo
-install unix/zipgrep "%{buildroot}%{_bindir}/zipgrep-"%{_suffix}
-for i in unzip funzip unzipsfx zipgrep; do
- touch %{buildroot}%{_sysconfdir}/alternatives/$i
- ln -s %{_sysconfdir}/alternatives/$i %{buildroot}%{_bindir}/$i
-done
-# do not have the docu in both packages
-%if %{without rcc}
- for i in man/*.1; do
+# zipgrep comes from elsewhere in the build environment
+install unix/zipgrep "%{buildroot}%{_bindir}/zipgrep"
+
+# as both unzip and unzip-rcc now conflict, we provide the man
+# packages through both packages
+mkdir -p %{buildroot}%{_mandir}/man1
+for i in man/*.1; do
install -m 644 $i %{buildroot}%{_mandir}/man1/
- done
-%endif
+done
%post
+# remove old alternatives from when we were using update-alternatives
+# zipinfo was never provided as an alternative
for bin in unzip funzip unzipsfx zipgrep; do
- %{_sbindir}/update-alternatives --install %{_bindir}/$bin $bin
"%{_bindir}/$bin-"%{_suffix} %{update_weight}
+ %{_sbindir}/update-alternatives --remove $bin "%{_bindir}/$bin"-plain
+ %{_sbindir}/update-alternatives --remove $bin "%{_bindir}/$bin"-rcc
done
-%postun
-if [ "$1" = 0 ] ; then
- for bin in unzip funzip unzipsfx zipgrep; do
- %{_sbindir}/update-alternatives --remove $bin "%{_bindir}/$bin"-%{_suffix}
- done
-fi
-
%files
%defattr(-,root,root)
-%ghost %{_sysconfdir}/alternatives/unzip
%{_bindir}/unzip
-%{_bindir}/unzip-%{_suffix}
-%ghost %{_sysconfdir}/alternatives/funzip
%{_bindir}/funzip
-%{_bindir}/funzip-%{_suffix}
-%ghost %{_sysconfdir}/alternatives/unzipsfx
%{_bindir}/unzipsfx
-%{_bindir}/unzipsfx-%{_suffix}
%{_bindir}/zipinfo
-%ghost %{_sysconfdir}/alternatives/zipgrep
%{_bindir}/zipgrep
-%{_bindir}/zipgrep-%{_suffix}
-%if %{without rcc}
%files doc
%defattr(-,root,root)
%{_mandir}/man1/*
%doc BUGS Contents History.* LICENSE README ToDo WHERE
%doc *.txt proginfo
-%endif
-
++++++ unzip.spec ++++++
--- /var/tmp/diff_new_pack.b9vi7h/_old 2025-06-01 21:36:27.461050010 +0200
+++ /var/tmp/diff_new_pack.b9vi7h/_new 2025-06-01 21:36:27.465050175 +0200
@@ -1,7 +1,7 @@
#
# spec file for package unzip
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,19 +18,19 @@
%define _name unzip
%define fileversion 60
+
%bcond_with rcc
%if %{with rcc}
-%define update_weight 20
-%define _suffix rcc
BuildRequires: librcc-devel
Suggests: librcc0
Provides: %{_name} = %{version}
+Conflicts: %{_name}
%else
-%define update_weight 10
-%define _suffix plain
+Conflicts: %{_name}-rcc
%endif
# NOTE: unzip.spec is the major file, if you want to update unzip-rcc.spec
# call pre_checkin.sh after editing unzip.spec
+
Name: unzip
Version: 6.00
Release: 0
@@ -67,7 +67,6 @@
Patch25: CVE-2022-0529.patch
Patch26: unzip-time-decl.patch
Requires(post): update-alternatives
-Requires(postun): update-alternatives
Recommends: %{_name}-doc
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -82,6 +81,11 @@
Summary: Documentation files for unzip
Group: Productivity/Archiving/Compression
BuildArch: noarch
+%if %{with rcc}
+Conflicts: %{_name}-doc
+%else
+Conflicts: %{_name}-rcc-doc
+%endif
%description doc
UnZip is an extraction utility for archives compressed in .zip format
@@ -131,59 +135,44 @@
make %{?_smp_mflags} -f unix/Makefile check
%install
-mkdir -p %{buildroot}%{_sysconfdir}/alternatives
-mkdir -p %{buildroot}{%{_bindir},%{_mandir}/man1}
+mkdir -p %{buildroot}%{_bindir}
+# unzip funzip unzipsfx
for i in unzip funzip unzipsfx; do
- install $i "%{buildroot}%{_bindir}/$i-"%{_suffix}
+ install $i "%{buildroot}%{_bindir}/$i"
done
+
+# zipinfo is just a symlink to unzip
ln -s unzip %{buildroot}%{_bindir}/zipinfo
-install unix/zipgrep "%{buildroot}%{_bindir}/zipgrep-"%{_suffix}
-for i in unzip funzip unzipsfx zipgrep; do
- touch %{buildroot}%{_sysconfdir}/alternatives/$i
- ln -s %{_sysconfdir}/alternatives/$i %{buildroot}%{_bindir}/$i
-done
-# do not have the docu in both packages
-%if %{without rcc}
- for i in man/*.1; do
+# zipgrep comes from elsewhere in the build environment
+install unix/zipgrep "%{buildroot}%{_bindir}/zipgrep"
+
+# as both unzip and unzip-rcc now conflict, we provide the man
+# packages through both packages
+mkdir -p %{buildroot}%{_mandir}/man1
+for i in man/*.1; do
install -m 644 $i %{buildroot}%{_mandir}/man1/
- done
-%endif
+done
%post
+# remove old alternatives from when we were using update-alternatives
+# zipinfo was never provided as an alternative
for bin in unzip funzip unzipsfx zipgrep; do
- %{_sbindir}/update-alternatives --install %{_bindir}/$bin $bin
"%{_bindir}/$bin-"%{_suffix} %{update_weight}
+ %{_sbindir}/update-alternatives --remove $bin "%{_bindir}/$bin"-plain
+ %{_sbindir}/update-alternatives --remove $bin "%{_bindir}/$bin"-rcc
done
-%postun
-if [ "$1" = 0 ] ; then
- for bin in unzip funzip unzipsfx zipgrep; do
- %{_sbindir}/update-alternatives --remove $bin "%{_bindir}/$bin"-%{_suffix}
- done
-fi
-
%files
%defattr(-,root,root)
-%ghost %{_sysconfdir}/alternatives/unzip
%{_bindir}/unzip
-%{_bindir}/unzip-%{_suffix}
-%ghost %{_sysconfdir}/alternatives/funzip
%{_bindir}/funzip
-%{_bindir}/funzip-%{_suffix}
-%ghost %{_sysconfdir}/alternatives/unzipsfx
%{_bindir}/unzipsfx
-%{_bindir}/unzipsfx-%{_suffix}
%{_bindir}/zipinfo
-%ghost %{_sysconfdir}/alternatives/zipgrep
%{_bindir}/zipgrep
-%{_bindir}/zipgrep-%{_suffix}
-%if %{without rcc}
%files doc
%defattr(-,root,root)
%{_mandir}/man1/*
%doc BUGS Contents History.* LICENSE README ToDo WHERE
%doc *.txt proginfo
-%endif
-
