From 10b548c43792bc4825fef8785e600727d23faa31 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 06:36:33 +0000 Subject: [PATCH 01/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index cc94f7d..d1d521a 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 15%{?git_version:.%{?git_version}}%{?dist} +Release: 16%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -181,6 +181,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.5.3-16.D20161111gita548c73e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.5.3-15.D20161111gita548c73e - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e85b6d392e5906c93595f013857ff2790e7324f4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 12 Aug 2020 16:15:30 +0900 Subject: [PATCH 02/32] Use /run instead of %_localstatedir/run (bug 1775734) --- lxdm.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lxdm.spec b/lxdm.spec index d1d521a..8a986de 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 16%{?git_version:.%{?git_version}}%{?dist} +Release: 17%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -88,7 +88,7 @@ sed -i.reset data/lxdm.conf.in \ install -cpm 644 %{SOURCE10} pam/lxdm cat << EOF > tempfiles.lxdm.conf -d %{_localstatedir}/run/%{name} 0755 root root +d /run/%{name} 0755 root root EOF %build @@ -105,7 +105,7 @@ make install DESTDIR=%{buildroot} INSTALL='install -p' # these files are not in the package, but should be owned by lxdm touch %{buildroot}%{_sysconfdir}/%{name}/xinitrc -mkdir -p %{buildroot}%{_localstatedir}/run/%{name} +mkdir -p %{buildroot}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} touch %{buildroot}%{_localstatedir}/lib/%{name}.conf @@ -170,17 +170,16 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %{_unitdir}-preset/83-fedora-lxdm.preset %endif -%if 0%{?fedora} >= 15 -%ghost %dir %{_localstatedir}/run/%{name} -%else -%dir %{_localstatedir}/run/%{name} -%endif +%ghost %dir /run/%{name} %dir %{_localstatedir}/lib/%{name} %ghost %{_localstatedir}/lib/%{name}.conf %changelog +* Wed Aug 12 2020 Mamoru TASAKA - 0.5.3-17.D20161111gita548c73e +- Use /run instead of %%_localstatedir/run (bug 1775734) + * Tue Jul 28 2020 Fedora Release Engineering - 0.5.3-16.D20161111gita548c73e - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0e57743e9568bb7e1f5005f7133e47bff123ff20 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 21:12:28 +0000 Subject: [PATCH 03/32] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- lxdm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lxdm.spec b/lxdm.spec index 8a986de..dc179d3 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -44,6 +44,7 @@ Patch50: lxdm-0.4.1-config.patch Patch60: lxdm-0.5.1-ssh-agent-on-start.patch +BuildRequires: make BuildRequires: pkgconfig(gtk+-2.0) >= 2.12.0 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(x11) From 477baf62f2e0c6a075e03ec7e9802332cf7427d3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 18:59:35 +0000 Subject: [PATCH 04/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index dc179d3..a4b483a 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 17%{?git_version:.%{?git_version}}%{?dist} +Release: 18%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -178,6 +178,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.5.3-18.D20161111gita548c73e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Aug 12 2020 Mamoru TASAKA - 0.5.3-17.D20161111gita548c73e - Use /run instead of %%_localstatedir/run (bug 1775734) From 29efaacf6b1f79f4580ef6734940fe669107e1d7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 13:28:23 +0000 Subject: [PATCH 05/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index a4b483a..959356e 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 18%{?git_version:.%{?git_version}}%{?dist} +Release: 19%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -178,6 +178,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.5.3-19.D20161111gita548c73e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.5.3-18.D20161111gita548c73e - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 964222da52fab36934df0586ddf6a81a88be04d0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 18:24:58 +0000 Subject: [PATCH 06/32] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index 959356e..9f04361 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 19%{?git_version:.%{?git_version}}%{?dist} +Release: 20%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -178,6 +178,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.5.3-20.D20161111gita548c73e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.5.3-19.D20161111gita548c73e - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 18d161c3075b4cb8881ceaf79661823ee8378d72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:13:10 +0000 Subject: [PATCH 07/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index 9f04361..6947d6c 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 20%{?git_version:.%{?git_version}}%{?dist} +Release: 21%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -178,6 +178,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 0.5.3-21.D20161111gita548c73e +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.5.3-20.D20161111gita548c73e - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 1e337dabf33701e895146c0128088988b9c62643 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sun, 11 Sep 2022 15:17:19 +0900 Subject: [PATCH 08/32] Update to the latest git (20220831) Switch to GTK3 --- .gitignore | 1 + create-tarball-from-git.sh | 5 +++-- lxdm.spec | 40 +++++++++++++++----------------------- sources | 2 +- 4 files changed, 21 insertions(+), 27 deletions(-) diff --git a/.gitignore b/.gitignore index 6d9fa13..d1969b6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ lxdm-0.2.0.tar.gz /lxdm-0.5.3-D20160103gitc6836939.tar.bz2 /lxdm-0.5.3-D20160321git72812894.tar.bz2 /lxdm-0.5.3-D20161111gita548c73e.tar.bz2 +/lxdm-0.5.3-D20220831git2d4ba970.tar.bz2 diff --git a/create-tarball-from-git.sh b/create-tarball-from-git.sh index d2cf409..845a4c2 100644 --- a/create-tarball-from-git.sh +++ b/create-tarball-from-git.sh @@ -8,9 +8,10 @@ CURRENTDIR=$(pwd) TMPDIR=$(mktemp -d /var/tmp/lxdm-XXXXXX) pushd $TMPDIR -GITSCM=git://git.lxde.org/lxde/lxdm.git +#GITSCM=git://git.lxde.org/lxde/lxdm.git +GITSCM=https://git.code.sf.net/p/lxdm/code -git clone $GITSCM +git clone $GITSCM lxdm pushd lxdm COMMIT=$(git log | head -n 1 | sed -e 's|^.*[ \t]||') diff --git a/lxdm.spec b/lxdm.spec index 6947d6c..55d9424 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -5,15 +5,15 @@ %global git_snapshot 1 %if 0%{?git_snapshot} -%global git_rev a548c73e35d62ec334df5cd3a491ee409d0067bd -%global git_date 20161111 +%global git_rev 2d4ba970e9bf97ec7d9c2730c940cabc58c54d27 +%global git_date 20220831 %global git_short %(echo %{git_rev} | cut -c-8) %global git_version D%{git_date}git%{git_short} %endif Name: lxdm Version: 0.5.3 -Release: 21%{?git_version:.%{?git_version}}%{?dist} +Release: 22%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -44,8 +44,8 @@ Patch50: lxdm-0.4.1-config.patch Patch60: lxdm-0.5.1-ssh-agent-on-start.patch -BuildRequires: make -BuildRequires: pkgconfig(gtk+-2.0) >= 2.12.0 +BuildRequires: make +BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0 BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(glib-2.0) @@ -63,12 +63,10 @@ Requires: %{_bindir}/ssh-agent # needed for anaconda to boot into runlevel 5 after install Provides: service(graphical-login) = lxdm -%if 0%{?fedora} >= 18 BuildRequires: systemd Requires(post): systemd Requires(preun): systemd Requires(postun): systemd -%endif %description @@ -95,6 +93,7 @@ EOF %build %{?git_version:sh autogen.sh} %configure \ + --enable-gtk3 \ --disable-silent-rules \ --disable-consolekit \ %{nil} @@ -110,37 +109,30 @@ mkdir -p %{buildroot}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} touch %{buildroot}%{_localstatedir}/lib/%{name}.conf -%if 0%{?fedora} >= 15 install -Dpm 644 tempfiles.lxdm.conf %{buildroot}%{_prefix}/lib/tmpfiles.d/lxdm.conf -%endif -%if 0%{?fedora} >= 18 install -Dpm 644 %{SOURCE1} %{buildroot}%{_unitdir}/%{name}.service install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.preset -%endif -%if 0%{?fedora} >= 18 %post %systemd_post %{name}.service - %preun %systemd_preun %{name}.service - %postun -%if 0%{?fedora} >= 31 %systemd_postun %{name}.service -%else -%systemd_postun -%endif -%endif %files -f %{name}.lang # FIXME add ChangeLog and NEWS if not empty -%doc AUTHORS COPYING README TODO gpl-2.0.txt lgpl-2.1.txt +%doc AUTHORS +%doc COPYING +%doc README TODO +%license gpl-2.0.txt +%license lgpl-2.1.txt + %dir %{_sysconfdir}/%{name} %ghost %config(noreplace,missingok) %{_sysconfdir}/%{name}/xinitrc %config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/Xsession @@ -162,14 +154,10 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %{_libexecdir}/lxdm-session %{_datadir}/%{name}/ -%if 0%{?fedora} >= 15 %config(noreplace) %{_prefix}/lib/tmpfiles.d/lxdm.conf -%endif -%if 0%{?fedora} >= 18 %{_unitdir}/lxdm.service %{_unitdir}-preset/83-fedora-lxdm.preset -%endif %ghost %dir /run/%{name} @@ -178,6 +166,10 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Sun Sep 11 2022 Mamoru TASAKA - 0.5.3-22.D20220831git2d4ba970 +- Update to the latest git (20220831) +- Switch to GTK3 + * Thu Jul 21 2022 Fedora Release Engineering - 0.5.3-21.D20161111gita548c73e - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/sources b/sources index a5a6bb8..9fc3b55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bdfad162a2512ee837a297bd970cd16d lxdm-0.5.3-D20161111gita548c73e.tar.bz2 +SHA512 (lxdm-0.5.3-D20220831git2d4ba970.tar.bz2) = 61f4b3e33959a8de9f06926c677e2a8b4cd2a23df156e23fc2c0feb49dd8758887c43f44682fd15f2a98c6a554061b3dd2f94a78731c4b239cae342dbef4f9b3 From 2e2ba1bdb942f85de89315d697f4f560179a0d00 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 Sep 2022 14:51:55 +0900 Subject: [PATCH 09/32] Update for tmpfiles.d guideline - config file is not %config Fix up %{_localstatedir}/lib/%{name}/%{name}.conf entry and mark as %config, not %ghost, install default file More verbose entry under %{_datadir}/%{name}/ --- lxdm.spec | 28 ++++++++++++++++++++-------- lxdm_conf_login | 3 +++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 lxdm_conf_login diff --git a/lxdm.spec b/lxdm.spec index 55d9424..d35c0da 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 22%{?git_version:.%{?git_version}}%{?dist} +Release: 22.100%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -29,6 +29,9 @@ Source0: http://downloads.sourceforge.net/sourceforge/lxdm/%{name}-%{vers Source1: lxdm.service Source2: lxdm.preset +# The default contents of /var/lib/lxdm/lxdm.conf (c.f. lxdm.c:lxdm_save_login) +Source5: lxdm_conf_login + # Fedora pam setting Source10: pam.lxdm @@ -107,7 +110,7 @@ make install DESTDIR=%{buildroot} INSTALL='install -p' touch %{buildroot}%{_sysconfdir}/%{name}/xinitrc mkdir -p %{buildroot}/run/%{name} mkdir -p %{buildroot}%{_localstatedir}/lib/%{name} -touch %{buildroot}%{_localstatedir}/lib/%{name}.conf +install -m644 -p %{SOURCE5} %{buildroot}%{_localstatedir}/lib/%{name}/%{name}.conf install -Dpm 644 tempfiles.lxdm.conf %{buildroot}%{_prefix}/lib/tmpfiles.d/lxdm.conf @@ -142,7 +145,7 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/PreLogin %config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/PreReboot %config(noreplace) %attr(755,root,root) %{_sysconfdir}/%{name}/PreShutdown -%config %{_sysconfdir}/%{name}/lxdm.conf +%config %attr(640,root,root) %{_sysconfdir}/%{name}/lxdm.conf %config(noreplace) %{_sysconfdir}/pam.d/%{name} %{_bindir}/%{name}-config @@ -152,20 +155,29 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %{_libexecdir}/lxdm-greeter-gdk %{_libexecdir}/lxdm-numlock %{_libexecdir}/lxdm-session -%{_datadir}/%{name}/ -%config(noreplace) %{_prefix}/lib/tmpfiles.d/lxdm.conf +%dir %{_datadir}/%{name}/ +%{_datadir}/%{name}/config.ui +%{_datadir}/%{name}/lxdm.glade +%{_datadir}/%{name}/themes/ + +%{_tmpfilesdir}/lxdm.conf +%dir /run/%{name} %{_unitdir}/lxdm.service %{_unitdir}-preset/83-fedora-lxdm.preset -%ghost %dir /run/%{name} - %dir %{_localstatedir}/lib/%{name} -%ghost %{_localstatedir}/lib/%{name}.conf +%config(noreplace) %verify(not md5 size mtime) %{_localstatedir}/lib/%{name}/%{name}.conf %changelog +* Thu Sep 29 2022 Mamoru TASAKA - 0.5.3-23.D20220831git2d4ba970 +- Update for tmpfiles.d guideline - config file is not %%config +- Fix up %%{_localstatedir}/lib/%%{name}/%%{name}.conf entry + and mark as %%config, not %%ghost, install default file +- More verbose entry under %%{_datadir}/%%{name}/ + * Sun Sep 11 2022 Mamoru TASAKA - 0.5.3-22.D20220831git2d4ba970 - Update to the latest git (20220831) - Switch to GTK3 diff --git a/lxdm_conf_login b/lxdm_conf_login new file mode 100644 index 0000000..81dc83d --- /dev/null +++ b/lxdm_conf_login @@ -0,0 +1,3 @@ +[base] +last_session=__default__ +last_lang= From e6f22bc2c5ba50e9646ac64f44baba30fad3ce40 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 Sep 2022 14:56:55 +0900 Subject: [PATCH 10/32] add comment --- lxdm.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/lxdm.spec b/lxdm.spec index d35c0da..a2f84e1 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -84,6 +84,7 @@ KDM in LXDE distros. It's still in very early stage of development. %patch50 -p1 -b .config %patch60 -p1 -b .ssh_agent +# Reset X after logout (bug 1269917) sed -i.reset data/lxdm.conf.in \ -e '\@reset@s|^.*$|reset=1|' From de0d6f2bec4b6d893f4ae46a96cc22b077cb2509 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 29 Sep 2022 18:23:24 +0900 Subject: [PATCH 11/32] F-37: update default background image --- lxdm.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index a2f84e1..ebe67d1 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 22.100%{?git_version:.%{?git_version}}%{?dist} +Release: 23%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -63,6 +63,8 @@ Requires: pam Requires: /sbin/shutdown Requires: desktop-backgrounds-compat Requires: %{_bindir}/ssh-agent +# Loading webp format img requires the below +Requires: webp-pixbuf-loader%{?_isa} # needed for anaconda to boot into runlevel 5 after install Provides: service(graphical-login) = lxdm @@ -87,6 +89,11 @@ KDM in LXDE distros. It's still in very early stage of development. # Reset X after logout (bug 1269917) sed -i.reset data/lxdm.conf.in \ -e '\@reset@s|^.*$|reset=1|' +# Fedora 37 changed default background file format +%if 0%{?fedora} >= 37 +sed -i.f37 data/lxdm.conf.in \ + -e '\@bg=@s|default.png|default.webp|' +%endif install -cpm 644 %{SOURCE10} pam/lxdm @@ -178,6 +185,8 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre - Fix up %%{_localstatedir}/lib/%%{name}/%%{name}.conf entry and mark as %%config, not %%ghost, install default file - More verbose entry under %%{_datadir}/%%{name}/ +- F-37: update default background image +- F-37: loading webp img requires webp-pixbuf-loader * Sun Sep 11 2022 Mamoru TASAKA - 0.5.3-22.D20220831git2d4ba970 - Update to the latest git (20220831) From ce4dc08bc8a799b6b93466384401b896a9ed9ed8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 18:39:13 +0000 Subject: [PATCH 12/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index ebe67d1..9db909b 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 23%{?git_version:.%{?git_version}}%{?dist} +Release: 24%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -180,6 +180,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.5.3-24.D20220831git2d4ba970 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Sep 29 2022 Mamoru TASAKA - 0.5.3-23.D20220831git2d4ba970 - Update for tmpfiles.d guideline - config file is not %%config - Fix up %%{_localstatedir}/lib/%%{name}/%%{name}.conf entry From ae7abeaf73fcdec87e6e311af5e5d9bf28eb4e31 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 15 Feb 2023 16:47:27 +0900 Subject: [PATCH 13/32] F-38 is using default.png, not .webp, reflect this --- lxdm.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lxdm.spec b/lxdm.spec index 9db909b..4c406cf 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 24%{?git_version:.%{?git_version}}%{?dist} +Release: 25%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -90,7 +90,9 @@ KDM in LXDE distros. It's still in very early stage of development. sed -i.reset data/lxdm.conf.in \ -e '\@reset@s|^.*$|reset=1|' # Fedora 37 changed default background file format -%if 0%{?fedora} >= 37 +# This is reverted, even on F-38 +#%%if 0%{?fedora} >= 37 +%if 0 sed -i.f37 data/lxdm.conf.in \ -e '\@bg=@s|default.png|default.webp|' %endif @@ -180,6 +182,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Wed Feb 15 2023 Mamoru TASAKA - 0.5.3-25.D20220831git2d4ba970 +- F-38 is using default.png, not .webp, reflect this + * Thu Jan 19 2023 Fedora Release Engineering - 0.5.3-24.D20220831git2d4ba970 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 8f16779e739cce066aeb83dbc799d02d1c68529a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Mar 2023 19:38:33 +0900 Subject: [PATCH 14/32] Keep pam.lxdm --- pam.lxdm => pam.lxdm-move-to-pam.lxdm.f38 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pam.lxdm => pam.lxdm-move-to-pam.lxdm.f38 (100%) diff --git a/pam.lxdm b/pam.lxdm-move-to-pam.lxdm.f38 similarity index 100% rename from pam.lxdm rename to pam.lxdm-move-to-pam.lxdm.f38 From 3b29c9888cd2d01805871ff2f58b85292e31a8f0 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Mar 2023 19:38:33 +0900 Subject: [PATCH 15/32] Copy pam.lxdm into pam.lxdm.f38 --- pam.lxdm => pam.lxdm.f38 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pam.lxdm => pam.lxdm.f38 (100%) diff --git a/pam.lxdm b/pam.lxdm.f38 similarity index 100% rename from pam.lxdm rename to pam.lxdm.f38 From 34c2445ca4f7f55f343824a70c1d5c3035206269 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Mar 2023 19:38:33 +0900 Subject: [PATCH 16/32] Set back pam.lxdm file --- pam.lxdm-move-to-pam.lxdm.f38 => pam.lxdm | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pam.lxdm-move-to-pam.lxdm.f38 => pam.lxdm (100%) diff --git a/pam.lxdm-move-to-pam.lxdm.f38 b/pam.lxdm similarity index 100% rename from pam.lxdm-move-to-pam.lxdm.f38 rename to pam.lxdm From 02db92b3c90dfd6325caf240a7291c149f239656 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 2 Mar 2023 19:52:15 +0900 Subject: [PATCH 17/32] F-39 (and above): remove pam_console.so (bug 1822227, bug 2166692) --- lxdm.spec | 15 +++++++++++++-- pam.lxdm | 1 - 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lxdm.spec b/lxdm.spec index 4c406cf..0e9f14f 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 25%{?git_version:.%{?git_version}}%{?dist} +Release: 26%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -33,7 +33,9 @@ Source2: lxdm.preset Source5: lxdm_conf_login # Fedora pam setting +# F-39: remove pam_console.so (bug 1822227, bug 2166692) Source10: pam.lxdm +Source11: pam.lxdm.f38 # Shell script to create tarball from git scm Source100: create-tarball-from-git.sh @@ -97,7 +99,13 @@ sed -i.f37 data/lxdm.conf.in \ -e '\@bg=@s|default.png|default.webp|' %endif -install -cpm 644 %{SOURCE10} pam/lxdm +install -cpm 644 \ +%if 0%{?fedora} >= 39 + %{SOURCE10} \ +%else + %{SOURCE11} \ +%endif + pam/lxdm cat << EOF > tempfiles.lxdm.conf d /run/%{name} 0755 root root @@ -182,6 +190,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Thu Mar 2 2023 Mamoru TASAKA - 0.5.3-26.D20220831git2d4ba970 +- F-39 (and above): remove pam_console.so (bug 1822227, bug 2166692) + * Wed Feb 15 2023 Mamoru TASAKA - 0.5.3-25.D20220831git2d4ba970 - F-38 is using default.png, not .webp, reflect this diff --git a/pam.lxdm b/pam.lxdm index 7bbc7fe..e7950be 100644 --- a/pam.lxdm +++ b/pam.lxdm @@ -10,7 +10,6 @@ account include system-auth password include system-auth session required pam_selinux.so close session required pam_loginuid.so -session optional pam_console.so session required pam_selinux.so open session optional pam_keyinit.so force revoke session required pam_namespace.so From 6aad364c41220707b034d446e476dbfec364f74c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 13:26:01 +0000 Subject: [PATCH 18/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index 0e9f14f..8de9799 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -13,7 +13,7 @@ Name: lxdm Version: 0.5.3 -Release: 26%{?git_version:.%{?git_version}}%{?dist} +Release: 27%{?git_version:.%{?git_version}}%{?dist} Summary: Lightweight X11 Display Manager License: GPLv2+ and LGPLv2+ @@ -190,6 +190,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.5.3-27.D20220831git2d4ba970 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Mar 2 2023 Mamoru TASAKA - 0.5.3-26.D20220831git2d4ba970 - F-39 (and above): remove pam_console.so (bug 1822227, bug 2166692) From 45b611e1482f9fb88944b113a2c9b594a1a229bf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Dec 2023 12:12:06 +0900 Subject: [PATCH 19/32] LXDM migration Change EVR scheme to use hat --- lxdm.spec | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/lxdm.spec b/lxdm.spec index 8de9799..02ed519 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -8,19 +8,25 @@ %global git_rev 2d4ba970e9bf97ec7d9c2730c940cabc58c54d27 %global git_date 20220831 %global git_short %(echo %{git_rev} | cut -c-8) -%global git_version D%{git_date}git%{git_short} +%global git_version %{git_date}git%{git_short} %endif +%global main_version 0.5.3 + Name: lxdm -Version: 0.5.3 -Release: 27%{?git_version:.%{?git_version}}%{?dist} +Version: %{main_version}%{?git_version:^%{?git_version}} +Release: 1%{?dist} Summary: Lightweight X11 Display Manager -License: GPLv2+ and LGPLv2+ +# src/*.c GPL-3.0-or-later +# src/gdm/ GPL-2.0-or-later AND LGPL-2.1-or-later +# src/greeter.c GPL-2.0-or-later +# SPDX confirmed +License: GPL-3.0-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later URL: http://lxde.org %if 0%{?git_snapshot} -Source0: %{name}-%{version}-%{?git_version}.tar.bz2 +Source0: %{name}-%{main_version}-D%{?git_version}.tar.bz2 %else Source0: http://downloads.sourceforge.net/sourceforge/lxdm/%{name}-%{version}.tar.xz %endif @@ -83,7 +89,7 @@ KDM in LXDE distros. It's still in very early stage of development. %prep -%setup -q %{?git_version:-n %{name}-%{version}-%{?git_version}} +%setup -q %{?git_version:-n %{name}-%{main_version}-D%{?git_version}} %patch50 -p1 -b .config %patch60 -p1 -b .ssh_agent @@ -149,7 +155,7 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %files -f %{name}.lang # FIXME add ChangeLog and NEWS if not empty %doc AUTHORS -%doc COPYING +%license COPYING %doc README TODO %license gpl-2.0.txt %license lgpl-2.1.txt @@ -190,6 +196,10 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Fri Dec 15 2023 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-1 +- LXDM migration +- Change EVR scheme to use hat + * Thu Jul 20 2023 Fedora Release Engineering - 0.5.3-27.D20220831git2d4ba970 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 54202fc580dbe1f168b5439f0ebb379929bbd20d Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 15 Dec 2023 12:14:36 +0900 Subject: [PATCH 20/32] use new patch style --- lxdm.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lxdm.spec b/lxdm.spec index 02ed519..cdde89f 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -91,8 +91,8 @@ KDM in LXDE distros. It's still in very early stage of development. %prep %setup -q %{?git_version:-n %{name}-%{main_version}-D%{?git_version}} -%patch50 -p1 -b .config -%patch60 -p1 -b .ssh_agent +%patch -P50 -p1 -b .config +%patch -P60 -p1 -b .ssh_agent # Reset X after logout (bug 1269917) sed -i.reset data/lxdm.conf.in \ From 63db33d27fdcbd6deb4a7d1f74a10dc95b4536eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 06:35:55 +0000 Subject: [PATCH 21/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index cdde89f..9207bc8 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -15,7 +15,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -196,6 +196,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Dec 15 2023 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-1 - LXDM migration - Change EVR scheme to use hat From d9a5905ae6ee9477ead48fe006ea1005d19aab18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 05:23:20 +0000 Subject: [PATCH 22/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index 9207bc8..eea514a 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -15,7 +15,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -196,6 +196,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3b7ea0ef4785d836cf95225c0470fe8166520155 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 16:24:14 +0000 Subject: [PATCH 23/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index eea514a..100c1e1 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -15,7 +15,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -196,6 +196,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From f560b8895a2afbf0932a0a13a1b604772152746f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 26 Aug 2024 05:59:48 +0900 Subject: [PATCH 24/32] Remove deprecated PATH with usrmove (bug 2276996) --- lxdm-0.5.3-path-usrmove.patch | 11 +++++++++++ lxdm.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 lxdm-0.5.3-path-usrmove.patch diff --git a/lxdm-0.5.3-path-usrmove.patch b/lxdm-0.5.3-path-usrmove.patch new file mode 100644 index 0000000..635aa27 --- /dev/null +++ b/lxdm-0.5.3-path-usrmove.patch @@ -0,0 +1,11 @@ +--- lxdm-0.5.3-D20220831git2d4ba970/src/lxdm.c.usrmove 2022-09-11 14:38:34.000000000 +0900 ++++ lxdm-0.5.3-D20220831git2d4ba970/src/lxdm.c 2024-08-26 05:36:58.788395189 +0900 +@@ -1482,7 +1482,7 @@ void lxdm_do_login(struct passwd *pw, ch + if( G_UNLIKELY(path) && path[0] ) /* if PATH is specified in config file */ + env=g_environ_setenv(env, "PATH", path, TRUE); /* override current $PATH with config value */ + else /* don't use the global env, they are bad for user */ +- env=g_environ_setenv(env, "PATH", "/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/sbin", TRUE); /* set proper default */ ++ env=g_environ_setenv(env, "PATH", "/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin", TRUE); /* set proper default */ + g_free(path); + /* optionally override $LANG, $LC_MESSAGES, and $LANGUAGE */ + if( lang && lang[0] ) diff --git a/lxdm.spec b/lxdm.spec index 100c1e1..2908d35 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -15,7 +15,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 4%{?dist} +Release: 5%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -53,6 +53,8 @@ Source100: create-tarball-from-git.sh # Distro artwork, start on vt1 Patch50: lxdm-0.4.1-config.patch Patch60: lxdm-0.5.1-ssh-agent-on-start.patch +# Remove /bin, /sbin from PATH with usrmove +Patch61: lxdm-0.5.3-path-usrmove.patch BuildRequires: make @@ -93,6 +95,7 @@ KDM in LXDE distros. It's still in very early stage of development. %patch -P50 -p1 -b .config %patch -P60 -p1 -b .ssh_agent +%patch -P61 -p1 -b .usemove # Reset X after logout (bug 1269917) sed -i.reset data/lxdm.conf.in \ @@ -196,6 +199,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Sun Aug 25 2024 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-5 +- Remove deprecated PATH with usrmove (bug 2276996) + * Thu Jul 18 2024 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From e07c5b4e10055ef218fc1a944a3ac7d989f88028 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 16:29:51 +0000 Subject: [PATCH 25/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index 2908d35..6d0fbac 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -15,7 +15,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 5%{?dist} +Release: 6%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -199,6 +199,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sun Aug 25 2024 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-5 - Remove deprecated PATH with usrmove (bug 2276996) From 8032ed7dbc83e43da941548742b657069b9b0aec Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Feb 2025 16:34:14 +0900 Subject: [PATCH 26/32] F42 switches default background from png to jxl --- lxdm.spec | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lxdm.spec b/lxdm.spec index 6d0fbac..7289596 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -15,7 +15,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 6%{?dist} +Release: 7%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -100,12 +100,10 @@ KDM in LXDE distros. It's still in very early stage of development. # Reset X after logout (bug 1269917) sed -i.reset data/lxdm.conf.in \ -e '\@reset@s|^.*$|reset=1|' -# Fedora 37 changed default background file format -# This is reverted, even on F-38 -#%%if 0%{?fedora} >= 37 -%if 0 -sed -i.f37 data/lxdm.conf.in \ - -e '\@bg=@s|default.png|default.webp|' +# Fedora 42 changed default background file format +%if 0%{?fedora} >= 42 +sed -i.f42 data/lxdm.conf.in \ + -e '\@bg=@s|default.png|default.jxl|' %endif install -cpm 644 \ @@ -199,6 +197,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog +* Fri Feb 14 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-7 +- F42 switches default background from png to jxl + * Fri Jan 17 2025 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 66b4f78832d0c0803564385703d6e4f8950c4bdf Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 14 Feb 2025 21:34:10 +0900 Subject: [PATCH 27/32] add jxl pixbuf loader requirement --- lxdm.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lxdm.spec b/lxdm.spec index 7289596..d329f7b 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -15,7 +15,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 7%{?dist} +Release: 8%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -73,8 +73,10 @@ Requires: pam Requires: /sbin/shutdown Requires: desktop-backgrounds-compat Requires: %{_bindir}/ssh-agent -# Loading webp format img requires the below -Requires: webp-pixbuf-loader%{?_isa} +# Loading jpegxl format img requires the below +%if 0%{?fedora} >= 42 +Requires: jxl-pixbuf-loader%{?_isa} +%endif # needed for anaconda to boot into runlevel 5 after install Provides: service(graphical-login) = lxdm @@ -197,8 +199,9 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre %changelog -* Fri Feb 14 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-7 +* Fri Feb 14 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-8 - F42 switches default background from png to jxl +- Require jpegxl gdk-pixbuf loader * Fri Jan 17 2025 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7997b776c5ac94dba6b1984a505034956ad04f99 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 17 Feb 2025 15:05:40 +0900 Subject: [PATCH 28/32] Create lxdm user for greeter process, and make lxdm user own needed directories --- lxdm.spec | 45 ++++++++++++++++++++++++++++++++++----------- pam.lxdm.f38 | 19 ------------------- 2 files changed, 34 insertions(+), 30 deletions(-) delete mode 100644 pam.lxdm.f38 diff --git a/lxdm.spec b/lxdm.spec index d329f7b..79551a2 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -12,10 +12,21 @@ %endif %global main_version 0.5.3 +%global use_lxdm_user 0 +%if 0%{?fedora} >= 42 +%global use_lxdm_user 1 +%endif + +%if %{use_lxdm_user} +%global tempfiles_user lxdm +%else +%global tempfiles_user root +%endif + Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 8%{?dist} +Release: 9%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -41,7 +52,6 @@ Source5: lxdm_conf_login # Fedora pam setting # F-39: remove pam_console.so (bug 1822227, bug 2166692) Source10: pam.lxdm -Source11: pam.lxdm.f38 # Shell script to create tarball from git scm Source100: create-tarball-from-git.sh @@ -109,15 +119,12 @@ sed -i.f42 data/lxdm.conf.in \ %endif install -cpm 644 \ -%if 0%{?fedora} >= 39 %{SOURCE10} \ -%else - %{SOURCE11} \ -%endif pam/lxdm cat << EOF > tempfiles.lxdm.conf -d /run/%{name} 0755 root root +d /run/%{name} 0755 %{tempfiles_user} %{tempfiles_user} +d %{_localstatedir}/lib/%{name} 0755 %{tempfiles_user} %{tempfiles_user} EOF %build @@ -129,6 +136,13 @@ EOF %{nil} make %{?_smp_mflags} +%if %{use_lxdm_user} +cat > %{name}.sysusers.conf < - 0.5.3^20220831git2d4ba970-9 +- Create lxdm user for greeter process, and make lxdm user own needed directories + * Fri Feb 14 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-8 - F42 switches default background from png to jxl - Require jpegxl gdk-pixbuf loader diff --git a/pam.lxdm.f38 b/pam.lxdm.f38 deleted file mode 100644 index 7bbc7fe..0000000 --- a/pam.lxdm.f38 +++ /dev/null @@ -1,19 +0,0 @@ -#%PAM-1.0 -auth [success=done ignore=ignore default=bad] pam_selinux_permit.so -auth required pam_succeed_if.so user != root quiet -auth required pam_env.so -auth substack system-auth -auth optional pam_gnome_keyring.so -auth include postlogin -account required pam_nologin.so -account include system-auth -password include system-auth -session required pam_selinux.so close -session required pam_loginuid.so -session optional pam_console.so -session required pam_selinux.so open -session optional pam_keyinit.so force revoke -session required pam_namespace.so -session optional pam_gnome_keyring.so auto_start -session include system-auth -session include postlogin From c83db136a6cd5146115c17816ef1359caa4877ac Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 7 Mar 2025 23:43:41 +0900 Subject: [PATCH 29/32] F42+: Add old style pre scriptlet for LXDM user creation so as to make it work when upgrading from F41 --- lxdm.spec | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/lxdm.spec b/lxdm.spec index 79551a2..0041069 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -26,7 +26,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 9%{?dist} +Release: 10%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -95,6 +95,12 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd +%if %{use_lxdm_user} +%if 0%{?fedora} <= 43 +Requires(pre): shadow-utils +%endif +%endif + %description LXDM is the future display manager of LXDE, the Lightweight X11 Desktop @@ -161,6 +167,22 @@ install -m644 -p -D %{SOURCE2} %{buildroot}%{_unitdir}-preset/83-fedora-lxdm.pre install -Dpm 644 %{name}.sysusers.conf %{buildroot}%{_sysusersdir}/%{name}.conf %endif +%pre +%if %{use_lxdm_user} +%if 0%{?fedora} <= 43 +getent group %{tempfiles_user} &>/dev/null || \ + %{_sbindir}/groupadd -r %{tempfiles_user} +getent passwd %{tempfiles_user} &> /dev/null || \ + %{_sbindir}/useradd \ + -c 'LXDM daemon' \ + -g %{tempfiles_user} \ + -d %{_localstatedir}/lib/%{name} \ + -r \ + -s /sbin/nologin \ + %{tempfiles_user} 2>/dev/null +%endif +%endif +exit 0 %post %systemd_post %{name}.service @@ -219,8 +241,12 @@ install -Dpm 644 %{name}.sysusers.conf %{buildroot}%{_sysusersdir}/%{name}.conf %changelog +* Fri Mar 07 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-10 +- F42+: Add old style pre scriptlet for LXDM user creation so as to make it work + when upgrading from F41 + * Mon Feb 17 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-9 -- Create lxdm user for greeter process, and make lxdm user own needed directories +- F42+: Create lxdm user for greeter process, and make lxdm user own needed directories * Fri Feb 14 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-8 - F42 switches default background from png to jxl From bc566b99cee267a0c6c644240fa54254d2073d7f Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Mon, 26 May 2025 16:38:21 +0900 Subject: [PATCH 30/32] Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) --- lxdm.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index 0041069..e7ad6de 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -26,7 +26,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 10%{?dist} +Release: 11%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -134,6 +134,8 @@ d %{_localstatedir}/lib/%{name} 0755 %{tempfiles_user} %{tempfiles_user} EOF %build +# Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) +export ACLOCAL_PATH=%{_datadir}/gettext/m4/ %{?git_version:sh autogen.sh} %configure \ --enable-gtk3 \ @@ -241,6 +243,9 @@ exit 0 %changelog +* Mon May 26 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-11 +- Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) + * Fri Mar 07 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-10 - F42+: Add old style pre scriptlet for LXDM user creation so as to make it work when upgrading from F41 From 7a832756b7023e4388d7769977d30e47613ed698 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:05:31 +0000 Subject: [PATCH 31/32] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- lxdm.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index e7ad6de..cd45065 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -26,7 +26,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 11%{?dist} +Release: 12%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -243,6 +243,9 @@ exit 0 %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Mon May 26 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-11 - Add ACLOCAL_PATH for gettext 0.25 (ref: bug 2366708) From c73203d3fecfb7f0ee1b13a4dfd4a0f0948d9f6a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Fri, 12 Sep 2025 15:48:58 +0900 Subject: [PATCH 32/32] F-43+: update loader dependency for gdk-pixbuf2 changes --- lxdm.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lxdm.spec b/lxdm.spec index cd45065..ea4d43c 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -26,7 +26,7 @@ Name: lxdm Version: %{main_version}%{?git_version:^%{?git_version}} -Release: 12%{?dist} +Release: 13%{?dist} Summary: Lightweight X11 Display Manager # src/*.c GPL-3.0-or-later @@ -85,8 +85,12 @@ Requires: desktop-backgrounds-compat Requires: %{_bindir}/ssh-agent # Loading jpegxl format img requires the below %if 0%{?fedora} >= 42 +%if 0%{?fedora} >= 43 +Requires: gdk-pixbuf2%{?_isa} >= 2.44 +%else Requires: jxl-pixbuf-loader%{?_isa} %endif +%endif # needed for anaconda to boot into runlevel 5 after install Provides: service(graphical-login) = lxdm @@ -243,6 +247,9 @@ exit 0 %changelog +* Fri Sep 12 2025 Mamoru TASAKA - 0.5.3^20220831git2d4ba970-13 +- F-43+: update loader dependency for gdk-pixbuf2 changes + * Thu Jul 24 2025 Fedora Release Engineering - 0.5.3^20220831git2d4ba970-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild