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

[Helio Chissini de Castro]

commit 410128b1b62fcd68f32b53478c49e5fa706e50c9
Author: Helio Chissini de Castro <helio at kde.org>
Date:   Fri Dec 19 18:41:27 2014 -0200

    - Unify naming as discussed on Fedora IRC

 lxqt-about-0.8.0-qt5-datadir.patch |   28 ----------------------------
 lxqt-about-0.8.0-unify.patch       |   24 ++++++++++++++++++++++++
 lxqt-about.spec                    |   13 ++++++++-----
 3 files changed, 32 insertions(+), 33 deletions(-)
---
diff --git a/lxqt-about-0.8.0-unify.patch b/lxqt-about-0.8.0-unify.patch
new file mode 100644
index 0000000..9d505aa
--- /dev/null
+++ b/lxqt-about-0.8.0-unify.patch
@@ -0,0 +1,24 @@
+--- lxqt-about-0.8.0/CMakeLists.txt.no_qt5	2014-12-19 18:36:37.557298912 -0200
++++ lxqt-about-0.8.0/CMakeLists.txt	2014-12-19 18:38:00.411494013 -0200
+@@ -38,11 +38,12 @@
+     endif()
+ endif()
+ 
++
++find_package(lxqt REQUIRED QUIET)
+ if(USE_QT5)
+     find_package(Qt5Widgets REQUIRED QUIET)
+     find_package(Qt5DBus REQUIRED QUIET)
+     find_package(Qt5X11Extras REQUIRED QUIET)
+-    find_package(lxqt-qt5 REQUIRED QUIET)
+     include(${LXQT_USE_FILE})
+ 
+     qt5_wrap_cpp(MOC_SOURCES ${MOC_FILES})
+@@ -52,7 +53,6 @@
+     set(QTX_LIBRARIES ${Qt5Widgets_LIBRARIES} ${Qt5DBus_LIBRARIES} ${Qt5X11Extras_LIBRARIES})
+ else()
+     find_package(Qt4 REQUIRED QtCore QtGui QUIET)
+-    find_package(LXQT REQUIRED QUIET)
+     include(${LXQT_USE_FILE})
+ 
+     qt4_wrap_cpp(MOC_SOURCES ${MOC_FILES})
diff --git a/lxqt-about.spec b/lxqt-about.spec
index b284e4b..aeb016e 100644
--- a/lxqt-about.spec
+++ b/lxqt-about.spec
@@ -7,14 +7,14 @@
 Name:    lxqt-about
 Summary: About application for LXQt desktop suite
 Version: 0.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LGPLv2+
 URL:     http://lxqt.org/
 Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
-Patch0:  lxqt-about-0.8.0-qt5-datadir.patch
+Patch0:  lxqt-about-0.8.0-unify.patch
 
 BuildRequires: %{cmake_pkg} >= 2.8.9
-BuildRequires: pkgconfig(lxqt-qt5)
+BuildRequires: pkgconfig(lxqt)
 BuildRequires: pkgconfig(Qt5Xdg)
 BuildRequires: pkgconfig(Qt5Help)
 BuildRequires: desktop-file-utils
@@ -25,7 +25,7 @@ BuildRequires: desktop-file-utils
 
 %prep
 %setup -q
-%patch0 -p1 -b .datadir
+%patch0 -p1 -b .unify
 
 %build
 mkdir -p %{_target_platform}
@@ -48,11 +48,14 @@ desktop-file-edit \
 %files
 %doc COPYING
 %{_bindir}/lxqt-about
-%{_datadir}/lxqt-qt5/lxqt-about
+%{_datadir}/lxqt/lxqt-about
 %{_datadir}/applications/lxqt-about.desktop
 
 
 %changelog
+* Fri Dec 19 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-5
+- Unify naming as discussed on Fedora IRC
+
 * Thu Nov 27 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-4
 - Wrong cmake version requires