From d3b1011a6cfc45f27b601c0b4f9d22769c7af55a Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 06:34:13 +0100 Subject: [PATCH] update to 0.5.0 [release 0.5.0-1mamba;Sun Jul 13 2014] --- lxdm-0.4.1-Xorg-no-background.patch | 12 ----------- lxdm-0.4.1-active_vt_1.patch | 11 ---------- lxdm-0.4.1-pam_console_remove.patch | 9 --------- lxdm-0.5.0-conf.patch | 13 ++++++++++++ lxdm-0.5.0-pam_console_remove.patch | 10 ++++++++++ lxdm.spec | 31 +++++++++++++++-------------- 6 files changed, 39 insertions(+), 47 deletions(-) delete mode 100644 lxdm-0.4.1-Xorg-no-background.patch delete mode 100644 lxdm-0.4.1-active_vt_1.patch delete mode 100644 lxdm-0.4.1-pam_console_remove.patch create mode 100644 lxdm-0.5.0-conf.patch create mode 100644 lxdm-0.5.0-pam_console_remove.patch diff --git a/lxdm-0.4.1-Xorg-no-background.patch b/lxdm-0.4.1-Xorg-no-background.patch deleted file mode 100644 index ba25445..0000000 --- a/lxdm-0.4.1-Xorg-no-background.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru lxdm-0.4.1.orig/data/lxdm.conf.in lxdm-0.4.1/data/lxdm.conf.in ---- lxdm-0.4.1.orig/data/lxdm.conf.in 2013-07-15 13:19:08.816228232 +0200 -+++ lxdm-0.4.1/data/lxdm.conf.in 2013-07-15 13:19:51.428794540 +0200 -@@ -21,7 +21,7 @@ - [server] - active_vt=1 - ## arg used to start xserver, not fully function --# arg=/usr/bin/X -background vt1 -+arg=/usr/bin/Xorg -background none -nolisten tcp - - [display] - ## gtk theme used by greeter diff --git a/lxdm-0.4.1-active_vt_1.patch b/lxdm-0.4.1-active_vt_1.patch deleted file mode 100644 index df9c5cd..0000000 --- a/lxdm-0.4.1-active_vt_1.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nru lxdm-0.4.1.orig/data/lxdm.conf.in lxdm-0.4.1/data/lxdm.conf.in ---- lxdm-0.4.1.orig/data/lxdm.conf.in 2011-07-29 15:42:33.000000000 +0200 -+++ lxdm-0.4.1/data/lxdm.conf.in 2013-05-25 22:06:56.406509276 +0200 -@@ -19,6 +19,7 @@ - greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk - - [server] -+active_vt=1 - ## arg used to start xserver, not fully function - # arg=/usr/bin/X -background vt1 - diff --git a/lxdm-0.4.1-pam_console_remove.patch b/lxdm-0.4.1-pam_console_remove.patch deleted file mode 100644 index 0321162..0000000 --- a/lxdm-0.4.1-pam_console_remove.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -Nru lxdm-0.4.1.orig/pam/lxdm lxdm-0.4.1/pam/lxdm ---- lxdm-0.4.1.orig/pam/lxdm 2011-07-29 15:42:33.000000000 +0200 -+++ lxdm-0.4.1/pam/lxdm 2013-04-26 16:29:31.953845992 +0200 -@@ -5,5 +5,4 @@ - session optional pam_keyinit.so force revoke - session include system-auth - session required pam_loginuid.so --session optional pam_console.so - session optional pam_gnome_keyring.so auto_start diff --git a/lxdm-0.5.0-conf.patch b/lxdm-0.5.0-conf.patch new file mode 100644 index 0000000..b7c16ed --- /dev/null +++ b/lxdm-0.5.0-conf.patch @@ -0,0 +1,13 @@ +--- lxdm-0.5.0.orig/data/lxdm.conf.in 2012-02-27 12:28:25.000000000 +0100 ++++ lxdm-0.5.0/data/lxdm.conf.in 2014-07-13 13:33:35.923741574 +0200 +@@ -22,8 +22,9 @@ + greeter=@FULL_LIBEXECDIR@/lxdm-greeter-gtk + + [server] ++active_vt=1 + ## arg used to start xserver, not fully function +-# arg=/usr/bin/X -background vt1 ++arg=/usr/bin/Xorg -background none + # uncomment this if you really want xserver listen to tcp + # tcp_listen=1 + # uncoment this if you want reset the xserver after logou diff --git a/lxdm-0.5.0-pam_console_remove.patch b/lxdm-0.5.0-pam_console_remove.patch new file mode 100644 index 0000000..1fcd5c9 --- /dev/null +++ b/lxdm-0.5.0-pam_console_remove.patch @@ -0,0 +1,10 @@ +diff -Nru lxdm-0.5.0.orig/pam/lxdm lxdm-0.5.0/pam/lxdm +--- lxdm-0.5.0.orig/pam/lxdm 2013-09-08 06:52:35.000000000 +0200 ++++ lxdm-0.5.0/pam/lxdm 2014-07-13 13:30:47.786743289 +0200 +@@ -4,6 +4,5 @@ + account include system-auth + session optional pam_keyinit.so force revoke + session include system-auth +-session optional pam_console.so + session optional pam_gnome_keyring.so auto_start + session optional pam_selinux.so diff --git a/lxdm.spec b/lxdm.spec index 27b0a93..933f932 100644 --- a/lxdm.spec +++ b/lxdm.spec @@ -1,38 +1,35 @@ Name: lxdm -Version: 0.4.1 -Release: 10mamba +Version: 0.5.0 +Release: 1mamba Summary: Login manager for the Lightweight X11 Desktop Environment Group: Graphical Desktop/Applications/Environment Vendor: openmamba Distribution: openmamba Packager: Fabio Giani URL: http://www.lxde.org/ -Source: http://downloads.sourceforge.net/project/lxde/lxdm/LXDM%20%{version}/lxdm-%{version}.tar.gz +Source: https://downloads.sourceforge.net/project/lxdm/lxdm%20%{version}/lxdm-%{version}.tar.xz Patch0: %{name}-0.3.0-Xsession-default-profile.patch Patch1: %{name}-0.4.1-glib-2.32.patch -Patch2: lxdm-0.4.1-pam_console_remove.patch -Patch3: lxdm-0.4.1-active_vt_1.patch -Patch4: lxdm-0.4.1-Xorg-no-background.patch +Patch2: lxdm-0.5.0-pam_console_remove.patch +Patch3: lxdm-0.5.0-conf.patch Patch5: lxdm-0.4.1-disable-consolekit.patch Patch6: lxdm-0.4.1-automake-1.14.patch License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root ## AUTOBUILDREQ-BEGIN -BuildRequires: ConsoleKit-devel BuildRequires: glibc-devel +BuildRequires: libX11-devel BuildRequires: libatk-devel BuildRequires: libcairo-devel -BuildRequires: libdbus-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel BuildRequires: libgdk-pixbuf-devel BuildRequires: libglib-devel BuildRequires: libgtk2-devel +BuildRequires: libpam-devel BuildRequires: libpango-devel -BuildRequires: libX11-devel BuildRequires: libxcb-devel -BuildRequires: pam-devel ## AUTOBUILDREQ-END +BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Login manager for the Lightweight X11 Desktop Environment. @@ -42,12 +39,12 @@ Login manager for the Lightweight X11 Desktop Environment. %prep %setup -q %patch0 -p1 -%patch1 -p1 +#%patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 -%patch6 -p1 +#%patch5 -p1 +#%patch6 -p1 # Remove pregenerated lxdm.conf to recreate with passed directories # Fixes configuring for using /usr/local/libexec rm -f data/lxdm.conf @@ -107,7 +104,7 @@ exit 0 %posttrans # runtime fix a configuration issue when upgrading from previous buggy releases if [ $1 -ge 1 ]; then -sed -i "s|/usr/local/libexec/lxdm-greeter-gtk|%{_libexecdir}/lxdm-greeter-gtk|" %{_sysconfdir}/lxdm/lxdm.conf + sed -i "s|/usr/local/libexec/lxdm-greeter-gtk|%{_libexecdir}/lxdm-greeter-gtk|" %{_sysconfdir}/lxdm/lxdm.conf fi : @@ -123,6 +120,7 @@ fi %{_libexecdir}/lxdm-greeter-gdk %{_libexecdir}/lxdm-greeter-gtk %{_libexecdir}/lxdm-numlock +%{_libexecdir}/lxdm-session /lib/systemd/system/lxdm.service %dir %{_datadir}/lxdm %{_datadir}/lxdm/config.ui @@ -134,6 +132,9 @@ fi #README TODO %changelog +* Sun Jul 13 2014 Silvan Calarco 0.5.0-1mamba +- update to 0.5.0 + * Mon Jun 30 2014 Silvan Calarco 0.4.1-10mamba - rebuilt without ConsoleKit (added patch)