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

[Helio Chissini de Castro]

commit ba5902f1c1c8927b7737518d63761b9a8c0e4311
Author: Helio Chissini de Castro <helio at kde.org>
Date:   Fri Dec 19 19:23:48 2014 -0200

    - Unify naming as discussed on Fedora IRC

 lxqt-globalkeys-0.8.0-cmake_libdir.patch |   52 ++++++++++++++++++++++++++---
 lxqt-globalkeys.spec                     |   29 +++++++++-------
 2 files changed, 62 insertions(+), 19 deletions(-)
---
diff --git a/lxqt-globalkeys-0.8.0-cmake_libdir.patch b/lxqt-globalkeys-0.8.0-cmake_libdir.patch
index 6d9ea9e..2cb23d6 100644
--- a/lxqt-globalkeys-0.8.0-cmake_libdir.patch
+++ b/lxqt-globalkeys-0.8.0-cmake_libdir.patch
@@ -1,5 +1,5 @@
---- lxqt-globalkeys-0.8.0/CMakeLists.txt.orig	2014-11-10 11:07:43.362781168 -0200
-+++ lxqt-globalkeys-0.8.0/CMakeLists.txt	2014-11-10 11:21:21.660368850 -0200
+--- lxqt-globalkeys-0.8.0/CMakeLists.txt.unify	2014-10-10 20:41:14.000000000 -0300
++++ lxqt-globalkeys-0.8.0/CMakeLists.txt	2014-12-19 19:20:03.678530145 -0200
 @@ -8,6 +8,8 @@
  	set(CMAKE_BUILD_TYPE Release)
  endif()
@@ -9,20 +9,42 @@
  # Set default library installation path
  set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation directory for libraries")
  
-@@ -34,8 +36,12 @@
+@@ -16,26 +18,29 @@
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+ set(CMAKE_AUTOMOC ON)
++
++find_package(lxqt REQUIRED QUIET)
+ if(USE_QT5)
+     cmake_minimum_required(VERSION 2.8.11)
+     find_package(Qt5Widgets REQUIRED)
+     find_package(Qt5DBus REQUIRED)
+     find_package(Qt5LinguistTools REQUIRED QUIET)
+-    find_package(lxqt-qt5 REQUIRED QUIET)
+-    set(QT_VERSION_SUFFIX "-qt5")
+     message(STATUS "Building with Qt${Qt5Core_VERSION_STRING}")
+ else()
+     set(QT_USE_QTDBUS 1)
+     find_package(Qt4 REQUIRED)
+     include(${QT_USE_FILE})
+     find_package(LXQT REQUIRED)
+-    set(QT_VERSION_SUFFIX "")
+     message(STATUS "Building with Qt${QTVERSION}")
  endif()
  include(${LXQT_USE_FILE})
  
+-set(LXQT_GLOBALKEYS_LIBRARY_NAME lxqt-globalkeys${QT_VERSION_SUFFIX})
+-set(LXQT_GLOBALKEYS_UI_LIBRARY_NAME lxqt-globalkeys-ui${QT_VERSION_SUFFIX})
 +# Standard directories for installation
 +include(GNUInstallDirs)
 +
- set(LXQT_GLOBALKEYS_LIBRARY_NAME lxqt-globalkeys${QT_VERSION_SUFFIX})
- set(LXQT_GLOBALKEYS_UI_LIBRARY_NAME lxqt-globalkeys-ui${QT_VERSION_SUFFIX})
++set(LXQT_GLOBALKEYS_LIBRARY_NAME lxqt-globalkeys)
++set(LXQT_GLOBALKEYS_UI_LIBRARY_NAME lxqt-globalkeys-ui)
 +set(LXQT_INSTALL_CMAKE_DIR     ${CMAKE_INSTALL_FULL_LIBDIR}/cmake)
  
  #************************************************
  # Build config.cmake files
-@@ -74,11 +80,11 @@
+@@ -74,11 +79,11 @@
  add_subdirectory(client)
  add_subdirectory(ui)
  
@@ -38,3 +60,21 @@
  
  # building tarball with CPack -------------------------------------------------
  include (InstallRequiredSystemLibraries)
+--- lxqt-globalkeys-0.8.0/ui/CMakeLists.txt.unify	2014-12-19 19:21:16.915703890 -0200
++++ lxqt-globalkeys-0.8.0/ui/CMakeLists.txt	2014-12-19 19:21:39.428757299 -0200
+@@ -7,14 +7,13 @@
+ 	set(QT_DBUS_PREFIX "org.qtproject")
+ endif()
+ 
++set(LXQT_GLOBALKEYS_LIBRARY lxqt-globalkeys)
+ if(USE_QT5)
+     set(QTX_INCLUDE_DIRS "")
+     set(QTX_LIBRARIES Qt5::Widgets Qt5::DBus)
+-    set(LXQT_GLOBALKEYS_LIBRARY lxqt-globalkeys-qt5)
+ else()
+     set(QTX_INCLUDE_DIRS ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTDBUS_DIR})
+     set(QTX_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY})
+-    set(LXQT_GLOBALKEYS_LIBRARY lxqt-globalkeys)
+ endif()
+ set(${PROJECT_NAME}_HEADER_NAMESPACE "LXQtGlobalKeysUi")
+ 
diff --git a/lxqt-globalkeys.spec b/lxqt-globalkeys.spec
index 12b6f11..9e0cbc4 100644
--- a/lxqt-globalkeys.spec
+++ b/lxqt-globalkeys.spec
@@ -7,14 +7,14 @@
 Name:    lxqt-globalkeys
 Summary: Global keys utility for LXQt desktop suite
 Version: 0.8.0
-Release: 4%{?dist}
-License: LGPLv2
+Release: 5%{?dist}
+License: LGPLv2+
 URL:     http://lxqt.org/
 Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
 Patch0:  lxqt-globalkeys-0.8.0-cmake_libdir.patch
 
 BuildRequires:  %{cmake_pkg} >= 2.8.9
-BuildRequires: pkgconfig(lxqt-qt5)
+BuildRequires: pkgconfig(lxqt)
 BuildRequires: pkgconfig(Qt5Help)
 BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0
 BuildRequires: desktop-file-utils
@@ -32,7 +32,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %prep
 %setup
 
-%patch0 -p1
+%patch0 -p1 -b .unify
 
 %build
 mkdir -p %{_target_platform}
@@ -56,22 +56,25 @@ desktop-file-edit --remove-category=LXQt --add-category=X-LXQt \
 %doc COPYING
 %{_bindir}/lxqt-globalkeysd
 %{_bindir}/lxqt-config-globalkeyshortcuts
-%{_datadir}/lxqt-qt5/translations/lxqt-config-globalkeyshortcuts
+%{_datadir}/lxqt/translations/lxqt-config-globalkeyshortcuts
 %{_datadir}/applications/lxqt-config-globalkeyshortcuts.desktop
-%{_libdir}/liblxqt-globalkeys-qt5.so.0*
-%{_libdir}/liblxqt-globalkeys-ui-qt5.so.0*
+%{_libdir}/liblxqt-globalkeys.so.0*
+%{_libdir}/liblxqt-globalkeys-ui.so.0*
 
 %files devel
-%{_includedir}/lxqt-globalkeys-qt5
-%{_includedir}/lxqt-globalkeys-ui-qt5
-%{_libdir}/liblxqt-globalkeys-qt5.so
-%{_libdir}/liblxqt-globalkeys-ui-qt5.so
+%{_includedir}/lxqt-globalkeys
+%{_includedir}/lxqt-globalkeys-ui
+%{_libdir}/liblxqt-globalkeys.so
+%{_libdir}/liblxqt-globalkeys-ui.so
 %{_libdir}/pkgconfig/*.pc
-%{_libdir}/cmake/lxqt-globalkeys-ui-qt5
-%{_libdir}/cmake/lxqt-globalkeys-qt5
+%{_libdir}/cmake/lxqt-globalkeys-ui
+%{_libdir}/cmake/lxqt-globalkeys
 
 
 %changelog
+* Fri Dec 19 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-5
+- Unify naming as discussed on Fedora IRC
+
 * Mon Nov 10 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-4
 - Update with fixes from review request on https://bugzilla.redhat.com/show_bug.cgi?id=1159826
 - removed autosetup in favor of standard setup macro