diff --git a/lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz b/lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9048db38c7d13e4c295d173c356079544fe23c53 Binary files /dev/null and b/lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz differ diff --git a/lm_sensors.spec b/lm_sensors.spec index e7331dc8032bde81bc569cfd628d8e8db62e5c34..8ed70d5a5d9e446fb2a3b0759bf2eca975781a82 100644 --- a/lm_sensors.spec +++ b/lm_sensors.spec @@ -1,15 +1,15 @@ Name: lm_sensors -Version: 3.6.0 -Release: 1 +Version: 3.4.0 +Release: 21 Summary: Linux-monitoring sensors # lib/libsensors.3 is licensed Verbatim # dist-git files are licensed MIT # and others are licensed by GPLv2+ or LGPLv2+ License: LGPLv2+ and GPLv2+ and Verbatim and MIT -URL: https://github.com/lm-sensors/lm-sensors +URL: http://github.com/groeck/lm-sensors -# Source0 is https://github.com/lm-sensors/lm-sensors/archive/V3-6-0.tar.gz -Source0: V3-6-0.tar.gz +# Source0 is https://github.com/lm-sensors/lm-sensors/archive/70f7e0848410b9ca4dde7abff669bbbecbf137e0.zip +Source0: lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0.tar.gz Source1: lm_sensors.sysconfig Source2: sensord.sysconfig Source3: lm_sensors-modprobe-wrapper @@ -17,6 +17,7 @@ Source4: lm_sensors-modprobe-r-wrapper Source5: sensord.service Source6: sensord-service-wrapper Source7: lm_sensors.service +Patch6000:pwmconfig-Fix-a-sed-expression.patch Requires: kmod, systemd-units BuildRequires: kernel-headers >= 2.2.16, bison, libsysfs-devel, flex, gawk @@ -60,7 +61,7 @@ Summary: Help information for user Help information for user %prep -%autosetup -n lm-sensors-3-6-0 -p1 +%autosetup -n lm-sensors-70f7e0848410b9ca4dde7abff669bbbecbf137e0 -p1 rm -f prog/init/sysconfig-lm_sensors-convert prog/hotplug/unhide_ICH_SMBus mv prog/init/README prog/init/README.initscripts chmod -x prog/init/fancontrol.init @@ -160,8 +161,8 @@ fi %exclude %{_mandir}/man8/sensord.8.gz %changelog -* Wed Jan 15 2020 openEuler Buildteam - 3.6.0-1 -- upgrade package to 3.6.0 +* Thu Jan 16 2020 openEuler Buildteam - 3.4.0-21 +- revert package and turn off service file * Mon Dec 30 2019 openEuler Buildteam - 3.4.0-20 - update spec diff --git a/pwmconfig-Fix-a-sed-expression.patch b/pwmconfig-Fix-a-sed-expression.patch new file mode 100644 index 0000000000000000000000000000000000000000..a79e73a270f70c8f01a91d5fea0a4aefb4b88c25 --- /dev/null +++ b/pwmconfig-Fix-a-sed-expression.patch @@ -0,0 +1,34 @@ +From 38220cc2e97215588b662584d6ad84d63415842f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= +Date: Thu, 20 Sep 2018 21:17:40 +0200 +Subject: [PATCH 094/117] pwmconfig: Fix a sed expression +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes commit 3daae37d58cd. +The escaping inside backticks is really kinda crazy. + +Fixes #126 + +Signed-off-by: Ondřej Lysoněk +--- + prog/pwm/pwmconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/prog/pwm/pwmconfig b/prog/pwm/pwmconfig +index c24c891..a40acd5 100755 +--- a/prog/pwm/pwmconfig ++++ b/prog/pwm/pwmconfig +@@ -879,7 +879,7 @@ select pwms in $pwmactive "Change INTERVAL" "Just quit" "Save and quit" "Show co + break ;; + + "$(echo ${pwmactive} |sed -e 's/ /\n/g' | egrep "${pwms}")" ) +- pwmsed=$(echo ${pwms} | sed -e 's/\//\\\\\//g') #escape / for sed ++ pwmsed=$(echo ${pwms} | sed -e 's/\//\\\//g') #escape / for sed + echo + + echo 'Devices:' +-- +1.8.3.1 +