- up to 2.6.5

diff --git a/nut.spec b/nut.spec
index fdb6114f5d9145976d388ff8165ac55e5784ab37..2a82f8125a4b50fb5b1e3ebea22732268d0aa279 100644 (file)
--- a/nut.spec
+++ b/nut.spec
@@ -11,12 +11,12 @@
 Summary:       Network UPS Tools
 Summary(pl.UTF-8):     Sieciowe narzędzie do UPS-ów
 Name:          nut
-Version:       2.6.4
-Release:       4
+Version:       2.6.5
+Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       http://www.networkupstools.org/source/2.6/%{name}-%{version}.tar.gz
-# Source0-md5: 78d672fbbcd90683e49c667665a95f87
+# Source0-md5: e6eac4fa04baff0d0a827d64efe81a7e
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}-upsmon.init
@@ -28,7 +28,6 @@ Patch3:               %{name}-upssched-cmd-sysconf.patch
 Patch4:                %{name}-matrix.patch
 Patch5:                systemd-sysconfig.patch
 Patch6:                bcmxcp-off-by-one.patch
-Patch7:                systemd-upsdrvctl-path.patch
 URL:           http://www.networkupstools.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -196,7 +195,6 @@ Pliki do integracji NUT-a z HAL-em.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %build
 cp -f /usr/share/automake/config.sub .
@@ -222,6 +220,7 @@ cp -f /usr/share/automake/config.sub .
        --with-statepath=%{_var}/lib/ups \
        --with-drvpath=/lib/nut \
        --with-cgipath=/home/services/httpd/cgi-bin \
+       --with-systemdsystemunitdir=%{systemdunitdir} \
        --with-user=ups \
        --with-group=ups
 
@@ -380,7 +379,7 @@ fi
 %attr(755,root,root) /lib/nut/mge-utalk
 %attr(755,root,root) /lib/nut/microdowell
 %{?with_neon:%attr(755,root,root) /lib/nut/netxml-ups}
-%attr(755,root,root) /lib/nut/newmge-shut
+%attr(755,root,root) /lib/nut/oldmge-shut
 %attr(755,root,root) /lib/nut/oneac
 %attr(755,root,root) /lib/nut/optiups
 %attr(755,root,root) /lib/nut/powercom
@@ -398,7 +397,8 @@ fi
 %attr(755,root,root) /lib/nut/upsdrvctl
 %{?with_usb:%attr(755,root,root) /lib/nut/usbhid-ups}
 %attr(755,root,root) /lib/nut/victronups
-%{_datadir}/nut
+%{_datadir}/nut/cmdvartab
+%{_datadir}/nut/driver.list
 %{_mandir}/man5/nut.conf.5*
 %{_mandir}/man8/apcsmart.8*
 %{_mandir}/man8/apcsmart-old.8*

diff --git a/systemd-sysconfig.patch b/systemd-sysconfig.patch
index 0bfae776e489e54e27ba715a01f4261421a3aaea..5b1504482496299ad594d0aeb99240063f78f44d 100644 (file)
--- a/systemd-sysconfig.patch
+++ b/systemd-sysconfig.patch
@@ -22,3 +22,16 @@
  PIDFile=@PIDPATH@/upsmon.pid
  Type=forking
  
+--- nut-2.6.5/configure.in~    2012-08-06 14:37:36.000000000 +0200
++++ nut-2.6.5/configure.in     2013-01-13 12:42:30.807862312 +0100
+@@ -986,9 +986,8 @@
+ dnl prefix. This is needed for 'distcheck*' targets, otherwise
+ dnl files will try to get intalled to the actual system directories
+ if test -n "${systemdsystemunitdir}"; then
+-      systemdsystemshutdowndir="${libdir}/systemd/system-shutdown"
++      systemdsystemshutdowndir="/lib/systemd/system-shutdown"
+       AC_MSG_RESULT(using ${systemdsystemunitdir})
+-      systemdsystemunitdir="`echo ${systemdsystemunitdir} | sed 's/\/lib/\${libdir}/'`"
+ else
+       AC_MSG_RESULT(no)
+ fi

diff --git a/systemd-upsdrvctl-path.patch b/systemd-upsdrvctl-path.patch
deleted file mode 100644 (file)
index 2e79e2a..0000000
--- a/systemd-upsdrvctl-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- nut-2.6.4/scripts/systemd/nut-driver.service.in~   2012-05-02 23:35:36.000000000 +0200
-+++ nut-2.6.4/scripts/systemd/nut-driver.service.in    2012-06-27 14:41:25.598754736 +0200
-@@ -4,7 +4,7 @@
- StopWhenUnneeded=yes
- 
- [Service]
--ExecStart=@SBINDIR@/upsdrvctl start
--ExecStop=@SBINDIR@/upsdrvctl stop
-+ExecStart=@driverexecdir@/upsdrvctl start
-+ExecStop=@driverexecdir@/upsdrvctl stop
- Type=forking
-