From d7d223089e5b7d84834b970ef6c9cbcb212195ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Mon, 12 May 2014 21:01:49 +0200 Subject: RPM packaging: update R14 packages --- redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec | 6 ++++++ redhat/applications/tdepowersave/tdepowersave-14.0.0.spec | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'redhat/applications') diff --git a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec index 5ca9c119a..a18b76755 100644 --- a/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec +++ b/redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec @@ -141,6 +141,12 @@ update-desktop-database %{tde_appdir} > /dev/null /sbin/ldconfig touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : +# Prevent autostart of 'nm-applet', if installed. +if [ -r "/etc/xdg/autostart/nm-applet.desktop" ]; then + if ! grep -qw "TDE" "/etc/xdg/autostart/nm-applet.desktop" ; then + sed -i "/etc/xdg/autostart/nm-applet.desktop" -e "s|\(NotShowIn=.*\)|\1TDE;|" + fi +fi %postun update-desktop-database %{tde_appdir} > /dev/null diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index ef4ff6353..288aed62d 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -40,7 +40,8 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -#Patch0: tdepowersave-14.0.0-test.patch + +Patch1: 1391880088:c68a1bac04c5cfdb0cdcbd91dc54995bfa05e292.diff BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -88,7 +89,7 @@ settings for: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -#patch0 -p1 -b .test +%patch1 -R -p1 %build -- cgit v1.2.3