Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package deepin-daemon for openSUSE:Factory checked in at 2023-01-14 20:32:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/deepin-daemon (Old) and /work/SRC/openSUSE:Factory/.deepin-daemon.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deepin-daemon" Sat Jan 14 20:32:40 2023 rev:11 rq:1058380 version:5.14.45 Changes: -------- --- /work/SRC/openSUSE:Factory/deepin-daemon/deepin-daemon.changes 2022-09-01 22:10:43.480170906 +0200 +++ /work/SRC/openSUSE:Factory/.deepin-daemon.new.32243/deepin-daemon.changes 2023-01-14 20:32:44.117573438 +0100 @@ -1,0 +2,5 @@ +Thu Jan 12 18:05:58 UTC 2023 - Stefan Schubert <sch...@suse.com> + +- Migration of PAM settings to /usr/lib/pam.d. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ deepin-daemon.spec ++++++ --- /var/tmp/diff_new_pack.phc7XH/_old 2023-01-14 20:32:45.217579934 +0100 +++ /var/tmp/diff_new_pack.phc7XH/_new 2023-01-14 20:32:45.221579957 +0100 @@ -1,7 +1,7 @@ # # spec file for package deepin-daemon # -# Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,9 +12,10 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # + %define _name dde-daemon %define import_path github.com/linuxdeepin/dde-daemon @@ -22,7 +23,7 @@ Version: 5.14.45 Release: 0 Summary: Daemon handling the DDE session settings -License: GPL-3.0+ +License: GPL-3.0-or-later URL: https://github.com/linuxdeepin/dde-daemon Source0: https://github.com/linuxdeepin/dde-daemon/archive/%{version}/%{_name}-%{version}.tar.gz Source1: %{name}.sysusers @@ -40,38 +41,38 @@ Patch2: disable-gobuild-in-makefile.patch Patch3: harden_deepin-accounts-daemon.service.patch Group: System/GUI/Other -BuildRequires: lightdm -BuildRequires: lightdm-gtk-greeter -BuildRequires: golang-packaging BuildRequires: deepin-gettext-tools BuildRequires: fontpackages-devel +BuildRequires: golang-github-linuxdeepin-dde-api +BuildRequires: golang-github-linuxdeepin-go-dbus-factory +BuildRequires: golang-packaging +BuildRequires: lightdm +BuildRequires: lightdm-gtk-greeter BuildRequires: pam-devel BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(ddcutil) BuildRequires: pkgconfig(fontconfig) -BuildRequires: pkgconfig(gnome-keyring-1) BuildRequires: pkgconfig(gdk-pixbuf-xlib-2.0) -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gnome-keyring-1) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(gudev-1.0) BuildRequires: pkgconfig(libbamf3) BuildRequires: pkgconfig(libcanberra) +BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(libnl-3.0) BuildRequires: pkgconfig(libnl-genl-3.0) BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libudev) -BuildRequires: pkgconfig(gudev-1.0) -BuildRequires: pkgconfig(librsvg-2.0) -BuildRequires: pkgconfig(libinput) BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xi) -BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xi) BuildRequires: pkgconfig(xkbfile) -BuildRequires: pkgconfig(ddcutil) -BuildRequires: golang-github-linuxdeepin-go-dbus-factory -BuildRequires: golang-github-linuxdeepin-dde-api +BuildRequires: pkgconfig(xtst) %if 0%{?sle_version} == 150200 BuildRequires: golang-github-stretchr-testify %endif @@ -80,16 +81,16 @@ %else BuildRequires: rsvg-view %endif -BuildRequires: pkgconfig(systemd) BuildRequires: systemd-rpm-macros +BuildRequires: pkgconfig(systemd) Requires: acpid Requires: gvfs Requires: iw Requires: rfkill Requires: upower +Requires: wallpaper-branding-openSUSE Requires: xdotool Requires: xvfb-run -Requires: wallpaper-branding-openSUSE %if %{suse_version} > 1500 Requires: libgdk_pixbuf_xlib-2_0-0 %else @@ -130,10 +131,9 @@ %package -n golang-github-linuxdeepin-deepin-daemon Summary: Deepin daemon golang codes Group: Development/Languages/Golang -Requires: golang-github-linuxdeepin-go-dbus-factory Requires: golang-github-linuxdeepin-dde-api +Requires: golang-github-linuxdeepin-go-dbus-factory BuildArch: noarch -AutoReqProv: On AutoReq: Off %{go_provides} @@ -144,8 +144,8 @@ %package lightdm Summary: Deepin Desktop branding setting for lightdm Group: System/X11/Displaymanagers -Requires: lightdm Requires: %{name} = %{version} +Requires: lightdm AutoReqProv: Off %description lightdm @@ -253,8 +253,19 @@ %find_lang %{_name} +%if 0%{?suse_version} > 1500 +mkdir -p %{buildroot}%{_pam_vendordir} +mv %{buildroot}%{_sysconfdir}/pam.d/deepin-auth-keyboard %{buildroot}%{_pam_vendordir} +%endif + %pre %service_add_pre deepin-accounts-daemon.service +%if 0%{?suse_version} > 1500 +# Prepare for migration to /usr/lib; save any old .rpmsave +for i in pam.d/deepin-auth-keyboard ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||: +done +%endif %post %service_add_post deepin-accounts-daemon.service @@ -281,6 +292,14 @@ rm -f /usr/share/dbus-1/system-services/com.deepin.daemon* fi +%if 0%{?suse_version} > 1500 +%posttrans +# Migration to /usr/lib, restore just created .rpmsave +for i in pam.d/deepin-auth-keyboard ; do + test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||: +done +%endif + %files %defattr(-,root,root,-) %doc README.md CHANGELOG.md @@ -290,7 +309,11 @@ %exclude %{_bindir}/%{name}-polkit-installer %dir %{_sysconfdir}/default/grub.d %config %{_sysconfdir}/default/grub.d/10_deepin.cfg +%if 0%{?suse_version} > 1500 +%{_pam_vendordir}/deepin-auth-keyboard +%else %config %{_sysconfdir}/pam.d/deepin-auth-keyboard +%endif %dir %{_sysconfdir}/NetworkManager %dir %{_sysconfdir}/NetworkManager/conf.d %config %{_sysconfdir}/NetworkManager/conf.d/deepin.dde.daemon.conf
