diff options
| author | albator <albator@arcadia.vtf> | 2011-11-11 21:28:43 +0100 |
|---|---|---|
| committer | albator <albator@arcadia.vtf> | 2011-11-11 21:28:43 +0100 |
| commit | 21700c329b74f3e0e97ab6dedb674976493c5005 (patch) | |
| tree | 59b428209b4aff4c27a10dbaf1510c6a6010104c /redhat | |
| parent | b3e5f705c4684e569ed06003a65e76b6d5075bc6 (diff) | |
| download | tde-packaging-21700c329b74f3e0e97ab6dedb674976493c5005.tar.gz tde-packaging-21700c329b74f3e0e97ab6dedb674976493c5005.zip | |
RHEL/Fedora: remove 'dpkg' commands from klaptopdaemon
Diffstat (limited to 'redhat')
| -rw-r--r-- | redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch | 31 | ||||
| -rwxr-xr-x | redhat/kdeutils/trinity-kdeutils-3.5.13.spec | 12 |
2 files changed, 41 insertions, 2 deletions
diff --git a/redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch b/redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch new file mode 100644 index 000000000..faff103f4 --- /dev/null +++ b/redhat/kdeutils/kdeutils-3.5.13-klaptopdaemon_dpkg_command.patch @@ -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 { diff --git a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec index fab189481..6519e8aa2 100755 --- a/redhat/kdeutils/trinity-kdeutils-3.5.13.spec +++ b/redhat/kdeutils/trinity-kdeutils-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %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 "%{?_prefix}" != "/usr" @@ -41,7 +41,11 @@ BuildRequires: trinity-arts BuildRequires: trinity-kdelibs # 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(postun): /sbin/ldconfig @@ -112,6 +116,7 @@ More Utilities for the K Desktop Environment: %setup -q -n kdeutils %patch1 -p1 -b .label +%patch2 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -342,6 +347,9 @@ done %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 - Updates BuildRequires |