diff --git a/nut.changes b/nut.changes index c19f7a8..eb82725 100644 --- a/nut.changes +++ b/nut.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 30 18:01:31 CET 2017 - sbrabec@suse.com + +- No more conflict with apcupsd (boo#1070373). +- Remove smartups references. It is dropped since 2001. + ------------------------------------------------------------------- Tue Oct 17 19:18:03 UTC 2017 - dimstar@opensuse.org diff --git a/nut.spec b/nut.spec index 62608b9..8111375 100644 --- a/nut.spec +++ b/nut.spec @@ -74,7 +74,6 @@ BuildRequires: net-snmp-devel BuildRequires: pkgconfig BuildRequires: source-highlight BuildRequires: tcpd-devel -BuildRequires: tex(upquote.sty) BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(libpowerman) @@ -82,6 +81,7 @@ BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(udev) +BuildRequires: tex(upquote.sty) Requires: logrotate Requires: usbutils Requires(post): udev @@ -89,9 +89,6 @@ Requires(post): udev Enhances: %{USBHIDDRIVERS} # Package provides the only avalailable driver for other USB UPSes: Supplements: %{USBNONHIDDRIVERS} -Conflicts: apcupsd -Provides: smartups = %{version} -Obsoletes: smartups < %{version} # for update from openSUSE <= 11.3, SLE <= 11 Provides: nut-classic = %{version} Obsoletes: nut-classic < %{version}