summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kde-systemsettings
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-08-02 11:14:37 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-08-02 11:14:37 +0200
commit14b5a10d92e8fc60d481aba0b9f690c851ed8b71 (patch)
treea36f2ee1621a277cd3cf95b11e10d65dc499d97f /redhat/applications/kde-systemsettings
parent6548b413944f5b913bd9e1f3f9552cc0e362eb03 (diff)
downloadtde-packaging-14b5a10d92e8fc60d481aba0b9f690c851ed8b71.tar.gz
tde-packaging-14b5a10d92e8fc60d481aba0b9f690c851ed8b71.zip
RHEL/Fedora: small updates for some applications
Diffstat (limited to 'redhat/applications/kde-systemsettings')
-rw-r--r--redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec11
1 files changed, 8 insertions, 3 deletions
diff --git a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
index 320672a88..17fd66486 100644
--- a/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
+++ b/redhat/applications/kde-systemsettings/trinity-kde-systemsettings.spec
@@ -5,7 +5,9 @@
%if "%{?_prefix}" != "/usr"
%define _variant .opt
%define _docdir %{_datadir}/doc
-#define _sysconfdir %{_prefix}/etc
+
+# Currently, menu files under /etc/xdg conflict with KDE4
+%define _sysconfdir %{_prefix}/etc
%endif
# TDE 3.5.13 specific building variables
@@ -18,7 +20,7 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-systemsettings
Summary: easy to use control centre for TDE
Version: 0.0svn20070312
-Release: 3%{?dist}%{?_variant}
+Release: 4%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -99,7 +101,7 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
%defattr(-,root,root,-)
%doc README TODO
%{_sysconfdir}/xdg/menus/applications-merged/system-settings-merge.menu
-%exclude %{_sysconfdir}/xdg/menus/system-settings.menu
+%{_sysconfdir}/xdg/menus/system-settings.menu
%{_bindir}/systemsettings
%{_datadir}/applications/kde/audioencoding.desktop
%{_datadir}/applications/kde/defaultapplication.desktop
@@ -118,6 +120,9 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
%Changelog
+* Wed Jul 11 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-4
+- Fix XDG menu directory location (again)
+
* Sun Jul 08 2012 Francois Andriot <francois.andriot@free.fr> - 0.0svn20070312-3
- Updates 'Requires: trinity-guidance' to reflect package renaming