[liblxqt] - Merge qt5 datadir patch
Helio Chissini de Castro
heliocastro at fedoraproject.org
Fri Nov 7 17:42:23 UTC 2014
commit f555b9aaadda76d2dbd6119da3df03c0d7196481
Author: Helio Chissini de Castro <heliocastro at gmail.com>
Date: Fri Nov 7 15:12:51 2014 -0200
- Merge qt5 datadir patch
.gitignore | 1 +
liblxqt.spec | 33 ++++++++++++++++++++++-----------
sources | 2 +-
3 files changed, 24 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 078ccb9..4c341b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/liblxqt-0.8.0.tar.xz
+/liblxqt-0.8.0-qt5-path.patch
diff --git a/liblxqt.spec b/liblxqt.spec
index 586bbac..45eb03e 100644
--- a/liblxqt.spec
+++ b/liblxqt.spec
@@ -6,16 +6,23 @@
Name: liblxqt
Version: 0.8.0
-Release: 2%{?dist}
+Release: 3%{?dist}
License: LGPLv2
-Summary: Core utility library for LXQT
+Summary: Core shared library for LXQt desktop suite
Url: http://www.lxde.org
Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
+
BuildRequires: %{cmake_pkg} >= 2.8.9
-BuildRequires: pkgconfig(Qt5Core)
-BuildRequires: pkgconfig(Qt5X11Extras)
-BuildRequires: qt5-qttools-devel
-BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5DBus)
+BuildRequires: pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(Qt5X11Extras)
+BuildRequires: pkgconfig(Qt5Xdg) >= 1.0.0
+BuildRequires: pkgconfig(Qt5Help)
+
+Patch0: liblxqt-0.8.0-qt5-path.patch
%description
Core utility library for all LXQT components
@@ -25,18 +32,19 @@ Summary: Devel files for liblxqt
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
-LXQT libraries for development.
+LXQt libraries for development.
%prep
-%setup -q
+%autosetup -p1
%build
-mkdir build
-pushd build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
%{?cmake28}%{!?cmake28:%{?cmake}} -DUSE_QT5=ON ..
-make %{?_smp_mflags}
popd
+make %{?_smp_mflags} -C %{_target_platform}
+
%install
pushd build
%if 0%{?rhel} == 6
@@ -65,6 +73,9 @@ popd
%{_libdir}/pkgconfig/lxqt-qt5.pc
%changelog
+* Fri Nov 07 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-3
+- Merge qt5 datadir patch
+
* Fri Nov 07 2014 TI_Eugene <ti.eugene at gmail.com> 0.8.0-2
- License changed to LGPLv2
- Removed BR liblxqt-devel in -devel package
diff --git a/sources b/sources
index 5eeff71..d771890 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7159035b93fc585b173f41c96b44a523 liblxqt-0.8.0.tar.xz
+a5e4a6d14bfa98440cc0fb1c316f0a28 liblxqt-0.8.0-qt5-path.patch
More information about the scm-commits
mailing list