Accepting request 343349 from X11:LXQt

1

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

fix_desktop_categories.patch

@@ -1,14 +0,0 @@
-Index: lxqt-globalkeys-0.9.0/config/lxqt-config-globalkeyshortcuts.desktop.in
-===================================================================
---- lxqt-globalkeys-0.9.0.orig/config/lxqt-config-globalkeyshortcuts.desktop.in
-+++ lxqt-globalkeys-0.9.0/config/lxqt-config-globalkeyshortcuts.desktop.in
-@@ -5,7 +5,7 @@ GenericName=Keyboard Shortcut Settings
- Comment=Configure shortcut keys in LXQt
- Exec=lxqt-config-globalkeyshortcuts
- Icon=preferences-desktop-keyboard
--Categories=Settings;DesktopSettings;Qt;LXQt;
--OnlyShowIn=LXQt;LXDE;
-+Categories=Settings;DesktopSettings;Qt;X-LXQt;
-+OnlyShowIn=X-LXQt;LXDE;
- 
- #TRANSLATIONS_DIR=translations

lxqt-globalkeys-0.10.0.tar.xz

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

lxqt-globalkeys-0.9.0.tar.xz

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

lxqt-globalkeys.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Nov  6 15:06:06 UTC 2015 - mvetter@suse.com
+
+- Upstream release 0.10.0
+- Removing patches:
+ * fix_desktop_categories.patch - Using sed in spec file now
+
 -------------------------------------------------------------------
 Fri Feb 20 20:03:54 UTC 2015 - sfalken@opensuse.org
 

lxqt-globalkeys.spec

@@ -17,21 +17,19 @@
 
 
 Name:           lxqt-globalkeys
-Version:        0.9.0
+Version:        0.10.0
 Release:        0
 Summary:        Global keyboard shortcuts registration
 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
+BuildRequires:  cmake >= 3.0.2
-Patch0:         fix_desktop_categories.patch
-BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  kwindowsystem-devel
 BuildRequires:  pkgconfig(Qt5UiTools)
-BuildRequires:  pkgconfig(lxqt) >= 0.9.0
+BuildRequires:  pkgconfig(lxqt) >= %{version}
 Requires(pre):	desktop-file-utils
 Requires(post):	desktop-file-utils
 Obsoletes:      lxqt-globalkeys-qt5 < %{version}
@@ -66,21 +64,16 @@ Group:          System/Libraries
 %description -n liblxqt-globalkeys-ui0
 UI system libraries for lxqt-globalkeys
 
-%package -n %{name}-lang
+%lang_package
-Summary:        Translations for lxqt-globalkeys 
-Group:          System/Libraries
-Requires:       %{name} = %{version}
-
-%description -n %{name}-lang
-Translation files for lxqt-globalkeys
 
 %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
@@ -102,7 +95,7 @@ Translation files for lxqt-globalkeys
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING
+%doc AUTHORS LICENSE
 %{_bindir}/lxqt-globalkeysd
 %{_bindir}/lxqt-config-globalkeyshortcuts
 %{_datadir}/applications/lxqt-config-globalkeyshortcuts.desktop
@@ -114,20 +107,20 @@ Translation files for lxqt-globalkeys
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/liblxqt-globalkeys.so
 %{_libdir}/liblxqt-globalkeys-ui.so
+%dir %{_datadir}/cmake/lxqt-globalkeys
+%dir %{_datadir}/cmake/lxqt-globalkeys-ui
+%{_datadir}/cmake/lxqt-globalkeys/*
+%{_datadir}/cmake/lxqt-globalkeys-ui/*
 
 %files -n liblxqt-globalkeys0
 %defattr(-,root,root)
-%dir %{_libdir}/cmake/lxqt-globalkeys
 %{_libdir}/liblxqt-globalkeys.so.*
-%{_libdir}/cmake/lxqt-globalkeys/*
 
 %files -n liblxqt-globalkeys-ui0
 %defattr(-,root,root)
-%dir %{_libdir}/cmake/lxqt-globalkeys-ui
 %{_libdir}/liblxqt-globalkeys-ui.so.*
-%{_libdir}/cmake/lxqt-globalkeys-ui/*
 
-%files -n %{name}-lang
+%files lang
 %defattr(-,root,root)
 %{_datadir}/lxqt/translations