diff --git a/.gitignore b/.gitignore index c09d867..93ff619 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /lightdm-1.24.0.tar.xz /lightdm-1.25.0.tar.gz /lightdm-1.25.1.tar.gz +/lightdm-1.25.2.tar.gz diff --git a/lightdm-1.25.1-fix_Autotools.patch b/lightdm-1.25.1-fix_Autotools.patch deleted file mode 100644 index 6123114..0000000 --- a/lightdm-1.25.1-fix_Autotools.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 63f6f9826f0ef6c32568725afa41b142dfd45ccb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 18 Jan 2018 16:44:53 +0100 -Subject: [PATCH 1/3] configure: Fix arguments passed to qtchooser - ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 711db441..f836a842 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -107,7 +107,7 @@ if test x"$enable_liblightdm_qt4" != "xno" ; then - fi - if test x"$MOC4" = xmoc; then - if test x"$(readlink $(which $MOC4))" = xqtchooser; then -- MOC4="$MOC4 --qt=qt4" -+ MOC4="$MOC4 --qt=4" - fi - fi - fi -@@ -141,7 +141,7 @@ if test x"$enable_liblightdm_qt5" != "xno"; then - fi - if test x"$MOC5" = xmoc; then - if test x"$(readlink $(which $MOC5))" = xqtchooser; then -- MOC5="$MOC5 --qt=qt5" -+ MOC5="$MOC5 --qt=5" - fi - fi - fi - -From 216c5c7bdc3f7fc321da3e576814768df5e25ad0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 18 Jan 2018 16:46:19 +0100 -Subject: [PATCH 2/3] Makefile: Add ACLOCAL_AMFLAGS properly - ---- - Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.am b/Makefile.am -index 9706d600..fd252aa8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,3 +1,4 @@ -+ACLOCAL_AMFLAGS = -I m4 - SUBDIRS = common liblightdm-gobject liblightdm-qt - if COMPILE_TESTS - SUBDIRS += tests - -From 301023e08790cc0ace49ef15159e3dd4746b9238 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 18 Jan 2018 18:11:16 +0100 -Subject: [PATCH 3/3] configure: Activate needed C99 mode of compiler - ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index f836a842..29d84327 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -6,6 +6,7 @@ AC_CONFIG_HEADER(config.h) - AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) - AM_SILENT_RULES(yes) - LT_INIT -+AC_PROG_CC_STDC - AM_PROG_CC_C_O - AC_PROG_CXX - AC_PROG_LIBTOOL diff --git a/lightdm-1.25.1-remove_incorrect_use_of_const.patch b/lightdm-1.25.1-remove_incorrect_use_of_const.patch deleted file mode 100644 index dc9388d..0000000 --- a/lightdm-1.25.1-remove_incorrect_use_of_const.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 30b3c147c041fef799b1323efb038515db1417ec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= -Date: Thu, 18 Jan 2018 18:20:41 +0100 -Subject: [PATCH] x-authority: Remove incorrect use of const - ---- - 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 705bb511..a9a4089f 100644 ---- a/src/x-authority.c -+++ b/src/x-authority.c -@@ -104,7 +104,7 @@ x_authority_get_address (XAuthority *auth) - return auth->priv->address; - } - --const gsize -+gsize - x_authority_get_address_length (XAuthority *auth) - { - g_return_val_if_fail (auth != NULL, 0); diff --git a/lightdm.spec b/lightdm.spec index e2362ad..e1d060b 100644 --- a/lightdm.spec +++ b/lightdm.spec @@ -6,8 +6,8 @@ Name: lightdm Summary: A cross-desktop Display Manager -Version: 1.25.1 -Release: 6%{?dist} +Version: 1.25.2 +Release: 1%{?dist} # library/bindings are LGPLv2 or LGPLv3, the rest GPLv3+ License: (LGPLv2 or LGPLv3) and GPLv3+ @@ -31,9 +31,7 @@ Source25: 50-disable-guest.conf # Upstreamed: Patch0: %{giturl}/pull/3.patch#/%{name}-1.25.1-fix_transition_plymouth.patch -Patch1: %{giturl}/pull/4.patch#/%{name}-1.25.1-fix_Autotools.patch -Patch2: %{giturl}/pull/5.patch#/%{name}-1.25.1-disable_dmrc.patch -Patch3: %{giturl}/pull/6.patch#/%{name}-1.25.1-remove_incorrect_use_of_const.patch +Patch1: %{giturl}/pull/5.patch#/%{name}-1.25.1-disable_dmrc.patch BuildRequires: gettext BuildRequires: gnome-common @@ -207,15 +205,6 @@ NOCONFIGURE=1 ./autogen.sh %{__install} -pm 0644 %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23} \ %{SOURCE24} %{SOURCE25} %{buildroot}%{_datadir}/%{name}/%{name}.conf.d/ -# Move DBus interfaces to proper location and create symlinks. -# See: https://cgit.freedesktop.org/accountsservice/tree/doc/org.mydm.MyDisplayManager.Wallpaper.xml -for f in %{buildroot}%{_datadir}/accountsservice/interfaces/*.xml; do - %{__mv} -f $f %{buildroot}%{_datadir}/dbus-1/interfaces - f="`%{_bindir}/basename $f`" - %{__ln_s} ../../dbus-1/interfaces/$f \ - %{buildroot}%{_datadir}/accountsservice/interfaces/$f -done - # Move DBus config to proper location. %{__mv} -f %{buildroot}%{_sysconfdir}/dbus-1/system.d/*.conf \ %{buildroot}%{_datadir}/dbus-1/system.d @@ -242,15 +231,6 @@ fi %{?systemd_post:%systemd_post %{name}.service} -%post gobject -p /sbin/ldconfig - - -%post qt -p /sbin/ldconfig - - -%post qt5 -p /sbin/ldconfig - - %preun %{?systemd_preun:%systemd_preun %{name}.service} @@ -259,13 +239,9 @@ fi %{?systemd_postun} -%postun gobject -p /sbin/ldconfig - - -%postun qt -p /sbin/ldconfig - - -%postun qt5 -p /sbin/ldconfig +%ldconfig_scriptlets gobject +%ldconfig_scriptlets qt +%ldconfig_scriptlets qt5 %files -f %{name}.lang @@ -342,6 +318,11 @@ fi %changelog +* Fri Feb 23 2018 Leigh Scott - 1.25.2-1 +- lightdm-1.25.2 +- Fix scriptlets +- Drop upstream patches + * Wed Feb 07 2018 Fedora Release Engineering - 1.25.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 86d078f..a9790ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (lightdm-1.25.1.tar.gz) = 34dfa27e1e88756bdac617b5990005d2c6ee209e8c5d72de4378d94b3f00475a7afee678f0758e463fa4e5bc59d1c516b2889b08d4b09567e2452b81dffed1fc +SHA512 (lightdm-1.25.2.tar.gz) = 88941cddc362c95a25ad4a7d5b2ab8b4a379354dedd682d5387671a839f5cfec77bc0f5a8038bda1c8aea281f3239adb8d8c7044a7e279c9ac0755cc1275e570