From 1e5cbf6c8aaf9fdd25d4cdd0caa5f95f01b71598bf23741ec36140736a04d96d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 13 Nov 2015 22:35:38 +0000
Subject: [PATCH] Accepting request 343353 from X11:LXQt

1

OBS-URL: https://build.opensuse.org/request/show/343353
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/lxqt-powermanagement?expand=0&rev=6
---
 fix_desktop_categories.patch       | 14 --------------
 lxqt-powermanagement-0.10.0.tar.xz |  3 +++
 lxqt-powermanagement-0.9.0.tar.xz  |  3 ---
 lxqt-powermanagement.changes       |  7 +++++++
 lxqt-powermanagement.spec          | 24 +++++++++---------------
 5 files changed, 19 insertions(+), 32 deletions(-)
 delete mode 100644 fix_desktop_categories.patch
 create mode 100644 lxqt-powermanagement-0.10.0.tar.xz
 delete mode 100644 lxqt-powermanagement-0.9.0.tar.xz

diff --git a/fix_desktop_categories.patch b/fix_desktop_categories.patch
deleted file mode 100644
index 59e685d..0000000
--- a/fix_desktop_categories.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: lxqt-powermanagement-0.9.0/config/lxqt-config-powermanagement.desktop.in
-===================================================================
---- lxqt-powermanagement-0.9.0.orig/config/lxqt-config-powermanagement.desktop.in
-+++ lxqt-powermanagement-0.9.0/config/lxqt-config-powermanagement.desktop.in
-@@ -4,7 +4,7 @@ Name=Power Management
- GenericName=Power Management Settings
- Exec=lxqt-config-powermanagement
- Icon=preferences-system-power-management
--Categories=Settings;DesktopSettings;Qt;LXQt;
--OnlyShowIn=LXQt;LXDE;
-+Categories=Settings;DesktopSettings;Qt;X-LXQt;
-+OnlyShowIn=X-LXQt;LXDE;
- 
- #TRANSLATIONS_DIR=translations
diff --git a/lxqt-powermanagement-0.10.0.tar.xz b/lxqt-powermanagement-0.10.0.tar.xz
new file mode 100644
index 0000000..2d02341
--- /dev/null
+++ b/lxqt-powermanagement-0.10.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:85f67c1ee443f7a028a2bd63b9430fc55823a0cb9ce33cd23d97ccba31e05aa9
+size 39036
diff --git a/lxqt-powermanagement-0.9.0.tar.xz b/lxqt-powermanagement-0.9.0.tar.xz
deleted file mode 100644
index d2dad12..0000000
--- a/lxqt-powermanagement-0.9.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4602de9a9976307a74568cc729c6970c73dc06be5f972ade21eea6afb0c3006b
-size 36292
diff --git a/lxqt-powermanagement.changes b/lxqt-powermanagement.changes
index 15ec688..b081d34 100644
--- a/lxqt-powermanagement.changes
+++ b/lxqt-powermanagement.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov  6 16:25:33 UTC 2015 - mvetter@suse.com
+
+- Upstream release 0.10.0
+- Removing patches:
+ * fix_desktop_categories.patch - Using sed in spec file now.
+
 -------------------------------------------------------------------
 Sat Feb 21 18:01:24 UTC 2015 - hrvoje.senjan@gmail.com
 
diff --git a/lxqt-powermanagement.spec b/lxqt-powermanagement.spec
index ac8288d..49ba6e0 100644
--- a/lxqt-powermanagement.spec
+++ b/lxqt-powermanagement.spec
@@ -17,20 +17,19 @@
 
 
 Name:           lxqt-powermanagement
-Version:        0.9.0
+Version:        0.10.0
 Release:        0
 Summary:        Power Management and Auto-suspend
 License:        LGPL-2.1+
 Group:          System/GUI/LXDE-Qt
 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
-Patch0:         fix_desktop_categories.patch
-BuildRequires:  cmake
+BuildRequires:  cmake >= 3.0.2
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  kwindowsystem-devel
 BuildRequires:  libQt5Gui-private-headers-devel
+BuildRequires:  solid-devel
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Svg)
 BuildRequires:  pkgconfig(Qt5UiTools)
@@ -43,23 +42,18 @@ Requires(post):	desktop-file-utils
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
-Lxqt daemon for power management and Auto-suspend
+LXQt daemon for power management and Auto-suspend
 
-%package -n %{name}-lang
-Summary:        Translations for lxqt-powermanagement
-Group:          System/GUI/LXDE-Qt
-Requires:       %{name} = %{version}
-
-%description -n %{name}-lang
-Translation files for lxqt-powermanagement
+%lang_package
 
 %prep
 %setup -q
-%patch0 -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
@@ -81,7 +75,7 @@ Translation files for lxqt-powermanagement
 %dir %{_datadir}/icons/hicolor/scalable/devices
 %{_datadir}/icons/hicolor/scalable/devices/*.svg
 
-%files -n %{name}-lang
+%files lang
 %defattr(-,root,root)
 %{_datadir}/lxqt/translations