Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pcmciautils for openSUSE:Factory checked in at 2022-02-24 18:18:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcmciautils (Old) and /work/SRC/openSUSE:Factory/.pcmciautils.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcmciautils" Thu Feb 24 18:18:19 2022 rev:30 rq:957030 version:018 Changes: -------- --- /work/SRC/openSUSE:Factory/pcmciautils/pcmciautils.changes 2021-06-11 00:17:38.265208913 +0200 +++ /work/SRC/openSUSE:Factory/.pcmciautils.new.1958/pcmciautils.changes 2022-02-24 18:18:24.154739266 +0100 @@ -1,0 +2,7 @@ +Tue Feb 1 15:05:43 UTC 2022 - Matthias Gerstner <matthias.gerst...@suse.com> + +- instdir.patch: move binaries from /sbin to /usr/sbin, where all binaries + belong by now. /sbin is a symlink to /usr/sbin so no compatibility issues + should occur. + +------------------------------------------------------------------- New: ---- instdir.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcmciautils.spec ++++++ --- /var/tmp/diff_new_pack.OFKRbV/_old 2022-02-24 18:18:24.742739108 +0100 +++ /var/tmp/diff_new_pack.OFKRbV/_new 2022-02-24 18:18:24.746739107 +0100 @@ -1,7 +1,7 @@ # # spec file for package pcmciautils # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %if %{undefined _firmwaredir} %define _firmwaredir /lib/firmware %endif @@ -26,13 +27,14 @@ Summary: Utilities for PC-Cards License: GPL-2.0-or-later Group: Hardware/Other -Url: https://www.kernel.org/pub/linux/utils/kernel/pcmcia/ +URL: https://www.kernel.org/pub/linux/utils/kernel/pcmcia/ Source0: https://www.kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-%{version}.tar.xz Source1: suse-files.tar.bz2 Source2: cis-files.tar.bz2 Patch1: pcmciautils_config.opts.202500.diff Patch3: pcmciautils_pie.diff Patch4: fix_udev_directory.patch +Patch5: instdir.patch BuildRequires: bison BuildRequires: flex BuildRequires: pkgconfig @@ -59,6 +61,7 @@ %setup -q -n pcmciautils-%{version} -T -D -a 2 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build make %{?_smp_mflags} all DEF_CFLAGS="-fPIE %{optflags}" DEF_LDFLAGS="-pie" STRIPCMD=true @@ -74,11 +77,11 @@ install -m 644 suse-files/README.SUSE %{buildroot}%{_docdir}/pcmciautils %post -%set_permissions /sbin/pccardctl +%set_permissions /usr/sbin/pccardctl rm -vf %{_sysconfdir}/sysconfig/pcmcia %verifyscript -%verify_permissions -e /sbin/pccardctl +%verify_permissions -e /usr/sbin/pccardctl %files %defattr(-,root,root) @@ -86,10 +89,10 @@ %config %{_sysconfdir}/pcmcia/config.opts %{_sysconfdir}/pcmcia/NOTE %{_udevrulesdir}/60-pcmcia.rules -%verify(not mode) %attr(4750,root,trusted) /sbin/pccardctl +%verify(not mode) %attr(4750,root,trusted) /usr/sbin/pccardctl %{_udevdir}/pcmcia-check-broken-cis %{_udevdir}/pcmcia-socket-startup -/sbin/lspcmcia +/usr/sbin/lspcmcia %{_firmwaredir}/* %{_docdir}/pcmciautils %{_mandir}/man8/* ++++++ instdir.patch ++++++ Index: pcmciautils-018/Makefile =================================================================== --- pcmciautils-018.orig/Makefile +++ pcmciautils-018/Makefile @@ -70,7 +70,7 @@ KERNEL_DIR = /lib/modules/${shell uname # override this to make pcmciautils look in a different location for its files prefix = -exec_prefix = ${prefix} +exec_prefix = ${prefix}/usr etcdir = ${prefix}/etc sbindir = ${exec_prefix}/sbin mandir = ${prefix}/usr/share/man
