The package rpms/lightdm.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/lightdm.git/commit/?id=d01ab0adc5....
Change:
-ExclusiveArch: x86_64 ppc64le
Thanks.
Full change:
============
commit 30e939ae7585557ad7baf5c8f1b8d39e3ca98e43
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Jul 18 11:26:38 2022 +0100
lightdm-1.32.0
diff --git a/.gitignore b/.gitignore
index 85f8833..1636e80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
/lightdm-1.26.0.tar.gz
/lightdm-1.28.0.tar.gz
/lightdm-1.30.0.tar.gz
+/lightdm-1.32.0.tar.gz
diff --git a/lightdm-1.25.1-fix_transition_plymouth.patch
b/lightdm-1.25.1-fix_transition_plymouth.patch
deleted file mode 100644
index 0e9a7d7..0000000
--- a/lightdm-1.25.1-fix_transition_plymouth.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From f2069f4f9cd2e4e8ebf91eed65ea12c2e4055acd Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82(a)fedoraproject.org>
-Date: Thu, 18 Jan 2018 16:40:30 +0100
-Subject: [PATCH 1/2] x-server-local: Set background to none if not set
-
----
- src/x-server-local.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/x-server-local.c b/src/x-server-local.c
-index 80e0ab0d..bb09a329 100644
---- a/src/x-server-local.c
-+++ b/src/x-server-local.c
-@@ -481,8 +481,10 @@ x_server_local_start (DisplayServer *display_server)
- if (server->priv->vt >= 0)
- g_string_append_printf (command, " vt%d -novtswitch",
server->priv->vt);
-
-- if (server->priv->background)
-- g_string_append_printf (command, " -background %s",
server->priv->background);
-+ if (!server->priv->background)
-+ x_server_local_set_background (server, "none");
-+
-+ g_string_append_printf (command, " -background %s",
server->priv->background);
-
- /* Allow sub-classes to add arguments */
- if (X_SERVER_LOCAL_GET_CLASS (server)->add_args)
-
-From 49ddf36823438bac09f55fec3cdc4fc7288a0d96 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82(a)fedoraproject.org>
-Date: Thu, 18 Jan 2018 16:42:37 +0100
-Subject: [PATCH 2/2] seat-local: Return active VT if Plymouth gets deactivated
-
----
- src/seat-local.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/seat-local.c b/src/seat-local.c
-index 9d83ca97..a5d313eb 100644
---- a/src/seat-local.c
-+++ b/src/seat-local.c
-@@ -158,6 +158,8 @@ get_vt (SeatLocal *seat, DisplayServer *display_server)
- g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_READY, G_CALLBACK
(display_server_ready_cb), seat);
- g_signal_connect (display_server, DISPLAY_SERVER_SIGNAL_STOPPED, G_CALLBACK
(display_server_transition_plymouth_cb), seat);
- plymouth_deactivate ();
-+
-+ return vt;
- }
- else
- l_debug (seat, "Plymouth is running on VT %d, but this is less than the
configured minimum of %d so not replacing it", active_vt, vt_get_min ());
diff --git a/lightdm-1.30-fix_xauthority_corruption.patch
b/lightdm-1.30-fix_xauthority_corruption.patch
deleted file mode 100644
index f5ecc78..0000000
--- a/lightdm-1.30-fix_xauthority_corruption.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 42dc9dc5865d26ba37ca3c07d3a97d4de03b7909 Mon Sep 17 00:00:00 2001
-From: sinirajapan <87935975+sinirajapan(a)users.noreply.github.com>
-Date: Thu, 29 Jul 2021 21:58:41 +0900
-Subject: [PATCH] Update x-authority.c
-
-No O_TRUNC causes the xauthority file corruption.
-In case the address of XDMCP DISPLAY length differs.
----
- src/x-authority.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/x-authority.c b/src/x-authority.c
-index baaf4bea4..a04f76a6d 100644
---- a/src/x-authority.c
-+++ b/src/x-authority.c
-@@ -320,7 +320,7 @@ x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar
*filename,
-
- /* Write records back */
- errno = 0;
-- int output_fd = g_open (filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
-+ int output_fd = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC , S_IRUSR |
S_IWUSR);
- if (output_fd < 0)
- {
- g_set_error (error,
diff --git a/lightdm.spec b/lightdm.spec
index 6434278..e8f59be 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -1,17 +1,13 @@
# FIXME: most tests currently fail
%bcond_with tests
-%if (0%{?fedora} && 0%{?fedora} < 34) || (0%{?rhel} && 0%{?rhel} <
8)
-%global _with_qt4 1
-%endif
-
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo
"2.44")
%global giturl
https://github.com/CanonicalLtd/lightdm
Name: lightdm
Summary: A cross-desktop Display Manager
-Version: 1.30.0
-Release: 18%{?dist}
+Version: 1.32.0
+Release: 1%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -41,8 +37,6 @@ Patch0: gcc-10.patch
Patch1: %{giturl}/pull/5.patch#/lightdm-1.25.1-disable_dmrc.patch
# Upstream commits
-# rhbz#2093668
-Patch2:
%{giturl}/commit/42dc9dc5865d26ba37ca3c07d3a97d4de03b7909.patch#/lightdm-1.30-fix_xauthority_corruption.patch
BuildRequires: gettext
BuildRequires: gnome-common
@@ -74,16 +68,12 @@ Requires: polkit-js-engine
%endif
Requires: systemd
Requires: xorg-x11-xinit
-
Requires: (lightdm-greeter = 1.2 if xorg-x11-server-Xorg)
-
-%if ! 0%{?_with_qt4}
-Obsoletes: lightdm-qt < 1.30.0-13
-Obsoletes: lightdm-qt-devel < 1.30.0-13
-%endif
-
%{?systemd_requires}
+Obsoletes: lightdm-qt < %{version}-%{release}
+Obsoletes: lightdm-qt-devel < %{version}-%{release}
+
Requires(pre): shadow-utils
Requires(post): psmisc dbus-daemon
@@ -112,26 +102,12 @@ Requires: %{name}-gobject%{?_isa} = %{version}-%{release}
%description gobject-devel
%{summary}.
-%if 0%{?_with_qt4}
-%package qt
-Summary: LightDM Qt4 client library
-BuildRequires: pkgconfig(QtCore) pkgconfig(QtDBus) pkgconfig(QtGui)
pkgconfig(QtNetwork)
-BuildRequires: make
-Requires: %{name}%{?_isa} = %{version}-%{release}
-%description qt
-This package contains a Qt4-based library for LightDM clients to use to interface
-with LightDM.
-
-%package qt-devel
-Summary: Development files for %{name}-qt
-Requires: %{name}-qt%{?_isa} = %{version}-%{release}
-%description qt-devel
-%{summary}.
-%endif
%package qt5
Summary: LightDM Qt5 client library
Requires: %{name}%{?_isa} = %{version}-%{release}
+
+
%description qt5
This package contains a Qt5-based library for LightDM clients to use to interface
with LightDM.
@@ -154,22 +130,21 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
# Bootstrap
NOCONFIGURE=1 ./autogen.sh
-%configure \
- --disable-dmrc \
- --disable-silent-rules \
+%configure \
+ --disable-dmrc \
+ --disable-silent-rules \
--disable-static \
--enable-gtk-doc \
--enable-libaudit \
- %{?_with_qt4:--enable-liblightdm-qt} \
- --enable-liblightdm-qt5 \
- --enable-introspection \
+ --enable-liblightdm-qt5 \
+ --enable-introspection \
%if %{with tests}
--enable-tests \
%else
--disable-tests \
%endif
--enable-vala \
- --with-greeter-user=lightdm \
+ --with-greeter-user=lightdm \
--with-greeter-session=lightdm-greeter
%make_build
@@ -210,10 +185,6 @@ rm -fv %{buildroot}%{_libdir}/lib*.la
%{__install} -pm 0644 %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} \
%{SOURCE24} %{SOURCE25} %{SOURCE26} %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/
-# Move DBus config to proper location.
-# why is this needed? -- rex
-%{__mv} -f %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf \
- %{buildroot}%{_datadir}/dbus-1/system.d
%find_lang lightdm --with-gnome
@@ -293,19 +264,6 @@ fi
%{_datadir}/gir-1.0/LightDM-1.gir
%{_datadir}/vala/vapi/liblightdm-gobject-1.*
-%if 0%{?_with_qt4}
-%ldconfig_scriptlets qt
-
-%files qt
-%license COPYING.LGPL2 COPYING.LGPL3
-%{_libdir}/liblightdm-qt-3.so.0*
-
-%files qt-devel
-%{_includedir}/lightdm-qt-3/
-%{_libdir}/liblightdm-qt-3.so
-%{_libdir}/pkgconfig/liblightdm-qt-3.pc
-%endif
-
%ldconfig_scriptlets qt5
%files qt5
@@ -319,6 +277,9 @@ fi
%changelog
+* Mon Jul 18 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.32.0-1
+- lightdm-1.32.0
+
* Fri Jun 10 2022 Dan Horák <dan[at]danny.cz> - 1.30.0-18
- Enable all arches in EPEL
diff --git a/sources b/sources
index 615faba..668c6aa 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (lightdm-1.30.0.tar.gz) =
237ad6067fcb7035d8d607a4708cf09c7e1f7852db60f294b70b7cf7d1d9e9762f0b67743a1799021c45b719c666902e74269dfcb15ec7819146fde6ae499b25
+SHA512 (lightdm-1.32.0.tar.gz) =
ef315183e5574aefdb6f08d9a45ea728ec51f8f12aa2dac5d34087e9b3d9eb3b01dcf5509c5d1c9dd6a837da87b69f2f379d1990197cf544368cd3be648d024a
commit d01ab0adc53ff34f5654e15399ed3b384644721e
Author: Dan Horák <dan(a)danny.cz>
Date: Fri Jun 10 09:13:18 2022 +0200
- Enable all arches in EPEL
diff --git a/lightdm.spec b/lightdm.spec
index 9b82b04..6434278 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -11,15 +11,7 @@
Name: lightdm
Summary: A cross-desktop Display Manager
Version: 1.30.0
-Release: 17%{?dist}
-
-%if 0%{?rhel} >= 8
-# Exclude failing arch
-#DEBUG util.py:593: No matching package to install: 'gnome-common'
-#DEBUG util.py:593: No matching package to install: 'itstool'
-#DEBUG util.py:593: Not all dependencies satisfied
-ExclusiveArch: x86_64 ppc64le
-%endif
+Release: 18%{?dist}
# library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+
License: (LGPLv2 or LGPLv3) and GPLv3+
@@ -327,6 +319,9 @@ fi
%changelog
+* Fri Jun 10 2022 Dan Horák <dan[at]danny.cz> - 1.30.0-18
+- Enable all arches in EPEL
+
* Sun Jun 05 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.30.0-17
- Fix xauthority corruption (rhbz#2093668)
- Add missing requires for post scriptlet (rhbz#2093698)
commit 241d9709cb02277cab7a02219770489ff31691a1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 5 13:24:39 2022 +0100
Fix xauthority corruption (rhbz#2093668)
diff --git a/lightdm-1.30-fix_xauthority_corruption.patch
b/lightdm-1.30-fix_xauthority_corruption.patch
new file mode 100644
index 0000000..f5ecc78
--- /dev/null
+++ b/lightdm-1.30-fix_xauthority_corruption.patch
@@ -0,0 +1,24 @@
+From 42dc9dc5865d26ba37ca3c07d3a97d4de03b7909 Mon Sep 17 00:00:00 2001
+From: sinirajapan <87935975+sinirajapan(a)users.noreply.github.com>
+Date: Thu, 29 Jul 2021 21:58:41 +0900
+Subject: [PATCH] Update x-authority.c
+
+No O_TRUNC causes the xauthority file corruption.
+In case the address of XDMCP DISPLAY length differs.
+---
+ src/x-authority.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/x-authority.c b/src/x-authority.c
+index baaf4bea4..a04f76a6d 100644
+--- a/src/x-authority.c
++++ b/src/x-authority.c
+@@ -320,7 +320,7 @@ x_authority_write (XAuthority *auth, XAuthWriteMode mode, const gchar
*filename,
+
+ /* Write records back */
+ errno = 0;
+- int output_fd = g_open (filename, O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR);
++ int output_fd = g_open (filename, O_WRONLY | O_CREAT | O_TRUNC , S_IRUSR |
S_IWUSR);
+ if (output_fd < 0)
+ {
+ g_set_error (error,
diff --git a/lightdm.spec b/lightdm.spec
index 152f26c..9b82b04 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -11,7 +11,7 @@
Name: lightdm
Summary: A cross-desktop Display Manager
Version: 1.30.0
-Release: 16%{?dist}
+Release: 17%{?dist}
%if 0%{?rhel} >= 8
# Exclude failing arch
@@ -49,6 +49,8 @@ Patch0: gcc-10.patch
Patch1: %{giturl}/pull/5.patch#/lightdm-1.25.1-disable_dmrc.patch
# Upstream commits
+# rhbz#2093668
+Patch2:
%{giturl}/commit/42dc9dc5865d26ba37ca3c07d3a97d4de03b7909.patch#/lightdm-1.30-fix_xauthority_corruption.patch
BuildRequires: gettext
BuildRequires: gnome-common
@@ -325,6 +327,10 @@ fi
%changelog
+* Sun Jun 05 2022 Leigh Scott <leigh123linux(a)gmail.com> - 1.30.0-17
+- Fix xauthority corruption (rhbz#2093668)
+- Add missing requires for post scriptlet (rhbz#2093698)
+
* Thu Jan 20 2022 Fedora Release Engineering <releng(a)fedoraproject.org> -
1.30.0-16
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
commit 0cc9d6d57f49847217f7f777644a8ac5e2b4c45b
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jun 5 13:14:24 2022 +0100
Add missing requires for post scriptlet (rhbz#2093698)
diff --git a/lightdm.spec b/lightdm.spec
index 057e05b..152f26c 100644
--- a/lightdm.spec
+++ b/lightdm.spec
@@ -91,7 +91,7 @@ Obsoletes: lightdm-qt-devel < 1.30.0-13
%{?systemd_requires}
Requires(pre): shadow-utils
-Requires(post): psmisc
+Requires(post): psmisc dbus-daemon
# needed for anaconda to boot into runlevel 5 after install
Provides: service(graphical-login) = lightdm