diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-10-09 21:25:19 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-10-09 21:25:19 +0200 |
| commit | bd0ff7568ce64694ae7b1a180c1cc3654f4e60a9 (patch) | |
| tree | 6074483ea9db86f4e118bd3ee987b9f78f63f143 /redhat/applications/tde-guidance | |
| parent | 1b75a8a69eb58af5ed985debdf5020df147d1df5 (diff) | |
| parent | 26882ca86584e3ceecc0104ddfbf4f9d118c8e04 (diff) | |
| download | tde-packaging-bd0ff7568ce64694ae7b1a180c1cc3654f4e60a9.tar.gz tde-packaging-bd0ff7568ce64694ae7b1a180c1cc3654f4e60a9.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/applications/tde-guidance')
| -rw-r--r-- | redhat/applications/tde-guidance/tde-guidance-14.0.0.spec | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec index 1cd956ab3..65838ef05 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: tde-guidance-14.0.0-tqt3.patch +#Patch1: tde-guidance-14.0.0-tqt3.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -146,7 +146,9 @@ or can be run as standalone applications. %exclude %{tde_datadir}/apps/guidance/MonitorsDB # Files from powermanager +%if 0%{?with_powermanager} %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%endif %exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png %exclude %{tde_datadir}/apps/guidance/pics/battery*.png %exclude %{tde_datadir}/apps/guidance/pics/processor.png @@ -259,7 +261,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .tqt3 +#patch1 -p1 -b .tqt3 %if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} %__sed -i "userconfig/unixauthdb.py" \ |