Hello community, here is the log from the commit of package sddm for openSUSE:Factory checked in at 2015-06-02 10:00:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sddm (Old) and /work/SRC/openSUSE:Factory/.sddm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sddm" Changes: -------- --- /work/SRC/openSUSE:Factory/sddm/sddm.changes 2015-05-11 19:33:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sddm.new/sddm.changes 2015-06-02 10:00:59.000000000 +0200 @@ -1,0 +2,17 @@ +Mon Jun 1 08:13:54 UTC 2015 - [email protected] + +- Do not split out a -lang package: the translations are not in + standard locations and having the -lang package confuses + bundle-lang-kde, which can't move the files to the bundle, thus + resulting in conflicting packages. + +------------------------------------------------------------------- +Mon May 25 17:39:12 UTC 2015 - [email protected] + +- Add sddm-service-handle-plymouth.patch -- sddm has some rudimentary + support for plymouth handling, which only works with + plymouth-quit.service (the servce is not enabled on openSUSE). + For users of sddm.service, we need to issue plymouth quit command + by hand in this case + +------------------------------------------------------------------- New: ---- sddm-service-handle-plymouth.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sddm.spec ++++++ --- /var/tmp/diff_new_pack.0s7sv7/_old 2015-06-02 10:01:00.000000000 +0200 +++ /var/tmp/diff_new_pack.0s7sv7/_new 2015-06-02 10:01:00.000000000 +0200 @@ -39,6 +39,9 @@ # PATCH-FIX-OPENSUSE sysconfig-support.patch -- Support DISPLAYMANAGER_AUTOLOGIN entry from /etc/sysconfig/displaymanager, the value overwrites # any entry in sddm.conf/[Autologin]/User. Patch also defaults to plasma5.desktop as default autologin session. This is controlled only by sddm.conf file. Patch3: sysconfig-support.patch +# PATCH-FIX-OPENSUSE sddm-service-handle-plymouth.patch -- sddm has some rudimentary support for plymouth handling, which only works with plymouth-quit.service +# (the servce is not enabled on openSUSE). For users of sddm.service, we need to issue plymouth quit command by hand in this case +Patch4: sddm-service-handle-plymouth.patch BuildRequires: cmake BuildRequires: fdupes BuildRequires: kf5-filesystem @@ -55,7 +58,8 @@ BuildRequires: pkgconfig(xcb-xkb) Requires: breeze Requires: sddm-branding = %{version} -Recommends: %{name}-lang +# Merged the -lang package back into the main package +Obsoletes: %{name}-lang <= %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -90,13 +94,13 @@ ability to create smooth, animated user interfaces. This package provides upstream branding for SDDM. -%lang_package %prep %setup -q -n %{name}-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build %cmake \ @@ -160,6 +164,7 @@ %{_datadir}/sddm/flags/ %{_datadir}/sddm/scripts/ %{_datadir}/sddm/themes/ +%{_datadir}/sddm/translations/ %{_mandir}/man*/sddm*.* %ghost %attr(711,sddm,sddm) %dir %{_rundir}/sddm %attr(750,sddm,sddm) %dir %{_localstatedir}/lib/sddm @@ -173,8 +178,4 @@ %defattr(-,root,root) %doc COPYING* README* -%files lang -%defattr(-,root,root) -%{_datadir}/sddm/translations/ - %changelog ++++++ sddm-service-handle-plymouth.patch ++++++ diff --git a/services/sddm.service.in b/services/sddm.service.in index b0cea02..fffa5c2 100644 --- a/services/sddm.service.in +++ b/services/sddm.service.in @@ -6,6 +6,7 @@ After=systemd-user-sessions.service [email protected] plymouth-quit.service [Service] ExecStart=@CMAKE_INSTALL_FULL_BINDIR@/sddm +ExecStartPre=-@CMAKE_INSTALL_FULL_BINDIR@/plymouth quit --retain-splash Restart=always #PrivateTmp=yes
