- up to 3.14.12

diff --git a/apcupsd-pcnet-seconds.patch b/apcupsd-pcnet-seconds.patch
deleted file mode 100644 (file)
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);

diff --git a/apcupsd.spec b/apcupsd.spec
index 976780f185f6fc3be45bbe49fec97544ab713f9e..b8797a35a0546bfde6e0b52985977c48519b4f50 100644 (file)
--- 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