From 323a338cd7d6667a27861c07885acaffcaec8064 Mon Sep 17 00:00:00 2001 From: Than Ngo Date: May 31 2016 13:23:14 +0000 Subject: add rhel support --- diff --git a/lxqt-common.spec b/lxqt-common.spec index 4b9b5fc..5400229 100644 --- a/lxqt-common.spec +++ b/lxqt-common.spec @@ -1,7 +1,7 @@ Name: lxqt-common Summary: Common resources for LXQt desktop suite Version: 0.10.0 -Release: 10%{?dist} +Release: 11%{?dist} License: LGPLv2+ URL: http://lxqt.org/ @@ -31,10 +31,10 @@ Requires: oxygen-icon-theme Requires: redhat-menus Requires: fedora-logos Requires: desktop-backgrounds-compat +Requires: lxqt-theme %endif Requires: dbus-x11 -Requires: lxqt-theme # rhbz#1252581 - Panel does not show main menu entries Requires: lxmenu-data @@ -76,9 +76,11 @@ for desktop in %{buildroot}%{_sysconfdir}/xdg/autostart/*.desktop; do desktop-file-edit --remove-only-show-in=LXQt --add-only-show-in=X-LXQt ${desktop} done # Fedora theme +%if 0%{?fedora} pushd %{buildroot}/%{_datadir}/lxqt/themes/ tar xfJ %{SOURCE1} popd +%endif %check desktop-file-validate %{buildroot}/%{_datadir}/xsessions/lxqt.desktop @@ -110,7 +112,9 @@ fi %{_datadir}/desktop-directories/lxqt-leave.directory %{_datadir}/icons/hicolor/*/*/* %exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop +%if 0%{?fedora} %exclude %{_datadir}/lxqt/themes/Fedora +%endif %exclude %{_datadir}/kdm/sessions/lxqt.desktop %if 0%{?fedora} @@ -121,6 +125,9 @@ fi %changelog +* Tue May 31 2016 Than Ngo 0.10.0-11 +- add rhel support + * Thu Apr 28 2016 Rex Dieter - 0.10.0-10 - lxqt.conf: add fixedFont=Monospace (#1330150) - drop explicit BR: cmake (dep pulled in via use of %%cmake_lxqt macro)