Accepting request 546801 from home:sbrabec:branches:hardware

- No more conflict with apcupsd (boo#1070373).
- Remove smartups references. It is dropped since 2001.

OBS-URL: https://build.opensuse.org/request/show/546801
OBS-URL: https://build.opensuse.org/package/show/hardware/nut?expand=0&rev=73
This commit is contained in:
Ismail Dönmez 2017-12-01 13:49:49 +00:00 committed by Git OBS Bridge
parent 145a4166df
commit 2a51005c79
2 changed files with 7 additions and 4 deletions

View File

@ -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 Tue Oct 17 19:18:03 UTC 2017 - dimstar@opensuse.org

View File

@ -74,7 +74,6 @@ BuildRequires: net-snmp-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: source-highlight BuildRequires: source-highlight
BuildRequires: tcpd-devel BuildRequires: tcpd-devel
BuildRequires: tex(upquote.sty)
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(gdlib) BuildRequires: pkgconfig(gdlib)
BuildRequires: pkgconfig(libpowerman) BuildRequires: pkgconfig(libpowerman)
@ -82,6 +81,7 @@ BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(neon) BuildRequires: pkgconfig(neon)
BuildRequires: pkgconfig(openssl) BuildRequires: pkgconfig(openssl)
BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(udev)
BuildRequires: tex(upquote.sty)
Requires: logrotate Requires: logrotate
Requires: usbutils Requires: usbutils
Requires(post): udev Requires(post): udev
@ -89,9 +89,6 @@ Requires(post): udev
Enhances: %{USBHIDDRIVERS} Enhances: %{USBHIDDRIVERS}
# Package provides the only avalailable driver for other USB UPSes: # Package provides the only avalailable driver for other USB UPSes:
Supplements: %{USBNONHIDDRIVERS} Supplements: %{USBNONHIDDRIVERS}
Conflicts: apcupsd
Provides: smartups = %{version}
Obsoletes: smartups < %{version}
# for update from openSUSE <= 11.3, SLE <= 11 # for update from openSUSE <= 11.3, SLE <= 11
Provides: nut-classic = %{version} Provides: nut-classic = %{version}
Obsoletes: nut-classic < %{version} Obsoletes: nut-classic < %{version}