Accepting request 343357 from X11:LXQt

1

OBS-URL: https://build.opensuse.org/request/show/343357
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-session?expand=0&rev=5

0001-Make-desktop-files-valid.patch

@@ -0,0 +1,110 @@
+From 0ff74195bf7415f04d24382f022add58bd6decfa Mon Sep 17 00:00:00 2001
+From: Michael Vetter <jubalh@openmailbox.org>
+Date: Fri, 6 Nov 2015 18:02:08 +0100
+Subject: [PATCH] Make desktop files valid
+
+Trailing semicolon was missing.
+---
+ lxqt-leave/resources/lxqt-hibernate.desktop.in  | 2 +-
+ lxqt-leave/resources/lxqt-leave.desktop.in      | 2 +-
+ lxqt-leave/resources/lxqt-lockscreen.desktop.in | 2 +-
+ lxqt-leave/resources/lxqt-logout.desktop.in     | 2 +-
+ lxqt-leave/resources/lxqt-reboot.desktop.in     | 2 +-
+ lxqt-leave/resources/lxqt-shutdown.desktop.in   | 2 +-
+ lxqt-leave/resources/lxqt-suspend.desktop.in    | 2 +-
+ 7 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lxqt-leave/resources/lxqt-hibernate.desktop.in b/lxqt-leave/resources/lxqt-hibernate.desktop.in
+index 19ed383..f44e293 100644
+--- a/lxqt-leave/resources/lxqt-hibernate.desktop.in
++++ b/lxqt-leave/resources/lxqt-hibernate.desktop.in
+@@ -5,7 +5,7 @@ GenericName=Hibernate
+ Comment=hibernate the machine
+ Exec=lxqt-leave --hibernate
+ Icon=system-suspend-hibernate
+-Categories=System;X-Leave
++Categories=System;X-Leave;
+ OnlyShowIn=LXQt
+ 
+ #TRANSLATIONS_DIR=../translations
+diff --git a/lxqt-leave/resources/lxqt-leave.desktop.in b/lxqt-leave/resources/lxqt-leave.desktop.in
+index 9608a3d..db8a620 100644
+--- a/lxqt-leave/resources/lxqt-leave.desktop.in
++++ b/lxqt-leave/resources/lxqt-leave.desktop.in
+@@ -5,7 +5,7 @@ GenericName=Leave
+ Comment=Leave dialog
+ Exec=lxqt-leave
+ Icon=system-shutdown
+-Categories=System;X-Leave
++Categories=System;X-Leave;
+ OnlyShowIn=LXQt;
+ 
+ #TRANSLATIONS_DIR=../translations
+diff --git a/lxqt-leave/resources/lxqt-lockscreen.desktop.in b/lxqt-leave/resources/lxqt-lockscreen.desktop.in
+index 6866095..81dea85 100644
+--- a/lxqt-leave/resources/lxqt-lockscreen.desktop.in
++++ b/lxqt-leave/resources/lxqt-lockscreen.desktop.in
+@@ -5,7 +5,7 @@ GenericName=Lock Screen
+ Comment=Lock the current session
+ Exec=lxqt-leave --lockscreen
+ Icon=system-lock-screen
+-Categories=System;Screensaver
++Categories=System;Screensaver;
+ OnlyShowIn=LXQt;
+ 
+ #TRANSLATIONS_DIR=../translations
+diff --git a/lxqt-leave/resources/lxqt-logout.desktop.in b/lxqt-leave/resources/lxqt-logout.desktop.in
+index 763f33a..a4da833 100644
+--- a/lxqt-leave/resources/lxqt-logout.desktop.in
++++ b/lxqt-leave/resources/lxqt-logout.desktop.in
+@@ -5,7 +5,7 @@ GenericName=Logout
+ Comment=Logout from the current session
+ Exec=lxqt-leave --logout
+ Icon=system-log-out
+-Categories=System;X-Leave
++Categories=System;X-Leave;
+ OnlyShowIn=LXQt;
+ 
+ #TRANSLATIONS_DIR=../translations
+diff --git a/lxqt-leave/resources/lxqt-reboot.desktop.in b/lxqt-leave/resources/lxqt-reboot.desktop.in
+index f5adde6..bb10c4c 100644
+--- a/lxqt-leave/resources/lxqt-reboot.desktop.in
++++ b/lxqt-leave/resources/lxqt-reboot.desktop.in
+@@ -5,7 +5,7 @@ GenericName=Reboot
+ Comment=reboot the machine
+ Exec=lxqt-leave --reboot
+ Icon=system-reboot
+-Categories=System;X-Leave
++Categories=System;X-Leave;
+ OnlyShowIn=LXQt;
+ 
+ #TRANSLATIONS_DIR=../translations
+diff --git a/lxqt-leave/resources/lxqt-shutdown.desktop.in b/lxqt-leave/resources/lxqt-shutdown.desktop.in
+index bd04c33..a1f069d 100644
+--- a/lxqt-leave/resources/lxqt-shutdown.desktop.in
++++ b/lxqt-leave/resources/lxqt-shutdown.desktop.in
+@@ -5,7 +5,7 @@ GenericName=Shutdown
+ Comment=shutdown the machine
+ Exec=lxqt-leave --shutdown
+ Icon=system-shutdown
+-Categories=System;X-Leave
++Categories=System;X-Leave;
+ OnlyShowIn=LXQt;
+ 
+ #TRANSLATIONS_DIR=../translations
+diff --git a/lxqt-leave/resources/lxqt-suspend.desktop.in b/lxqt-leave/resources/lxqt-suspend.desktop.in
+index 401595d..9eaf7d6 100644
+--- a/lxqt-leave/resources/lxqt-suspend.desktop.in
++++ b/lxqt-leave/resources/lxqt-suspend.desktop.in
+@@ -5,7 +5,7 @@ GenericName=Suspend
+ Comment=suspend the machine
+ Exec=lxqt-leave --suspend
+ Icon=system-suspend
+-Categories=System;X-Leave
++Categories=System;X-Leave;
+ OnlyShowIn=LXQt
+ 
+ #TRANSLATIONS_DIR=../translations
+-- 
+2.6.2
+

0002-Fix-desktop-file.patch

@@ -0,0 +1,38 @@
+From 9f5b1c9c148210fbd2efe632ba13e7d994ab4fac Mon Sep 17 00:00:00 2001
+From: Michael Vetter <jubalh@openmailbox.org>
+Date: Fri, 6 Nov 2015 18:16:23 +0100
+Subject: [PATCH] Fix desktop file
+
+Forgot about section OnlyShowIn.
+---
+ lxqt-leave/resources/lxqt-hibernate.desktop.in | 2 +-
+ lxqt-leave/resources/lxqt-suspend.desktop.in   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lxqt-leave/resources/lxqt-hibernate.desktop.in b/lxqt-leave/resources/lxqt-hibernate.desktop.in
+index f44e293..923b2a2 100644
+--- a/lxqt-leave/resources/lxqt-hibernate.desktop.in
++++ b/lxqt-leave/resources/lxqt-hibernate.desktop.in
+@@ -6,6 +6,6 @@ Comment=hibernate the machine
+ Exec=lxqt-leave --hibernate
+ Icon=system-suspend-hibernate
+ Categories=System;X-Leave;
+-OnlyShowIn=LXQt
++OnlyShowIn=LXQt;
+ 
+ #TRANSLATIONS_DIR=../translations
+diff --git a/lxqt-leave/resources/lxqt-suspend.desktop.in b/lxqt-leave/resources/lxqt-suspend.desktop.in
+index 9eaf7d6..44a0b87 100644
+--- a/lxqt-leave/resources/lxqt-suspend.desktop.in
++++ b/lxqt-leave/resources/lxqt-suspend.desktop.in
+@@ -6,6 +6,6 @@ Comment=suspend the machine
+ Exec=lxqt-leave --suspend
+ Icon=system-suspend
+ Categories=System;X-Leave;
+-OnlyShowIn=LXQt
++OnlyShowIn=LXQt;
+ 
+ #TRANSLATIONS_DIR=../translations
+-- 
+2.6.2
+

fix_desktop_categories.patch

@@ -1,98 +0,0 @@
-Index: lxqt-session-0.9.0/lxqt-config-session/lxqt-config-session.desktop.in
-===================================================================
---- lxqt-session-0.9.0.orig/lxqt-config-session/lxqt-config-session.desktop.in
-+++ lxqt-session-0.9.0/lxqt-config-session/lxqt-config-session.desktop.in
-@@ -5,7 +5,7 @@ GenericName=LXQt Session Settings
- Comment=Configuration for LXQt sessions
- Exec=lxqt-config-session
- Icon=preferences-system-session-services
--Categories=Settings;DesktopSettings;Qt;LXQt;
--OnlyShowIn=LXQt;
-+Categories=Settings;DesktopSettings;Qt;X-LXQt;
-+OnlyShowIn=X-LXQt;
- 
- #TRANSLATIONS_DIR=translations
-Index: lxqt-session-0.9.0/lxqtleave/resources/lxqt-hibernate.desktop.in
-===================================================================
---- lxqt-session-0.9.0.orig/lxqtleave/resources/lxqt-hibernate.desktop.in
-+++ lxqt-session-0.9.0/lxqtleave/resources/lxqt-hibernate.desktop.in
-@@ -5,7 +5,7 @@ GenericName=Hibernate
- Comment=hibernate the machine
- Exec=lxqt-leave --hibernate
- Icon=system-suspend-hibernate
--Categories=LXQt;X-Leave
--OnlyShowIn=LXQt
-+Categories=X-LXQt;X-Leave;
-+OnlyShowIn=X-LXQt;
- 
- #TRANSLATIONS_DIR=../translations
-Index: lxqt-session-0.9.0/lxqtleave/resources/lxqt-lockscreen.desktop.in
-===================================================================
---- lxqt-session-0.9.0.orig/lxqtleave/resources/lxqt-lockscreen.desktop.in
-+++ lxqt-session-0.9.0/lxqtleave/resources/lxqt-lockscreen.desktop.in
-@@ -5,7 +5,7 @@ GenericName=Lock Screen
- Comment=Lock the current session
- Exec=lxqt-leave --lockscreen
- Icon=system-lock-screen
--Categories=LXQt;Screensaver
--OnlyShowIn=LXQt;
-+Categories=X-LXQt;Screensaver;
-+OnlyShowIn=X-LXQt;
- 
- #TRANSLATIONS_DIR=../translations
-Index: lxqt-session-0.9.0/lxqtleave/resources/lxqt-logout.desktop.in
-===================================================================
---- lxqt-session-0.9.0.orig/lxqtleave/resources/lxqt-logout.desktop.in
-+++ lxqt-session-0.9.0/lxqtleave/resources/lxqt-logout.desktop.in
-@@ -5,7 +5,7 @@ GenericName=Logout
- Comment=Logout from the current session
- Exec=lxqt-leave --logout
- Icon=system-log-out
--Categories=LXQt;X-Leave
--OnlyShowIn=LXQt;
-+Categories=X-LXQt;X-Leave;
-+OnlyShowIn=X-LXQt;
- 
- #TRANSLATIONS_DIR=../translations
-Index: lxqt-session-0.9.0/lxqtleave/resources/lxqt-reboot.desktop.in
-===================================================================
---- lxqt-session-0.9.0.orig/lxqtleave/resources/lxqt-reboot.desktop.in
-+++ lxqt-session-0.9.0/lxqtleave/resources/lxqt-reboot.desktop.in
-@@ -5,7 +5,7 @@ GenericName=Reboot
- Comment=reboot the machine
- Exec=lxqt-leave --reboot
- Icon=system-reboot
--Categories=LXQt;X-Leave
--OnlyShowIn=LXQt;
-+Categories=X-LXQt;X-Leave;
-+OnlyShowIn=X-LXQt;
- 
- #TRANSLATIONS_DIR=../translations
-Index: lxqt-session-0.9.0/lxqtleave/resources/lxqt-shutdown.desktop.in
-===================================================================
---- lxqt-session-0.9.0.orig/lxqtleave/resources/lxqt-shutdown.desktop.in
-+++ lxqt-session-0.9.0/lxqtleave/resources/lxqt-shutdown.desktop.in
-@@ -5,7 +5,7 @@ GenericName=Shutdown
- Comment=shutdown the machine
- Exec=lxqt-leave --shutdown
- Icon=system-shutdown
--Categories=LXQt;X-Leave
--OnlyShowIn=LXQt;
-+Categories=X-LXQt;X-Leave;
-+OnlyShowIn=X-LXQt;
- 
- #TRANSLATIONS_DIR=../translations
-Index: lxqt-session-0.9.0/lxqtleave/resources/lxqt-suspend.desktop.in
-===================================================================
---- lxqt-session-0.9.0.orig/lxqtleave/resources/lxqt-suspend.desktop.in
-+++ lxqt-session-0.9.0/lxqtleave/resources/lxqt-suspend.desktop.in
-@@ -5,7 +5,7 @@ GenericName=Suspend
- Comment=suspend the machine
- Exec=lxqt-leave --suspend
- Icon=system-suspend
--Categories=LXQt;X-Leave
--OnlyShowIn=LXQt
-+Categories=X-LXQt;X-Leave;
-+OnlyShowIn=X-LXQt;
- 
- #TRANSLATIONS_DIR=../translations

lxqt-session-0.10.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2aedbeef904c11679199bfcdbf141880082c4bbcbcdad2b89b47d5b833fe26d4
+size 65012

lxqt-session-0.9.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c543ffb938e230c144399b59c99c53ee69fd0b37ff404a02576ce1179a551d06
-size 56556

lxqt-session.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Nov  6 16:44:48 UTC 2015 - mvetter@suse.com
+
+- Upstream release 0.10.0
+- Adding patches to make desktop files valid:
+ * 0001-Make-desktop-files-valid.patch
+ * 0002-Fix-desktop-file.patch
+- Removing patches:
+ * fix_desktop_categories.patch - Using sed in spec file now.
+
 -------------------------------------------------------------------
 Fri Feb 20 21:26:45 UTC 2015 - sfalken@opensuse.org
 

lxqt-session.spec

@@ -17,22 +17,24 @@
 
 
 Name:           lxqt-session
-Version:        0.9.0
+Version:        0.10.0
 Release:        0
-Summary:        LXDE-Qt Session Manager
+Summary:        LXQt Session Manager
 License:        LGPL-2.1+
-Group:          System/GUI/LXDE-Qt
+Group:          System/GUI/LXQt
 Url:            http://www.lxde.org
 Source:         http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE fix_desktop_categories.patch sfalken@opensuse.org -- fix desktop categories per openSUSE policy
+# Both desktop file patches are upstreamed
-Patch0:         fix_desktop_categories.patch
+Patch0:         0001-Make-desktop-files-valid.patch
-BuildRequires:  cmake
+Patch1:         0002-Fix-desktop-file.patch
+BuildRequires:  cmake >= 3.0.2
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  kwindowsystem-devel
 BuildRequires:  pkgconfig(Qt5UiTools)
 BuildRequires:  pkgconfig(Qt5Xdg)
 BuildRequires:  pkgconfig(lxqt) >= %{version} 
+BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11-xcb)
 Requires(pre):	desktop-file-utils
@@ -45,21 +47,18 @@ is used to automatically start a set of applications and set up a working deskto
 environment. Moreover, the session manager is able to remember the applications in
 use when a user logs out and to restart them the next time the user logs in.
 
-%package -n %{name}-lang
+%lang_package
-Summary:        Translations for lxqt-session
-Group:          System/GUI/LXDE-Qt
-Requires:       %{name} = %{version}
-
-%description -n %{name}-lang
-Translation files for lxqt-session
 
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+# Changing LXQt into X-LXQt in desktop files to be freedesktop compliant and shut rpmlint warnings
+#find -name '*desktop.in*' -exec sed -ri 's/(LXQt;)/X-\1/' {} +
 
 %build
 %cmake
-%__make %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
 %cmake_install
@@ -73,13 +72,14 @@ Translation files for lxqt-session
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING
+%doc AUTHORS LICENSE
 %{_bindir}/lxqt-config-session
 %{_bindir}/lxqt-session
 %{_bindir}/lxqt-leave
 %{_datadir}/applications/*.desktop
+%{_mandir}/man?/lxqt-*.*
 
-%files -n %{name}-lang
+%files lang
 %defattr(-,root,root)
 %{_datadir}/lxqt/translations