[lxqt-panel] - Unify naming as discussed on Fedora IRC

[Helio Chissini de Castro]

commit 4afcfea4952e2173c46707189e3bd6a4f9e39d2a
Author: Helio Chissini de Castro <helio at kde.org>
Date:   Sat Dec 20 11:44:39 2014 -0200

    - Unify naming as discussed on Fedora IRC

 lxqt-panel-0.8.0-lxqtmount-includes.patch |   47 -----------------------------
 lxqt-panel-0.8.0-share-path.patch         |   47 -----------------------------
 lxqt-panel-0.8.0-unify.patch              |   41 +++++++++++++++++++++++++
 lxqt-panel.spec                           |   24 ++++++++-------
 4 files changed, 54 insertions(+), 105 deletions(-)
---
diff --git a/lxqt-panel-0.8.0-unify.patch b/lxqt-panel-0.8.0-unify.patch
new file mode 100644
index 0000000..d1b89a1
--- /dev/null
+++ b/lxqt-panel-0.8.0-unify.patch
@@ -0,0 +1,41 @@
+--- lxqt-panel-0.8.0/CMakeLists.txt.unify	2014-12-20 11:03:58.640050150 -0200
++++ lxqt-panel-0.8.0/CMakeLists.txt	2014-12-20 11:04:49.773251088 -0200
+@@ -61,6 +61,12 @@
+ 
+ add_definitions ( -Wall )
+ 
++find_package(lxqt REQUIRED)
++find_package(lxqtmount REQUIRED )
++find_package(Qt5Xdg REQUIRED QUIET)
++find_package(lxqt-globalkeys REQUIRED)
++find_package(lxqt-globalkeys-ui REQUIRED)
++
+ # Support Qt5
+ option(USE_QT5 "Build with Qt5." $ENV{USE_QT5})
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+@@ -75,12 +81,6 @@
+   find_package(Qt5X11Extras REQUIRED QUIET)
+   message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
+ 
+-  find_package(lxqt-qt5 REQUIRED)
+-  find_package(lxqtmount-qt5 REQUIRED )
+-  find_package(Qt5Xdg REQUIRED QUIET)
+-  find_package(lxqt-globalkeys-qt5 REQUIRED)
+-  find_package(lxqt-globalkeys-ui-qt5 REQUIRED)
+-  
+   # xcb packages
+   find_package(PkgConfig)
+   pkg_check_modules(XCB REQUIRED xcb)
+@@ -93,12 +93,6 @@
+   find_package(Qt4 REQUIRED)
+   include(${QT_USE_FILE})
+   message(STATUS "Building with Qt${QTVERSION}")
+-
+-  find_package(LXQT REQUIRED)
+-  find_package(LXQTMOUNT REQUIRED )
+-  find_package(QTXDG REQUIRED QUIET)
+-  find_package(LXQT_GLOBALKEYS REQUIRED)
+-  find_package(LXQT_GLOBALKEYS_UI REQUIRED)
+ endif()
+ include(${LXQT_USE_FILE})
+ include(${LXQTMOUNT_USE_FILE})
diff --git a/lxqt-panel.spec b/lxqt-panel.spec
index 810a7a9..a8d7d36 100644
--- a/lxqt-panel.spec
+++ b/lxqt-panel.spec
@@ -7,11 +7,11 @@
 Name:    lxqt-panel
 Summary: Main panel bar for LXQt desktop suite
 Version: 0.8.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 URL:     http://lxqt.org/
 Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
-Patch0:  lxqt-panel-0.8.0-share-path.patch
+Patch0:  lxqt-panel-0.8.0-unify.patch
 Patch1:  lxqt-panel-0.8.0-desktop-files.patch
 # https://github.com/lxde/lxde-qt/issues/288
 Patch100: lxqt-panel-0.8.0-undefined-references.patch
@@ -20,10 +20,10 @@ Patch101: lxqt-panel-0.8.0-lxqtmount-includes.patch
 BuildRequires: %{cmake_pkg} >= 2.8.9
 BuildRequires: pkgconfig(Qt5Help)
 BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0
-BuildRequires: pkgconfig(lxqt-qt5)
-BuildRequires: pkgconfig(lxqtmount-qt5)
-BuildRequires: pkgconfig(lxqt-globalkeys-qt5)
-BuildRequires: pkgconfig(lxqt-globalkeys-ui-qt5)
+BuildRequires: pkgconfig(lxqt)
+BuildRequires: pkgconfig(lxqtmount)
+BuildRequires: pkgconfig(lxqt-globalkeys)
+BuildRequires: pkgconfig(lxqt-globalkeys-ui)
 BuildRequires: pkgconfig(xcb)
 BuildRequires: pkgconfig(xcb-damage)
 BuildRequires: pkgconfig(xcb-xkb)
@@ -52,9 +52,8 @@ Requires: %{name} = %{version}-%{release}
 
 %prep
 %setup
-
-%patch0 -p1 -b .datadir
-%patch1 -p1 -b .desktop_files
+%patch0 -p1 -b .unify
+%patch1 -p1 -b .desktp_patch
 %patch100 -p1 -b .upstream-references
 %patch101 -p1 -b .upstream-includes
 
@@ -69,7 +68,7 @@ make %{?_smp_mflags} -C %{_target_platform}
 %install
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 
-for desktop in %{buildroot}/%{_datadir}/lxqt-qt5/lxqt-panel/*.desktop; do
+for desktop in %{buildroot}/%{_datadir}/lxqt/lxqt-panel/*.desktop; do
 	# Exclude category as been Service 
 	desktop-file-edit --remove-category=LXQt --remove-only-show-in=LXQt --add-only-show-in=X-LXQt ${desktop}
 done
@@ -79,7 +78,7 @@ done
 %{_bindir}/lxqt-panel
 %dir %{_libdir}/lxqt-panel
 %{_libdir}/lxqt-panel/*.so
-%{_datadir}/lxqt-qt5
+%{_datadir}/lxqt
 %dir %{_sysconfdir}/xdg/lxqt
 %config(noreplace) %{_sysconfdir}/xdg/lxqt/panel.conf
 
@@ -87,6 +86,9 @@ done
 %{_includedir}/lxqt
 
 %changelog
+* Sat Dec 20 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-7
+- Unify naming as discussed on Fedora IRC
+
 * Tue Dec 16 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-6
 - Wrong requires of xscreensaver-base. Should be handled but xdg-utils