[packages/apcupsd] - up to 3.14.12

arekm arekm at pld-linux.org
Sun Sep 21 00:00:27 CEST 2014


commit d483a27066575e279a0948e59f28a7ba37083601
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Sep 21 00:00:24 2014 +0200

    - up to 3.14.12

 apcupsd-pcnet-seconds.patch | 12 ------------
 apcupsd.spec                | 10 +++++-----
 2 files changed, 5 insertions(+), 17 deletions(-)
---
diff --git a/apcupsd.spec b/apcupsd.spec
index 976780f..b8797a3 100644
--- a/apcupsd.spec
+++ b/apcupsd.spec
@@ -10,17 +10,17 @@
 Summary:	Power management software for APC UPS hardware
 Summary(pl.UTF-8):	Oprogramowanie do zarządzania energią dla UPS-ów APC
 Name:		apcupsd
-Version:	3.14.10
-Release:	4
+Version:	3.14.12
+Release:	1
 License:	GPL v2
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/apcupsd/%{name}-%{version}.tar.gz
-# Source0-md5:	5928822d855c5cf7ac29655e3e0b8c23
+# Source0-md5:	08bf201acea6b4dd69cf2fb0eecfd55e
 Source1:	%{name}.init
 Source2:	%{name}.logrotate
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-configure.patch
-Patch1:		%{name}-pcnet-seconds.patch
+
 Patch2:		format-security.patch
 Patch3:		shutdown.patch
 Patch4:		cxxld.patch
@@ -96,7 +96,7 @@ serwera NIS. Status każdego UPS-a przedstawia ikona.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
diff --git a/apcupsd-pcnet-seconds.patch b/apcupsd-pcnet-seconds.patch
deleted file mode 100644
index b993ee6..0000000
--- a/apcupsd-pcnet-seconds.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr apcupsd-3.14.4/src/drivers/pcnet/pcnet.c apcupsd-3.14.4.new/src/drivers/pcnet/pcnet.c
---- apcupsd-3.14.4/src/drivers/pcnet/pcnet.c	2007-10-06 16:52:52.000000000 +0200
-+++ apcupsd-3.14.4.new/src/drivers/pcnet/pcnet.c	2008-12-14 10:35:02.240131748 +0100
-@@ -208,7 +208,7 @@
-       break;
-    case CI_RUNTIM:
-       Dmsg1(80, "Got CI_RUNTIM: %s\n", value);
--      ups->TimeLeft = atof(value);
-+      ups->TimeLeft = atof(value) / 60;
-       break;
-    case CI_ITEMP:
-       Dmsg1(80, "Got CI_ITEMP: %s\n", value);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/apcupsd.git/commitdiff/d483a27066575e279a0948e59f28a7ba37083601



More information about the pld-cvs-commit mailing list