From 4110ff2dafd7d1b0a8482cc9e5cf9eb341dc3558 Mon Sep 17 00:00:00 2001
From: Helio Chissini de Castro <helio@kde.org>
Date: Dec 19 2014 21:12:08 +0000
Subject: - Unify naming as discussed on Fedora IRC


---

diff --git a/lxqt-common-0.8.0-datadir.patch b/lxqt-common-0.8.0-datadir.patch
deleted file mode 100644
index e061ca7..0000000
--- a/lxqt-common-0.8.0-datadir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -r -u lxqt-common-0.8.0.orig/CMakeLists.txt lxqt-common-0.8.0/CMakeLists.txt
---- lxqt-common-0.8.0.orig/CMakeLists.txt	2014-08-23 06:12:54.000000000 -0300
-+++ lxqt-common-0.8.0/CMakeLists.txt	2014-10-27 20:31:36.016173283 -0200
-@@ -15,7 +15,7 @@
- include(${LXQT_USE_FILE})
- 
- # graphics
--install(DIRECTORY graphics DESTINATION share/lxqt/)
-+install(DIRECTORY graphics DESTINATION ${LXQT_SHARE_DIR}/)
- 
- # startlxqt script
- configure_file(startlxqt.in startlxqt @ONLY)
-diff -r -u lxqt-common-0.8.0.orig/themes/CMakeLists.txt lxqt-common-0.8.0/themes/CMakeLists.txt
---- lxqt-common-0.8.0.orig/themes/CMakeLists.txt	2014-08-23 06:12:54.000000000 -0300
-+++ lxqt-common-0.8.0/themes/CMakeLists.txt	2014-10-27 20:31:23.881160633 -0200
-@@ -1,3 +1,7 @@
--install(DIRECTORY . DESTINATION share/lxqt/themes PATTERN "CMake*" EXCLUDE PATTERN "cmake*" EXCLUDE PATTERN "Makefile" EXCLUDE)
-+install(	DIRECTORY .
-+			DESTINATION ${LXQT_SHARE_DIR}/themes
-+			PATTERN "CMake*" EXCLUDE
-+			PATTERN "cmake*" EXCLUDE
-+			PATTERN "Makefile" EXCLUDE)
- 
- 
diff --git a/lxqt-common.spec b/lxqt-common.spec
index 5f916ad..0426aa9 100644
--- a/lxqt-common.spec
+++ b/lxqt-common.spec
@@ -7,16 +7,16 @@
 Name:    lxqt-common
 Summary: Common resources for LXQt desktop suite
 Version: 0.8.0
-Release: 7%{?dist}
+Release: 8%{?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-datadir.patch
-Patch1:  lxqt-common-0.8.0-desktop-launch.patch
+Patch0:  lxqt-common-0.8.0-desktop-launch.patch
 # From https://github.com/lxde/lxqt-common/pull/7.patch
-Patch2:  lxqt-common-xdg_data_dir.patch
+Patch1:  lxqt-common-xdg_data_dir.patch
 # fedora's polkit agent patched to be in libexec instead of bin/
-Patch3: lxqt-common-0.8.0-polkit_libexec.patch
+Patch2: lxqt-common-0.8.0-polkit_libexec.patch
+Patch3: lxqt-common-0.8.0-unify.patch
 BuildArch: noarch
 
 Requires: oxygen-icon-theme
@@ -24,7 +24,7 @@ Requires: oxygen-icon-theme
 BuildRequires: %{cmake_pkg} >= 2.8.9
 BuildRequires: pkgconfig(Qt5Xdg)
 BuildRequires: pkgconfig(Qt5Help)
-BuildRequires: pkgconfig(lxqt-qt5)
+BuildRequires: pkgconfig(lxqt)
 BuildRequires: desktop-file-utils
 
 %description
@@ -33,10 +33,10 @@ BuildRequires: desktop-file-utils
 %prep
 %setup -q
 
-%patch0 -p1 -b .qt5-path
-%patch1 -p1 -b .desktop-launch
-%patch2 -p1 -b .xdg-data
-%patch3 -p1 -b .libexec
+%patch0 -p1 -b .desktop-launch
+%patch1 -p1 -b .xdg-data
+%patch2 -p1 -b .libexec
+%patch3 -p1 -b .unify
 
 %build
 mkdir -p %{_target_platform}
@@ -63,12 +63,15 @@ done
 %{_datadir}/xsessions/lxqt.desktop
 %dir %{_sysconfdir}/xdg/pcmanfm-qt
 %config(noreplace) %{_sysconfdir}/xdg/pcmanfm-qt/lxqt/settings.conf
-%{_datadir}/lxqt-qt5/themes
-%{_datadir}/lxqt-qt5/graphics
-%{_datadir}/lxqt-qt5/openbox
+%{_datadir}/lxqt/themes
+%{_datadir}/lxqt/graphics
+%{_datadir}/lxqt/openbox
 %exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop
 
 %changelog
+* Fri Dec 19 2014 Helio Chissini de Castro <hcastro@redhat.com> - 0.8.0-8
+- Unify naming as discussed on Fedora IRC
+
 * Fri Dec 19 2014 Rex Dieter <rdieter@fedoraproject.org> - 0.8.0-7
 - fix lxqt-policykit autostart (moved to libexec)
 - don't mark autostart as %%config