Accepting request 284986 from X11:lxde

1

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

fix_desktop_categories.patch

@@ -0,0 +1,98 @@
+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.8.0.tar.xz

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

lxqt-session-0.9.0.tar.xz

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

lxqt-session.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Feb  9 23:18:59 UTC 2015 - sfalken@opensuse.org
+
+- New upstream version 0.9.0
+- Added -lang subpackage
+- Added Patch
+  + fix_desktop_categories.patch - fixes category definitions to
+comply with openSUSE policy
+
 -------------------------------------------------------------------
 Mon Jan 26 00:44:05 UTC 2015 - sfalken@opensuse.org
 

lxqt-session.spec

@@ -17,39 +17,50 @@
 
 
 Name:           lxqt-session
-Version:        0.8.0
+Version:        0.9.0
 Release:        0
 Summary:        LXDE-Qt Session Manager
 License:        LGPL-2.1+
 Group:          System/GUI/LXDE-Qt
 Url:            http://www.lxde.org
-Source:         %{name}-%{version}.tar.xz
+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
+Patch0:         fix_desktop_categories.patch
 BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
+BuildRequires:  kwindowsystem-devel
+BuildRequires:  pkgconfig(Qt5UiTools)
 BuildRequires:  pkgconfig(Qt5Xdg)
-BuildRequires:  pkgconfig(lxqt-qt5) >= 0.8.0
+BuildRequires:  pkgconfig(lxqt) >= %{version} 
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(x11-xcb)
-BuildRequires:  pkgconfig(Qt5UiTools)
 Requires(pre):	desktop-file-utils
 Requires(post):	desktop-file-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-LXSession is the standard session manager used by LXDE. The LXSession manager
+LXQt-session is the standard session manager used by LXQt. The lxqt-session manager
 is used to automatically start a set of applications and set up a working desktop
 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
+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
 
 %build
 mkdir build
 pushd build
 cmake \
-      -DUSE_QT5=ON \
       -DCMAKE_INSTALL_PREFIX:PATH=/usr \
       ..
 %__make %{?_smp_mflags}
@@ -59,7 +70,7 @@ popd
 pushd build
 make DESTDIR=$RPM_BUILD_ROOT install
 popd
-%fdupes -s %{buildroot}/%{_datadir}/lxqt-qt5
+%fdupes -s %{buildroot}/%{_datadir}
 
 %post
 %desktop_database_post
@@ -72,8 +83,11 @@ popd
 %doc AUTHORS COPYING
 %{_bindir}/lxqt-config-session
 %{_bindir}/lxqt-session
-%{_libdir}/lxqt-xdg-tools
+%{_bindir}/lxqt-leave
 %{_datadir}/applications/*.desktop
-%{_datadir}/lxqt-qt5
+
+%files -n %{name}-lang
+%defattr(-,root,root)
+%{_datadir}/lxqt/translations
 
 %changelog