RHEL/Fedora: remove 'dpkg' commands from klaptopdaemon

pull/3/head
albator 13 years ago
parent b3e5f705c4
commit 21700c329b

@ -0,0 +1,31 @@
--- kdeutils/klaptopdaemon/acpi.cpp.ORI 2011-11-11 17:44:28.515033721 +0100
+++ kdeutils/klaptopdaemon/acpi.cpp 2011-11-11 17:50:52.703492308 +0100
@@ -178,7 +178,7 @@
proc << kdesu;
proc << "-u";
proc << "root";
- proc << "dpkg-statoverride --update --add root root 6755 "+helper;
+ proc << "chown root "+helper+"; chmod +s "+helper;
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
}
} else {
--- kdeutils/klaptopdaemon/apm.cpp.ORI 2011-11-11 17:45:11.515912373 +0100
+++ kdeutils/klaptopdaemon/apm.cpp 2011-11-11 17:51:07.095195808 +0100
@@ -166,7 +166,7 @@
proc << kdesu;
proc << "-u";
proc << "root";
- proc << TQString("dpkg-statoverride --update --add root root 6755 ")+apm_name;
+ proc << TQString("chown root ")+apm_name+TQString("; chmod +s ")+apm_name;
proc.start(KProcess::Block); // run it sync so has_apm below sees the results
}
} else {
@@ -200,7 +200,7 @@
proc << kdesu;
proc << "-u";
proc << "root";
- proc << "dpkg-statoverride --update --add root root 6755 "+helper;
+ proc << "chown root "+helper+"; chmod +s "+helper;
proc.start(KProcess::Block); // run it sync so has_acpi below sees the results
}
} else {

@ -2,7 +2,7 @@
%if "%{?version}" == "" %if "%{?version}" == ""
%define version 3.5.13 %define version 3.5.13
%endif %endif
%define release 2 %define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr" %if "%{?_prefix}" != "/usr"
@ -43,6 +43,10 @@ BuildRequires: trinity-kdelibs
# RedHat / Fedora legacy patches # RedHat / Fedora legacy patches
Patch1: kdf-3.0.2-label.patch Patch1: kdf-3.0.2-label.patch
# TDE 3.5.13 RHEL/Fedora patches
## [kdeutils/klaptodaemon] removes dpkg commands
Patch2: kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
@ -112,6 +116,7 @@ More Utilities for the K Desktop Environment:
%setup -q -n kdeutils %setup -q -n kdeutils
%patch1 -p1 -b .label %patch1 -p1 -b .label
%patch2 -p1
# Ugly hack to modify TQT include directory inside autoconf files. # Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@ -342,6 +347,9 @@ done
%changelog %changelog
* Fri Nov 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3
- Removes 'dpkg' commands inside klaptopdaemon
* Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 * Fri Nov 04 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2
- Updates BuildRequires - Updates BuildRequires

Loading…
Cancel
Save