Author: mguevara Date: Thu Mar 22 21:01:24 2012 GMT Module: packages Tag: HEAD ---- Log message: - 3.0.6-3 added fvwm-crystal-scripts.patch; moved trayer and xmms-shell from requires to suggests
---- Files affected: packages/fvwm-crystal: fvwm-crystal.spec (1.36 -> 1.37) , fvwm-crystal-scripts.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/fvwm-crystal/fvwm-crystal.spec diff -u packages/fvwm-crystal/fvwm-crystal.spec:1.36 packages/fvwm-crystal/fvwm-crystal.spec:1.37 --- packages/fvwm-crystal/fvwm-crystal.spec:1.36 Tue Apr 12 22:46:37 2011 +++ packages/fvwm-crystal/fvwm-crystal.spec Thu Mar 22 22:01:19 2012 @@ -3,12 +3,13 @@ Summary(pl.UTF-8): Graficzne środowisko robocze Name: fvwm-crystal Version: 3.0.6 -Release: 1 +Release: 3 Epoch: 1 License: GPL v2+ Group: X11/Window Managers Source0: http://download.gna.org/fvwm-crystal/%{version}/%{name}-%{version}.tar.gz # Source0-md5: 82e2800882abb2c822519f1aa4dc0c72 +Patch0: %{name}-scripts.patch URL: http://www.fvwm-crystal.org/ BuildRequires: sed >= 4.0 Requires: ImageMagick @@ -22,9 +23,11 @@ Requires: rox Requires: scrot Requires: sudo -Requires: trayer -Requires: xmms-shell Requires: xscreensaver +Suggests: trayer +Suggests: xmms-shell +Suggests: urxvt +Suggests: mrxvt BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -40,6 +43,7 @@ %prep %setup -q +%patch0 -p1 %install rm -rf $RPM_BUILD_ROOT @@ -87,6 +91,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2012/03/22 21:01:19 mguevara +- 3.0.6-3 added fvwm-crystal-scripts.patch; moved trayer and xmms-shell + from requires to suggests + Revision 1.36 2011/04/12 20:46:37 evil - up to 3.0.6 ================================================================ Index: packages/fvwm-crystal/fvwm-crystal-scripts.patch diff -u /dev/null packages/fvwm-crystal/fvwm-crystal-scripts.patch:1.1 --- /dev/null Thu Mar 22 22:01:24 2012 +++ packages/fvwm-crystal/fvwm-crystal-scripts.patch Thu Mar 22 22:01:19 2012 @@ -0,0 +1,23 @@ +diff -NurpP --minimal fvwm-crystal-3.0.6/fvwm/components/scripts.orig/FvwmScript-CpuTemp fvwm-crystal-3.0.6/fvwm/components/scripts/FvwmScript-CpuTemp +--- fvwm-crystal-3.0.6/fvwm/components/scripts.orig/FvwmScript-CpuTemp 2008-06-23 22:43:48.000000000 +0200 ++++ fvwm-crystal-3.0.6/fvwm/components/scripts/FvwmScript-CpuTemp 2012-03-22 21:41:30.619849047 +0100 +@@ -10,7 +10,8 @@ Colorset 1 + Init + Begin + Set $temp_prev = 1 +- Set $temp = (GetOutput {cat /proc/acpi/thermal_zone/TH*/temperature} 1 2) ++ Set $tempp = (GetOutput {cat /sys/devices/platform/coretemp.0/temp?_input /proc/acpi/thermal_zone/TH*/temperature /sys/devices/virtual/thermal/thermal_zone0/temp 2>/dev/null| sort -rn | head -n 1 } 1 1) ++ Set $temp = (Div $tempp 1000) + Set $tmp = $temp °C + ChangeTitle 1 $tmp + End +@@ -19,7 +20,8 @@ PeriodicTasks + Begin + If (RemainderOfDiv (GetTime) 2)==0 Then + Begin +- Set $temp = (GetOutput {cat /proc/acpi/thermal_zone/TH*/temperature} 1 2) ++ Set $tempp = (GetOutput {cat /sys/devices/platform/coretemp.0/temp?_input /proc/acpi/thermal_zone/TH*/temperature /sys/devices/virtual/thermal/thermal_zone0/temp 2>/dev/null| sort -rn | head -n 1 } 1 1) ++ Set $temp = (Div $tempp 1000) + Set $tmp = $temp °C + + If $temp==$temp_prev Then ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/fvwm-crystal/fvwm-crystal.spec?r1=1.36&r2=1.37 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
