diff --git a/nut.changes b/nut.changes index 2b230f9..4a1ad0b 100644 --- a/nut.changes +++ b/nut.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon May 26 15:09:50 CEST 2008 - sbrabec@suse.cz + +- Provide and Require nut-package (bnc#337059#c3). + ------------------------------------------------------------------- Fri May 9 16:07:28 CEST 2008 - sbrabec@suse.cz diff --git a/nut.spec b/nut.spec index 618f083..df6652a 100644 --- a/nut.spec +++ b/nut.spec @@ -21,7 +21,7 @@ Obsoletes: smartups Conflicts: apcupsd Summary: Network UPS Tools Core (Unbreakable Power Supply Monitoring) Version: 2.2.2 -Release: 1 +Release: 7 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -40,6 +40,7 @@ Patch11: nut-intptr.patch Patch12: nut-hal.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: /bin/chown +Requires: nut-package = %{version} %define apache_serverroot %(%{_sbindir}/apxs2 -q datadir 2>/dev/null || %{_sbindir}/apxs -q PREFIX) %define CGIPATH %{apache_serverroot}/cgi-bin %define HTMLPATH %{apache_serverroot}/htdocs @@ -106,7 +107,7 @@ Authors: %package drivers-net License: GPL v2 or later -Summary: Network UPS Tools - Extra Networking Drivers (Unbreakable Power Supply Monitoring) +Summary: Network UPS Tools - Extra Networking Drivers (for Network Monitoring) Group: Hardware/UPS Requires: %{name}-classic = %{version} Enhances: %{name}-classic @@ -211,9 +212,10 @@ Authors: %package classic License: GPL v2 or later -Summary: Network UPS Tools Classic Package (Unbreakable Power Supply Monitoring) +Summary: Network UPS Tools Classic Package (Monitoring Server) Group: Hardware/UPS Requires: %{name} = %{version} +Provides: nut-package = %{version} Conflicts: %{name}-hal Requires: %{_bindir}/pgrep %{_bindir}/pkill %{_bindir}/grep %{_bindir}/fgrep %{_sbindir}/lsusb %{_bindir}/readlink PreReq: %insserv_prereq /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum @@ -290,9 +292,10 @@ Authors: %package hal License: GPL v2 or later -Summary: Network UPS Tools Support for HAL (Unbreakable Power Supply Monitoring) +Summary: Network UPS Tools Support for HAL (HAL/D-BUS Integration) Group: Hardware/UPS Requires: %{name} = %{version} +Provides: nut-package = %{version} Conflicts: %{name}-classic Requires: hal >= 0.5.8 @@ -353,7 +356,7 @@ Authors: %package cgi License: GPL v2 or later -Summary: Network UPS Tools Web Server Support (Unbreakable Power Supply Monitoring) +Summary: Network UPS Tools Web Server Support (UPS Status Pages) Group: Hardware/UPS Requires: %{name}-classic = %{version} Enhances: %{name}-classic @@ -654,6 +657,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man3/*.* %changelog +* Mon May 26 2008 sbrabec@suse.cz +- Provide and Require nut-package (bnc#337059#c3). * Fri May 09 2008 sbrabec@suse.cz - Added suspend hook (bnc#230267). - Updated to final version 2.2.2 (bnc#385133):