[liblxqt/f21] - Simplify data dir as discussed on irc.

[Helio Chissini de Castro]

commit 0408f92d620ef69683c98f4a7a10caf91fc4fe37
Author: Helio Chissini de Castro <helio at kde.org>
Date:   Fri Dec 19 16:59:12 2014 -0200

    - Simplify data dir as discussed on irc.

 liblxqt-0.8.0-cmake_libdir.patch |   36 ++++++++++++++++++++++++++++--------
 liblxqt-0.8.0-qt5-path.patch     |   30 ------------------------------
 liblxqt.spec                     |   25 +++++++++++++------------
 3 files changed, 41 insertions(+), 50 deletions(-)
---
diff --git a/liblxqt-0.8.0-cmake_libdir.patch b/liblxqt-0.8.0-cmake_libdir.patch
index 2293724..b9b59d5 100644
--- a/liblxqt-0.8.0-cmake_libdir.patch
+++ b/liblxqt-0.8.0-cmake_libdir.patch
@@ -1,10 +1,31 @@
-diff -up liblxqt-0.8.0/cmake/create_pkgconfig_file.cmake liblxqt-0.8.0/cmake/create_pkgconfig_file
-diff -up liblxqt-0.8.0/cmake/create_portable_headers.cmake liblxqt-0.8.0/cmake/create_portable_headers
-diff -up liblxqt-0.8.0/cmake/FindInstallConfigPath.cmake liblxqt-0.8.0/cmake/FindInstallConfigPath
-diff -up liblxqt-0.8.0/CMakeLists.txt.cmake liblxqt-0.8.0/CMakeLists.txt
---- liblxqt-0.8.0/CMakeLists.txt.cmake	2014-10-13 14:34:04.000000000 -0500
-+++ liblxqt-0.8.0/CMakeLists.txt	2014-11-08 06:51:31.711708807 -0600
-@@ -214,7 +214,7 @@ set(LXQT_INTREE_INCLUDE_DIR     ${CMAKE_
+--- liblxqt-0.8.0/CMakeLists.txt.cmake_libdir	2014-10-13 16:34:04.000000000 -0300
++++ liblxqt-0.8.0/CMakeLists.txt	2014-12-19 16:44:36.196894252 -0200
+@@ -153,7 +153,6 @@
+     )
+ 
+     set(LXQT_QT_VERSION "5")
+-    set(LXQT_QT_VERSION_SUFFIX "-qt5")
+     set(LXQT_PKG_CONFIG_REQUIRES "Qt5Widgets Qt5Xml Qt5DBus Qt5X11Extras")
+ else()
+     find_package(Qt4 REQUIRED QtCore QtGui QUIET)
+@@ -180,7 +179,6 @@
+     )
+ 
+     set(LXQT_QT_VERSION "4")
+-    set(LXQT_QT_VERSION_SUFFIX "")
+     set(LXQT_PKG_CONFIG_REQUIRES "QtCore, QtXml")
+ endif()
+ 
+@@ -204,7 +202,7 @@
+ include(GNUInstallDirs)
+ 
+ set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSION})
+-set(LXQT_LIBRARY_NAME "lxqt${LXQT_QT_VERSION_SUFFIX}")
++set(LXQT_LIBRARY_NAME "lxqt" CACHE STRING "lxqt")
+ set(LXQT_RELATIVE_SHARE_DIR "${LXQT_LIBRARY_NAME}")
+ set(LXQT_SHARE_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/${LXQT_RELATIVE_SHARE_DIR})
+ set(LXQT_RELATIVE_TRANSLATIONS_DIR "${LXQT_LIBRARY_NAME}/translations")
+@@ -214,7 +212,7 @@
  set(LXQT_INTREE_TARGETS_FILE    ${CMAKE_BINARY_DIR}/${LXQT_LIBRARY_NAME}-targets.cmake)
  
  set(LXQT_INSTALL_INCLUDE_DIR   ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${LXQT_LIBRARY_NAME})
@@ -13,4 +34,3 @@ diff -up liblxqt-0.8.0/CMakeLists.txt.cmake liblxqt-0.8.0/CMakeLists.txt
  
  include(cmake/FindInstallConfigPath.cmake)
  include(create_portable_headers)
-diff -up liblxqt-0.8.0/x86_64-redhat-linux-gnu/CMakeFiles/3.0.2/CMakeSystem.cmake liblxqt-0.8.0/x86_64-redhat-linux-gnu/CMakeFiles/3.0.2/CMakeSystem
diff --git a/liblxqt.spec b/liblxqt.spec
index ae7ec9f..633effc 100644
--- a/liblxqt.spec
+++ b/liblxqt.spec
@@ -6,7 +6,7 @@
 
 Name:		liblxqt
 Version:	0.8.0
-Release:	8%{?dist}
+Release:	9%{?dist}
 License:	LGPLv2
 Summary:	Core shared library for LXQt desktop suite
 Url:		http://www.lxde.org
@@ -22,9 +22,8 @@ BuildRequires: pkgconfig(Qt5X11Extras)
 BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0
 BuildRequires: pkgconfig(Qt5Help)
 
-Patch0: liblxqt-0.8.0-qt5-path.patch
 # upstreamable, move .cmake files to libdir (avoids multilib conflicts)
-Patch1: liblxqt-0.8.0-cmake_libdir.patch
+Patch0: liblxqt-0.8.0-cmake_libdir.patch
 
 Requires: xdg-utils >= 1.1.0
 
@@ -41,8 +40,7 @@ LXQt libraries for development.
 %prep
 %setup
 
-%patch0 -p1 -b .qt5-path
-%patch1 -p1 -b .cmake_libdir
+%patch0 -p1 -b .cmake_libdir
 
 %build
 mkdir -p %{_target_platform}
@@ -66,17 +64,20 @@ rm -f %{buildroot}/%{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_sr at latin.qm
 
 %files -f %{name}.lang
 %doc AUTHORS COPYING
-%{_libdir}/liblxqt-qt5.so.0*
-%dir %{_datadir}/lxqt-qt5/
-%dir %{_datadir}/lxqt-qt5/translations/
+%{_libdir}/liblxqt.so.0*
+%dir %{_datadir}/lxqt/
+%dir %{_datadir}/lxqt/translations/
 
 %files devel
-%{_libdir}/liblxqt-qt5.so
-%{_includedir}/lxqt-qt5/
-%{_libdir}/cmake/lxqt-qt5/
-%{_libdir}/pkgconfig/lxqt-qt5.pc
+%{_libdir}/liblxqt.so
+%{_includedir}/lxqt/
+%{_libdir}/cmake/lxqt/
+%{_libdir}/pkgconfig/lxqt.pc
 
 %changelog
+* Fri Dec 19 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-9
+- As discussed on irc channel, let's simplify to keep only lxqt share data dir
+
 * Tue Dec 16 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-8
 - requires xdg-utils.