summaryrefslogtreecommitdiffstats
path: root/redhat/applications
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2014-05-12 21:01:49 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2014-05-12 21:01:49 +0200
commitd7d223089e5b7d84834b970ef6c9cbcb212195ba (patch)
treea6c4755a1648722fa62de541eafc416b5e30de11 /redhat/applications
parent831abc8987e241e38503fa2ca00b7eadaeb310d1 (diff)
downloadtde-packaging-d7d223089e5b7d84834b970ef6c9cbcb212195ba.tar.gz
tde-packaging-d7d223089e5b7d84834b970ef6c9cbcb212195ba.zip
RPM packaging: update R14 packages
Diffstat (limited to 'redhat/applications')
-rw-r--r--redhat/applications/tdenetworkmanager/tdenetworkmanager-14.0.0.spec6
-rw-r--r--redhat/applications/tdepowersave/tdepowersave-14.0.0.spec5
2 files changed, 9 insertions, 2 deletions
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