From: Witold Filipczyk Date: Sat, 20 Feb 2016 15:09:34 +0000 (+0100) Subject: - updated to 0.10.0 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=1af93ea36f07d47a140421ed4d8b47033a1981c3;p=packages%2Fliblxqt.git - updated to 0.10.0 - added lxqt_share_dir.patch - used --with-qm --- diff --git a/liblxqt.spec b/liblxqt.spec index 3fc0d08..718376e 100644 --- a/liblxqt.spec +++ b/liblxqt.spec @@ -1,17 +1,18 @@ # # Conditional build: # -%define qtver 5.3.1 +%define qtver 5.5.1 Summary: lxqt - libraries Summary(pl.UTF-8): lxqt - biblioteki Name: liblxqt -Version: 0.8.0 -Release: 0.2 +Version: 0.10.0 +Release: 1 License: LGPL Group: X11/Libraries -Source0: http://lxqt.org/downloads/lxqt/%{version}/%{name}-%{version}.tar.xz -# Source0-md5: 7159035b93fc585b173f41c96b44a523 +Source0: http://downloads.lxqt.org/lxqt/%{version}/%{name}-%{version}.tar.xz +# Source0-md5: 3856e2e690612c5564dc52f5b570a438 +Patch0: lxqt_share_dir.patch URL: http://www.lxqt.org/ BuildRequires: qt5-build >= %{qtver} BuildRequires: Qt5Core-devel >= %{qtver} @@ -19,9 +20,11 @@ BuildRequires: Qt5DBus-devel >= %{qtver} BuildRequires: Qt5Gui-devel >= %{qtver} BuildRequires: Qt5Gui-platform-directfb >= %{qtver} BuildRequires: Qt5Gui-platform-egl >= %{qtver} -BuildRequires: Qt5Gui-platform-kms >= %{qtver} +BuildRequires: Qt5Gui-platform-eglfs-kms >= %{qtver} +BuildRequires: Qt5X11Extras-devel >= %{qtver} BuildRequires: Qt5Xml-devel >= %{qtver} BuildRequires: cmake >= 2.8.3 +BuildRequires: kf5-kwindowsystem-devel BuildRequires: libqtxdg-devel >= 1.0.0 BuildRequires: xz-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -49,13 +52,13 @@ pisaniu własnych programów wykorzystujących lxqt. %prep %setup -q +%patch0 -p1 %build install -d build cd build %cmake \ - -DUSE_QT5=ON \ - ../ + ../ %{__make} @@ -65,62 +68,25 @@ rm -rf $RPM_BUILD_ROOT %{__make} -C build install \ DESTDIR=$RPM_BUILD_ROOT +%find_lang %{name} --with-qm + %clean rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files +%files -f %{name}.lang %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/liblxqt-qt5.so.*.*.* -%ghost %{_libdir}/liblxqt-qt5.so.0 -%dir %{_datadir}/lxqt-qt5 -%dir %{_datadir}/lxqt-qt5/translations -%dir %{_datadir}/lxqt-qt5/translations/liblxqt -%lang(ar) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_ar.qm -%lang(cs) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_cs.qm -%lang(cs_CZ) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_cs_CZ.qm -%lang(da) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_da.qm -%lang(da_DK) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_da_DK.qm -%lang(de) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_de.qm -%lang(de_DE) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_de_DE.qm -%lang(el) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_el_GR.qm -%lang(eo) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_eo.qm -%lang(es) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_es.qm -%lang(es_VE) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_es_VE.qm -%lang(eu) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_eu.qm -%lang(fi) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_fi.qm -%lang(fr) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_fr_FR.qm -%lang(hu) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_hu.qm -%lang(ia) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_ia.qm -%lang(id) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_id_ID.qm -%lang(it) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_it_IT.qm -%lang(ja) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_ja.qm -%lang(ko) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_ko.qm -%lang(lt) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_lt.qm -%lang(nl) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_nl.qm -%lang(pl) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_pl_PL.qm -%lang(pt) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_pt.qm -%lang(pt_BR) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_pt_BR.qm -%lang(ro) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_ro_RO.qm -%lang(ru) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_ru.qm -%lang(ru_RU) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_ru_RU.qm -%lang(sk) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_sk_SK.qm -%lang(sl) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_sl.qm -%lang(sl) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_sr@latin.qm -%lang(sr) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_sr_RS.qm -%lang(th) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_th_TH.qm -%lang(tr) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_tr.qm -%lang(uk) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_uk.qm -%lang(zh_CN) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_zh_CN.qm -%lang(zh_TW) %{_datadir}/lxqt-qt5/translations/liblxqt/liblxqt_zh_TW.qm +%dir %{_datadir}/lxqt +%dir %{_datadir}/lxqt/translations +%dir %{_datadir}/lxqt/translations/liblxqt +%attr(755,root,root) %{_libdir}/liblxqt.so.*.*.* +%ghost %{_libdir}/liblxqt.so.0 %files devel %defattr(644,root,root,755) -%{_includedir}/lxqt-qt5 -%{_libdir}/liblxqt-qt5.so -%{_pkgconfigdir}/lxqt-qt5.pc -%{_datadir}/cmake/lxqt-qt5 - - +%{_includedir}/lxqt +%{_libdir}/liblxqt.so +%{_pkgconfigdir}/lxqt.pc +%{_datadir}/cmake/lxqt diff --git a/lxqt_share_dir.patch b/lxqt_share_dir.patch new file mode 100644 index 0000000..400d5c8 --- /dev/null +++ b/lxqt_share_dir.patch @@ -0,0 +1,11 @@ +--- liblxqt-0.10.0/CMakeLists.txt.orig 2015-11-02 08:12:49.000000000 +0100 ++++ liblxqt-0.10.0/CMakeLists.txt 2016-02-20 16:01:06.469438015 +0100 +@@ -163,7 +163,7 @@ include(create_portable_headers) + set(LXQT_VERSION ${LXQT_MAJOR_VERSION}.${LXQT_MINOR_VERSION}.${LXQT_PATCH_VERSION}) + 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_SHARE_DIR "${CMAKE_INSTALL_DATAROOTDIR}/${LXQT_RELATIVE_SHARE_DIR}") + set(LXQT_RELATIVE_TRANSLATIONS_DIR "${LXQT_LIBRARY_NAME}/translations") + set(LXQT_TRANSLATIONS_DIR "${LXQT_SHARE_DIR}/translations") +