From dd071ff4a34c69412d91c23c65090563e0d4cdf4 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Feb 08 2015 14:51:16 +0000
Subject: - New upstream release 0.9.0


---

diff --git a/.gitignore b/.gitignore
index fcbb6e1..7800c47 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /lxqt-common-0.8.0.tar.xz
+/lxqt-common-0.9.0.tar.xz
diff --git a/lxqt-common-0.8.0-desktop-launch.patch b/lxqt-common-0.8.0-desktop-launch.patch
deleted file mode 100644
index bf46c6e..0000000
--- a/lxqt-common-0.8.0-desktop-launch.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lxqt-common-0.8.0.orig/xsession/lxqt.desktop.in	2014-08-23 06:12:54.000000000 -0300
-+++ lxqt-common-0.8.0/xsession/lxqt.desktop.in	2014-10-28 09:20:45.608298476 -0200
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Type=Application
--Exec=startlxqt
-+Exec=/usr/bin/startlxqt
-+TryExec=/usr/bin/startlxqt
- Name=LXQt Desktop
- Comment=Lightweight Qt Desktop
--
--#TRANSLATIONS_DIR=translations
-+Icon=lxqt
diff --git a/lxqt-common-0.8.0-polkit_libexec.patch b/lxqt-common-0.8.0-polkit_libexec.patch
deleted file mode 100644
index 3cbdfec..0000000
--- a/lxqt-common-0.8.0-polkit_libexec.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up lxqt-common-0.8.0/autostart/CMakeLists.txt.libexec lxqt-common-0.8.0/autostart/CMakeLists.txt
-diff -up lxqt-common-0.8.0/autostart/lxqt-policykit-agent.desktop.in.libexec lxqt-common-0.8.0/autostart/lxqt-policykit-agent.desktop.in
---- lxqt-common-0.8.0/autostart/lxqt-policykit-agent.desktop.in.libexec	2014-08-23 04:12:54.000000000 -0500
-+++ lxqt-common-0.8.0/autostart/lxqt-policykit-agent.desktop.in	2014-12-19 07:39:50.814981890 -0600
-@@ -1,8 +1,8 @@
- [Desktop Entry]
- Type=Application
- Name=PolicyKit Handler
--TryExec=lxqt-policykit-agent
--Exec=lxqt-policykit-agent
-+TryExec=/usr/libexec/lxqt-policykit-agent
-+Exec=/usr/libexec/lxqt-policykit-agent
- OnlyShowIn=LXQt;
- X-LXQt-Module=true
- 
diff --git a/lxqt-common-0.8.0-unify.patch b/lxqt-common-0.8.0-unify.patch
deleted file mode 100644
index 148b0ec..0000000
--- a/lxqt-common-0.8.0-unify.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- lxqt-common-0.8.0/CMakeLists.txt.unify	2014-12-19 18:52:47.017602503 -0200
-+++ lxqt-common-0.8.0/CMakeLists.txt	2014-12-19 18:53:03.973643718 -0200
-@@ -7,11 +7,7 @@
- 
- # Support Qt5
- option(USE_QT5 "Build with Qt5." $ENV{USE_QT5})
--if(USE_QT5)
--    find_package(lxqt-qt5 REQUIRED)
--else()
--    find_package(LXQT REQUIRED)
--endif()
-+find_package(LXQT REQUIRED)
- include(${LXQT_USE_FILE})
- 
- # graphics
diff --git a/lxqt-common.spec b/lxqt-common.spec
index d35657b..b2da360 100644
--- a/lxqt-common.spec
+++ b/lxqt-common.spec
@@ -1,30 +1,19 @@
-%if 0%{?rhel} == 6
-%define cmake_pkg cmake28
-%else
-%define cmake_pkg cmake
-%endif
-
 Name:    lxqt-common
 Summary: Common resources for LXQt desktop suite
-Version: 0.8.0
-Release: 10%{?dist}
+Version: 0.9.0
+Release: 1%{?dist}
 License: LGPLv2+
 URL:     http://lxqt.org/
-Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
-Patch0:  lxqt-common-0.8.0-desktop-launch.patch
-# From https://github.com/lxde/lxqt-common/pull/7.patch
-Patch1:  lxqt-common-xdg_data_dir.patch
-# fedora's polkit agent patched to be in libexec instead of bin/
-Patch2: lxqt-common-0.8.0-polkit_libexec.patch
-Patch3: lxqt-common-0.8.0-unify.patch
+Source0: http://downloads.lxqt.org/lxqt/0.9.0/lxqt-common-0.9.0.tar.xz
 BuildArch: noarch
 
 Requires: oxygen-icon-theme
 
-BuildRequires: %{cmake_pkg} >= 2.8.9
+BuildRequires: cmake >= 2.8.9
 BuildRequires: pkgconfig(Qt5Xdg)
 BuildRequires: pkgconfig(Qt5Help)
 BuildRequires: pkgconfig(lxqt)
+BuildRequires: kf5-kwindowsystem-devel >= 5.5
 BuildRequires: desktop-file-utils
 
 %description
@@ -33,15 +22,10 @@ BuildRequires: desktop-file-utils
 %prep
 %setup -q
 
-%patch0 -p1 -b .desktop-launch
-%patch1 -p1 -b .xdg-data
-%patch2 -p1 -b .libexec
-%patch3 -p1 -b .unify
-
 %build
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
-%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QT5=ON ..
+	%{cmake} ..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
@@ -55,6 +39,15 @@ for desktop in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop; do
 	desktop-file-edit --remove-only-show-in=LXQt --add-only-show-in=X-LXQt ${desktop}
 done
 
+%posttrans
+update-desktop-database -q &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+update-desktop-database -q &> /dev/null || :
+fi
+
+
 %files
 %{_bindir}/startlxqt	
 %dir %{_sysconfdir}/xdg/lxqt
@@ -66,9 +59,16 @@ done
 %{_datadir}/lxqt/themes
 %{_datadir}/lxqt/graphics
 %{_datadir}/lxqt/openbox
+%{_sysconfdir}/xdg/menus/lxqt-applications.menu
 %exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop
 
 %changelog
+* Sun Feb 08 2015 Helio Chissini de Castro <helio@kde.org> - 0.9.0-1
+- New upstream release 0.9.0
+
+* Tue Feb 03 2015 Helio Chissini de Castro <hcastro@redhat.com> - 0.9.0-0.1
+- Preparing 0.9.0
+
 * Mon Dec 29 2014 Helio Chissini de Castro <hcastro@redhat.com> - 0.8.0-10
 - Rebuild against new Qt 5.4.0
 
diff --git a/sources b/sources
index 3026d09..43bfeb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b48d6df01f23d56115448076ae875680  lxqt-common-0.8.0.tar.xz
+8545eb74497b59d25d10d45c66a0ea27  lxqt-common-0.9.0.tar.xz