updated 2 packages

lightdm-gtk-2.0.7-1

lightdm-1.30.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12463 ec354946-7b23-47d6-9f5a-488ba84defc7

l/lightdm-gtk/lightdm-gtk-vl.spec

@@ -1,16 +1,20 @@
 Summary: Reference GTK+ greeter for LightDM
 Name: lightdm-gtk
-Version: 2.0.1
+Version: 2.0.7
 Release: 1%{?_dist_release}
+Group: system
+Vendor: Project Vine
+Distribution: Vine Linux
+
 License: GPL3
-Group: User Interface/X
 URL: https://launchpad.net/lightdm-gtk-greeter/
-
 Source: https://launchpad.net/%{name}-greeter/2.0/%{version}/+download/%{name}-greeter-%{version}.tar.gz
+Patch0:         fix_arm_compile.patch
+Patch1:         lightdm-gtk_add-language-button-to-layout.patch
 
 # for Vine Linux
 Patch1000: lightdm-gtk-greeter-2.0.1-vine.patch
-Patch1001: lightdm-gtk-greeter-2.0.1-ja.po.patch
+Patch1001: lightdm-gtk-greeter-2.0.7-ja.po.patch
 
 Requires: lightdm
 Requires: gnome-icon-theme
@@ -18,27 +22,30 @@ Requires: gnome-icon-theme
 BuildRequires: gtk3-devel
 BuildRequires: lightdm-gobject-devel
 BuildRequires: libX11-devel
+BuildRequires: gobject-introspection-devel
+BuildRequires: libexo-devel
 
 Provides: lightdm-greeter
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: Takemikaduchi
-
-
 %description
 %{summary}
 
 
 %prep
 %setup -q -n %{name}-greeter-%{version}
-%patch1000 -p1 -b .vine
-%patch1001 -p1 -b .vine
+%autopatch -p1
+
 
 %build
-%configure 
+%configure \
+  --disable-silent-rules \
+  --disable-static \
+  --disable-libindicator \
+  --enable-kill-on-sigterm
 
 make %{?_smp_mflags}
+make -C po update-po
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -51,26 +58,32 @@ popd
 find $RPM_BUILD_ROOT -name '*.a' -delete
 find $RPM_BUILD_ROOT -name '*.la' -delete
 
+## unpackaged files
+rm -fv %{buildroot}%{_docdir}/lightdm-gtk-greeter/sample-lightdm-gtk-greeter.css
+
 %find_lang %{name}-greeter
 
 
 %post -p /sbin/ldconfig
-
 %postun -p /sbin/ldconfig
 
 
 %files -f %{name}-greeter.lang
 %defattr(-, root, root, -)
-%doc AUTHORS COPYING ChangeLog NEWS README
+%license COPYING
+%doc ChangeLog NEWS README
+%doc data/sample-lightdm-gtk-greeter.css
 %{_sysconfdir}/lightdm/lightdm-gtk-greeter.conf
 %{_sbindir}/lightdm-gtk-greeter
-%{_docdir}/lightdm-gtk-greeter/sample-lightdm-gtk-greeter.css
 %{_datadir}/icons/hicolor/scalable/places/*
 %{_datadir}/xgreeters/lightdm-greeter.desktop
 %{_datadir}/xgreeters/lightdm-gtk-greeter.desktop
 
 
 %changelog
+* Tue Aug 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.0.7-1
+- new upstream release.
+
 * Sat Nov 28 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.0.1-1
 - new upstream release
 - update Patch1000 (lightdm-gtk-greeter-2.0.1-vine.patch)

l/lightdm/lightdm-vl.spec

@@ -1,19 +1,40 @@
+%bcond_with systemd
+
 Summary: A lightweight display manager
 Summary(ja): 軽量ディスプレイマネージャー
 Name: lightdm
-Version: 1.19.2
-Release: 1%{?_dist_release}
-License: GPLv3,LGPLv2,LGPLv3
-Group: User Interface/X
-URL: http://www.freedesktop.org/wiki/Software/LightDM/
-
-Source0: https://launchpad.net/%{name}/1.17/%{version}/+download/%{name}-%{version}.tar.xz
-Source1: lightdm-pam
-Source2: lightdm-autologin-pam
-Source4: lightdm.rules
+Version: 1.30.0
+Group: system
+Release: 1%{?_dist_release}%{?with_systemd:.systemd}
+Vendor: Project Vine
+Distribution: Vine Linux
 
-Patch0: lightdm-1.11.2-no_dmrc_save.patch
-Patch1: lightdm-1.11.2-nodaemon_option.patch
+License: GPLv3,LGPLv2,LGPLv3
+URL: https://github.com/canonical/lightdm
+Source0: https://github.com/canonical/lightdm/releases/download/%{version}/%{name}-%{version}.tar.xz
+
+Source10:	lightdm-pam
+Source11:	lightdm-autologin-pam
+Source12:	lightdm-tmpfiles.conf
+Source13:	lightdm.service
+Source14:	lightdm.logrotate
+Source15:	lightdm.rules
+
+# .conf snippets
+Source20:	50-backup-logs.conf
+Source21:	50-minimum-vt.conf
+Source22:	50-session-wrapper.conf
+Source23:	50-user-authority-in-system-dir.conf
+Source24:	50-xserver-command.conf
+Source25:	50-disable-guest.conf
+Source26:	50-run-directory.conf
+
+Patch0:		gcc-10.patch
+
+# Upstreamed:
+Patch1:		lightdm-1.25.1-disable_dmrc.patch
+
+Patch101: lightdm-1.11.2-nodaemon_option.patch
 # for Vine Linux
 Patch1000: lightdm-1.17.2-vine.patch
 
@@ -33,13 +54,10 @@ BuildRequires: libxklavier-devel
 BuildRequires: libX11-devel
 BuildRequires: pam-devel
 BuildRequires: libgcrypt-devel
-BuildRequires: qt4-devel
 BuildRequires: yelp-tools
 
-Vendor:			Project Vine
-Distribution:	Vine Linux
-Packager:		Takemikaduchi
-
+Obsoletes:		%{name}-qt < 1.30.0
+Obsoletes:		%{name}-qt-devel < 1.30.0
 
 %description
 An display manager that:
@@ -48,8 +66,10 @@ An display manager that:
  * Has a well defined interface between the server and user interface
  * Cross-desktop (greeters can be written in any toolkit)
 
+
 %package		gobject
 Summary:		LightDM GObject client library
+Group:			system
 
 %description	gobject
 This package contains a GObject based library for LightDM clients to
@@ -58,7 +78,7 @@ use to interface with LightDM.
 
 %package		gobject-devel
 Summary:		Development files and headers for %{name}-gobject
-Group:			Development/Libraries
+Group:			programming
 Requires:		%{name}-gobject = %{version}-%{release}
 Requires:		pkgconfig
 
@@ -66,114 +86,148 @@ Requires:		pkgconfig
 Development files and headers for %{name}-gobject.
 
 
-%package		qt
-Summary:		LightDM QT client library
-
-%description	qt
-This package contains a QT based library for LightDM clients to use
-to interface with LightDM.
-
-
-%package		qt-devel
-Summary:		Development files and headers for %{name}-qt
-Group:			Development/Libraries
-Requires:		%{name}-qt = %{version}-%{release}
-Requires:		pkgconfig
-
-%description	qt-devel
-Development files and headers for %{name}-qt.
-
-
 %prep
 %setup -q
-%patch0 -p1 -b .dmrc
-%patch1 -p1 -b .nodaemon_option
-%patch1000 -p1 -b .vine
+%autosetup -p 1
+
 
 %build
 autoreconf -if
 %configure \
-		--enable-liblightdm-gobject \
-        --enable-liblightdm-qt \
-		--disable-liblightdm-qt5 \
-        --enable-introspection \
-        --with-greeter-user=lightdm
+	--disable-dmrc \
+	--disable-silent-rules \
+	--disable-static \
+	--enable-liblightdm-gobject \
+	--enable-introspection \
+	--disable-liblightdm-qt \
+	--disable-liblightdm-qt5 \
+	--with-greeter-user=lightdm
 
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -m 0644 -p -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/lightdm
-install -m 0644 -p -D %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/lightdm-autologin
-install -m 0644 -p -D %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/polkit-1/rules.d/lightdm.rules
-
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/lightdm
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/lightdm
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lightdm
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/lightdm-data
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/log/lightdm
-
-# remove unused files
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init/lightdm.conf
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/apparmor.d/lightdm-guest-session
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/apparmor.d/abstractions/lightdm
-
-# remove unused files
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/init/lightdm.conf
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/apparmor.d/lightdm-guest-session
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/apparmor.d/abstractions/lightdm
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/apparmor.d/abstractions/lightdm_chromium-browser
-
-find $RPM_BUILD_ROOT -name '*.a' -delete
-find $RPM_BUILD_ROOT -name '*.la' -delete
-
-%find_lang %{name} --with-gnome
+# We need to own these
+%{__mkdir_p} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/		\
+	%{buildroot}%{_datadir}/dbus-1/interfaces		\
+	%{buildroot}%{_datadir}/dbus-1/system.d			\
+	%{buildroot}%{_datadir}/lightdm/lightdm.conf.d/		\
+	%{buildroot}%{_datadir}/lightdm/remote-sessions/	\
+	%{buildroot}%{_datadir}/xgreeters/			\
+	%{buildroot}%{_localstatedir}/cache/lightdm/		\
+	%{buildroot}%{_rundir}/lightdm/		\
+	%{buildroot}%{_localstatedir}/log/lightdm/		\
+	%{buildroot}%{_localstatedir}/lib/lightdm/		\
+	%{buildroot}%{_localstatedir}/lib/lightdm-data/
+
+# libtool cruft
+rm -fv %{buildroot}%{_libdir}/lib*.la
+
+# We don't ship AppAmor
+%{__rm} -rfv %{buildroot}%{_sysconfdir}/apparmor.d/
+
+# omit upstart support
+%{__rm} -rfv %{buildroot}%{_sysconfdir}/init
+
+# install pam file
+%{__install} -Dpm 0644 %{SOURCE10} %{buildroot}%{_sysconfdir}/pam.d/lightdm
+%{__install} -Dpm 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/pam.d/lightdm-autologin
+%{__install} -Dpm 0644 %{SOURCE14} %{buildroot}%{_sysconfdir}/logrotate.d/lightdm
+%{__install} -Dpm 0644 %{SOURCE15} %{buildroot}%{_datadir}/polkit-1/rules.d/lightdm.rules
+%{__install} -pm 0644 %{SOURCE20} %{SOURCE21} %{SOURCE22} %{SOURCE23}	\
+	%{SOURCE24} %{SOURCE25} %{SOURCE26} %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/
+
+%if %{with systemd}
+%{__install} -Dpm 0644 %{SOURCE12} %{buildroot}%{_tmpfilesdir}/lightdm.conf
+%{__install} -Dpm 0644 %{SOURCE13} %{buildroot}%{_unitdir}/lightdm.service
+%{__install} -pm 0644 %{SOURCE26} %{buildroot}%{_datadir}/lightdm/lightdm.conf.d/
+%else
+mkdir -p %{buildroot}%{_localstatedir}/run/lightdm
+%endif
+
+# 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
+
+
+%triggerun -- lightdm < 1.30.0
+getent passwd lightdm >/dev/null && \
+  /usr/sbin/usermod -d /var/lib/lightdm lightdm >/dev/null ||:
 
 %pre
 getent group lightdm >/dev/null || groupadd -r lightdm
 getent passwd lightdm >/dev/null || \
-  /usr/sbin/useradd -g lightdm -M -d /var/lightdm -s /sbin/nologin -r lightdm
+  /usr/sbin/useradd -g lightdm -M -d /var/lib/lightdm -s /sbin/nologin -r lightdm
 exit 0
 
+%if %{with systemd}
+%post
+# todo: document need/purpose for this snippet
+if [ $1 = 1 ] ; then
+	%{_bindir}/killall -HUP dbus-daemon 2>&1 > /dev/null
+fi
+%systemd_post lightdm.service
 
-%post gobject -p /sbin/ldconfig
-
-%postun gobject -p /sbin/ldconfig
+%preun
+%systemd_preun lightdm.service
 
-%post qt -p /sbin/ldconfig
+%postun
+%systemd_postun lightdm.service
+%endif
 
-%postun qt -p /sbin/ldconfig
+%post gobject -p /sbin/ldconfig
+%postun gobject -p /sbin/ldconfig
 
 
 %files -f %{name}.lang
 %defattr(-, root, root, -)
-%doc COPYING.GPL3 COPYING.LGPL2 COPYING.LGPL3 NEWS
+%license COPYING.GPL3
+%doc NEWS
 %dir %{_sysconfdir}/lightdm
+%dir %{_sysconfdir}/lightdm/lightdm.conf.d
+%config(noreplace) %{_sysconfdir}/pam.d/lightdm*
 %config(noreplace) %{_sysconfdir}/lightdm/keys.conf
 %config(noreplace) %{_sysconfdir}/lightdm/lightdm.conf
 %config(noreplace) %{_sysconfdir}/lightdm/users.conf
-%config %{_sysconfdir}/pam.d/lightdm
-%config %{_sysconfdir}/pam.d/lightdm-autologin
-%config %{_sysconfdir}/pam.d/lightdm-greeter
-%{_sysconfdir}/dbus-1/system.d/org.freedesktop.DisplayManager.conf
+%dir %{_sysconfdir}/logrotate.d/
+%{_sysconfdir}/logrotate.d/lightdm
+%dir %attr(-,lightdm,lightdm) %{_localstatedir}/cache/lightdm/
+%dir %attr(-,lightdm,lightdm) %{_localstatedir}/lib/lightdm/
+%dir %attr(-,lightdm,lightdm) %{_localstatedir}/lib/lightdm-data/
+%dir %attr(-,lightdm,lightdm) %{_localstatedir}/log/lightdm/
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%dir %{_datadir}/xgreeters/
 %{_bindir}/dm-tool
 %{_sbindir}/lightdm
 %{_libexecdir}/lightdm-guest-session
-%{_datadir}/bash-completion/completions/dm-tool
-%{_datadir}/bash-completion/completions/lightdm
-%{_datadir}/polkit-1/rules.d/lightdm.rules
+%{_datadir}/lightdm/
 %{_mandir}/man1/dm-tool.1.gz
 %{_mandir}/man1/lightdm.1.gz
-%dir %{_localstatedir}/log/lightdm
+%{_datadir}/accountsservice
+%{_datadir}/dbus-1/interfaces/*.xml
+%{_datadir}/dbus-1/system.d/*.conf
+%{_datadir}/polkit-1/rules.d/lightdm.rules
+%{_datadir}/polkit-1/actions/org.freedesktop.DisplayManager.AccountsService.policy
+%{_datadir}/bash-completion/completions/dm-tool
+%{_datadir}/bash-completion/completions/lightdm
+%if %{with systemd}
+%{_unitdir}/lightdm.service
+%{_tmpfilesdir}/lightdm.conf
+%ghost %dir %{_rundir}/lightdm
+%else
 %dir %{_localstatedir}/run/lightdm
-%dir %attr(1770,lightdm,lightdm) %{_localstatedir}/lightdm
-%dir %attr(-,lightdm,lightdm) %{_localstatedir}/cache/lightdm
-%dir %attr(-,lightdm,lightdm) %{_localstatedir}/lib/lightdm-data/
+%endif
 
 %files gobject
 %defattr(-, root, root, -)
+%license COPYING.LGPL2 COPYING.LGPL3
 %{_libdir}/liblightdm-gobject-1.so.*
 %{_libdir}/girepository-1.0/LightDM-1.typelib
 
@@ -185,19 +239,13 @@ exit 0
 %{_datadir}/gir-1.0/LightDM-1.gir
 %{_datadir}/gtk-doc/html/lightdm-gobject-1
 
-%files qt
-%defattr(-, root, root, -)
-%{_libdir}/liblightdm-qt-3.so.*
-
-%files qt-devel
-%defattr(-, root, root, -)
-%{_includedir}/lightdm-qt-3
-%{_libdir}/liblightdm-qt-3.so
-%{_libdir}/pkgconfig/liblightdm-qt-3.pc
-
-
 
 %changelog
+* Tue Aug 11 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.30.0-1
+- new upstream release.
+- added systemd support (disabled as default).
+- dropped subpackages: lightdm-qt{,-devel}.
+
 * Mon Jul  4 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.19.2-1
 - updated to 1.19.2.