diff --git a/nut-2.2.0.tar.bz2 b/nut-2.2.0.tar.bz2 deleted file mode 100644 index 3909864..0000000 --- a/nut-2.2.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d32850de66aed8c078d47392113db153587bdd21f57f892fe3468a7f58acd5b2 -size 893144 diff --git a/nut-2.2.1.tar.bz2 b/nut-2.2.1.tar.bz2 new file mode 100644 index 0000000..07e5a26 --- /dev/null +++ b/nut-2.2.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69241bc5f4cb34d5e3fcac04c3e64a07193281456d61dacc2803c27887fbbf24 +size 911678 diff --git a/nut-hidparser.diff b/nut-hidparser.diff deleted file mode 100644 index f463038..0000000 --- a/nut-hidparser.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- tags/v2.2.0/drivers/hidparser.c (revision 1148) -+++ tags/v2.2.0/drivers/hidparser.c (working copy) -@@ -618,7 +618,7 @@ - /* done scanning report descriptor; now calculate derived data */ - - /* make a list of reports and their lengths */ -- memset(pDesc->replen, 0, 256); -+ memset(pDesc->replen, 0, 256 * sizeof(*pDesc->replen)); - for (i=0; initems; i++) { - id = item[i].ReportID; - diff --git a/nut-pkgconfig.patch b/nut-pkgconfig.patch deleted file mode 100644 index d3506c2..0000000 --- a/nut-pkgconfig.patch +++ /dev/null @@ -1,85 +0,0 @@ ---- configure.in -+++ configure.in -@@ -39,10 +39,6 @@ - cgiexecdir='${exec_prefix}/cgi-bin' - driverexecdir='${exec_prefix}/bin' - htmldir='${prefix}/html' --pkgcfgdir='/usr/lib/pkgconfig' --if test ! -d "${pkgcfgdir}"; then -- pkgcfgdir='' --fi - hotplugdir='/etc/hotplug' - if test ! -d "${hotplugdir}"; then - hotplugdir='' -@@ -635,35 +631,6 @@ - ]) - - --AC_MSG_CHECKING(whether to enable pkg-config support) --AC_ARG_WITH(pkgconfig-dir, -- AC_HELP_STRING([--with-pkgconfig-dir=PATH], [where to install pkg-config *.pc files (/usr/lib/pkgconfig)]), -- [ -- case "${withval}" in -- yes) -- if test -z "${pkgcfgdir}"; then -- AC_MSG_RESULT(no) -- AC_MSG_ERROR(["pkg-config directory requested but not found]) -- fi -- ;; -- auto) -- ;; -- no) -- pkgcfgdir="" -- ;; -- *) -- pkgcfgdir="${withval}" -- ;; -- esac -- ], -- ) --if test -n "${pkgcfgdir}"; then -- AC_MSG_RESULT(using ${pkgcfgdir}) --else -- AC_MSG_RESULT(no) --fi --AM_CONDITIONAL(WITH_PKG_CONFIG, test -n "${pkgcfgdir}") -- - AC_MSG_CHECKING(whether to install hotplug rules) - AC_ARG_WITH(hotplug-dir, - AC_HELP_STRING([--with-hotplug-dir=PATH], [where to install hotplug rules (/etc/hotplug)]), ---- lib/Makefile.am -+++ lib/Makefile.am -@@ -1,8 +1,7 @@ - # Network UPS Tools: lib - - if WITH_LIB --if WITH_PKG_CONFIG -- pkgcfg_DATA = libupsclient.pc --endif -+pkgconfig_DATA = libupsclient.pc -+pkgconfigdir = $(libdir)/pkgconfig - bin_SCRIPTS = libupsclient-config - endif ---- lib/libupsclient-config.in -+++ lib/libupsclient-config.in -@@ -10,8 +10,8 @@ - Version="@PACKAGE_VERSION@" - prefix=@prefix@ - exec_prefix=@exec_prefix@ --Libs="-L@libdir@ -lupsclient @SSL_LDFLAGS@" --Cflags="-I@includedir@ @SSL_CFLAGS@" -+Libs="-L@libdir@ -lupsclient @LIBSSL_LDFLAGS@" -+Cflags="-I@includedir@ @LIBSSL_CFLAGS@" - - case "$1" in - ---- lib/libupsclient.pc.in -+++ lib/libupsclient.pc.in -@@ -9,5 +9,5 @@ - Name: libupsclient - Description: UPS monitoring with Network UPS Tools - Version: @PACKAGE_VERSION@ --Libs: -L${libdir} -lupsclient @SSL_LDFLAGS@ --Cflags: -I${includedir} @SSL_CFLAGS@ -+Libs: -L${libdir} -lupsclient @LIBSSL_LDFLAGS@ -+Cflags: -I${includedir} @LIBSSL_CFLAGS@ diff --git a/nut.changes b/nut.changes index f457597..ff21381 100644 --- a/nut.changes +++ b/nut.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Apr 24 17:03:22 CEST 2008 - sbrabec@suse.cz + +- Updated to version 2.2.1: + * support for new devices: all MGE Office Protection Systems + units, Advice TopGuard 2000, Belkin F6H375-USB, Dynamix + UPS1700D, Effekta RM2000MH, Jageson Technology Jasuny USPS, + Powercom SMK-1500A and SXL-1500A, PowerWalker Line-Interactive + VI 400/800 and 600, Powerware 9110, UNITEK Alpha 2600, UPSonic + CXR1000, some vintage serial APC UPSs. + * Improvements, fixes and backports to usbhid-ups. + * Updated udev rules. + * megatec and megatec_usb drivers backported. + * development files improved. + ------------------------------------------------------------------- Mon Apr 14 16:28:56 CEST 2008 - schwab@suse.de diff --git a/nut.spec b/nut.spec index 5e419a1..e5a440e 100644 --- a/nut.spec +++ b/nut.spec @@ -1,5 +1,5 @@ # -# spec file for package nut (Version 2.2.0) +# spec file for package nut (Version 2.2.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,8 +21,8 @@ Obsoletes: smartups Conflicts: apcupsd AutoReqProv: on Summary: UPS Monitoring Software -Version: 2.2.0 -Release: 92 +Version: 2.2.1 +Release: 1 Url: http://www.networkupstools.org/ Source: %{name}-%{version}.tar.bz2 Source1: upsd.init @@ -33,9 +33,7 @@ Source5: nut.firewall.in Patch: nut-preconfig.patch Patch3: nut-notifyflag.patch Patch4: nut-powersave.patch -Patch5: nut-pkgconfig.patch Patch6: nut-udev.patch -Patch7: nut-hidparser.diff Patch8: nut-libtool.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %insserv_prereq /bin/chown /bin/chmod %{_bindir}/fgrep %{_bindir}/grep %{_bindir}/sed %{_bindir}/head %{_bindir}/md5sum @@ -143,11 +141,9 @@ mv upsd-early-powerdown.init upsd-early-powerdown %patch %patch3 %patch4 -%patch5 -%if %suse_version >= 1030 -%patch6 +%if %suse_version < 1030 +%patch6 -R %endif -%patch7 -p2 %patch8 sed -i "s/@UPSD_USER@/%{USER}/g" upsd.init conf/upsmon.conf.sample @@ -291,6 +287,18 @@ rm -rf $RPM_BUILD_ROOT %doc %{_mandir}/man3/*.* %changelog +* Thu Apr 24 2008 sbrabec@suse.cz +- Updated to version 2.2.1: + * support for new devices: all MGE Office Protection Systems + units, Advice TopGuard 2000, Belkin F6H375-USB, Dynamix + UPS1700D, Effekta RM2000MH, Jageson Technology Jasuny USPS, + Powercom SMK-1500A and SXL-1500A, PowerWalker Line-Interactive + VI 400/800 and 600, Powerware 9110, UNITEK Alpha 2600, UPSonic + CXR1000, some vintage serial APC UPSs. + * Improvements, fixes and backports to usbhid-ups. + * Updated udev rules. + * megatec and megatec_usb drivers backported. + * development files improved. * Mon Apr 14 2008 schwab@suse.de - Work around misuse of libtool. * Thu Oct 25 2007 sbrabec@suse.cz