rpms/nut/devel nut-2.2.0-conf.patch, NONE, 1.1 nut-2.2.0-multilib.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 nut.spec, 1.43, 1.44 sources, 1.14, 1.15 ups.init, 1.6, 1.7 ups.sysconfig, 1.2, 1.3 nut-0.45.0-conffiles.patch, 1.1, NONE nut-0.45.4-conf.patch, 1.1, NONE nut-1.4.0-buildroot.patch, 1.1, NONE nut-2.0.5-multilib.patch, 1.1, NONE nut-2.0.5-pkgconfig.patch, 1.1, NONE nut-ipv6.patch, 1.3, NONE
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Fri Jul 13 11:03:54 UTC 2007
Author: tsmetana
Update of /cvs/pkgs/rpms/nut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14777
Modified Files:
.cvsignore nut.spec sources ups.init ups.sysconfig
Added Files:
nut-2.2.0-conf.patch nut-2.2.0-multilib.patch
Removed Files:
nut-0.45.0-conffiles.patch nut-0.45.4-conf.patch
nut-1.4.0-buildroot.patch nut-2.0.5-multilib.patch
nut-2.0.5-pkgconfig.patch nut-ipv6.patch
Log Message:
new upstream release
nut-2.2.0-conf.patch:
--- NEW FILE nut-2.2.0-conf.patch ---
--- nut-2.2.0/conf/upssched.conf.sample.schconf 2007-07-12 15:14:33.000000000 +0200
+++ nut-2.2.0/conf/upssched.conf.sample 2007-07-12 15:16:45.000000000 +0200
@@ -14,7 +14,7 @@
# A shell script with a big case..esac construct should work nicely for this.
# An example has been provided to help you get started.
-CMDSCRIPT /usr/local/ups/bin/upssched-cmd
+CMDSCRIPT /usr/bin/upssched-cmd
# ============================================================================
#
nut-2.2.0-multilib.patch:
--- NEW FILE nut-2.2.0-multilib.patch ---
--- nut-2.2.0/lib/libupsclient-config.in.multilib 2006-11-08 03:47:35.000000000 +0100
+++ nut-2.2.0/lib/libupsclient-config.in 2007-07-12 13:16:21.000000000 +0200
@@ -10,9 +10,17 @@
Version="@PACKAGE_VERSION@"
prefix=@prefix@
exec_prefix=@exec_prefix@
-Libs="-L at libdir@ -lupsclient @SSL_LDFLAGS@"
Cflags="-I at includedir@ @SSL_CFLAGS@"
+arch=$(/bin/arch)
+if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
+ libdir="/usr/lib64"
+else
+ libdir="/usr/lib"
+fi
+Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
+
+
case "$1" in
--cflags)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 23 Jan 2007 10:47:26 -0000 1.14
+++ .cvsignore 13 Jul 2007 11:03:22 -0000 1.15
@@ -1,6 +1 @@
-nut-2.0.0.tar.gz
-nut-2.0.1.tar.gz
-nut-2.0.2.tar.gz
-nut-2.0.3.tar.gz
-nut-2.0.4.tar.gz
-nut-2.0.5.tar.gz
+nut-2.2.0.tar.gz
Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/nut.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- nut.spec 26 Mar 2007 13:32:55 -0000 1.43
+++ nut.spec 13 Jul 2007 11:03:22 -0000 1.44
@@ -8,8 +8,8 @@
Summary: Network UPS Tools
Name: nut
-Version: 2.0.5
-Release: 3
+Version: 2.2.0
+Release: 1%{?dist}
Group: Applications/System
License: GPL
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -18,14 +18,10 @@
Source1: ups.init
Source2: ups.sysconfig
-Patch0: nut-1.4.0-buildroot.patch
-Patch1: nut-0.45.0-conffiles.patch
-Patch2: nut-0.45.4-conf.patch
-Patch3: nut-2.0.5-multilib.patch
-Patch4: nut-ipv6.patch
-Patch5: nut-2.0.5-pkgconfig.patch
+Patch0: nut-2.2.0-conf.patch
+Patch1: nut-2.2.0-multilib.patch
-Requires: nut-client
+Requires: nut-client => 2.0.0
Requires(post): fileutils /sbin/chkconfig /sbin/service
Requires(postun): fileutils /sbin/chkconfig /sbin/service
@@ -68,7 +64,7 @@
%package cgi
Group: Applications/System
Summary: CGI utilities for the Network UPS Tools
-Requires: webserver
+Requires: %{name}-client = %{version}-%{release} webserver
%description cgi
This package includes CGI programs for accessing UPS status via a web
@@ -77,7 +73,7 @@
%package devel
Group: Development/Libraries
Summary: Development files for NUT Client
-Requires: webserver
+Requires: %{name}-client = %{version}-%{release} webserver
%description devel
This package contains the development header files and libraries
@@ -85,15 +81,8 @@
%prep
%setup -q
-%patch0 -p1 -b .buildroot
-%patch1 -p1 -b .conf
-%patch2 -p1 -b .conf1
-%patch3 -p1 -b .multilib
-%patch4 -p1 -b .IPv6
-%patch5 -p1 -b .pkgconfig
-
-iconv -f iso-8859-1 -t utf-8 < man/newhidups.8 > man/newhidups.8_
-mv man/newhidups.8_ man/newhidups.8
+%patch0 -p1 -b .conf
+%patch1 -p1 -b .multilib
%build
%configure \
@@ -105,9 +94,12 @@
--sysconfdir=%{_sysconfdir}/ups \
--with-cgipath=%{cgidir} \
--with-drvpath=%{modeldir} \
- --with-cgi \
+ --with-all \
+ --with-ipv6 \
--with-gd-libs \
- --with-linux-hiddev=%{_includedir}/linux/hiddev.h
+ --with-linux-hiddev=%{_includedir}/linux/hiddev.h \
+ --with-pkgconfig-dir=%{_libdir}/pkgconfig \
+ --disable-static
make %{?_smp_mflags}
make %{?_smp_mflags} snmp
@@ -123,25 +115,19 @@
%{buildroot}%{_localstatedir}/lib/ups \
%{buildroot}%{initdir}
-make install install-conf \
- install-cgi-conf \
- install-cgi \
- install-usb \
- install-lib \
- install-snmp DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot}
-install -m 755 drivers/hidups %{buildroot}%{modeldir}/
install -m 755 drivers/energizerups %{buildroot}%{modeldir}/
install -m 755 %{SOURCE2} %{buildroot}%{_sysconfdir}/sysconfig/ups
install -m 755 %{SOURCE1} %{buildroot}%{initdir}/ups
install -m 644 man/gamatronic.* %{buildroot}%{_mandir}/man8/
-install -m 644 scripts/hotplug-ng/nut-usbups.rules %{buildroot}%{_sysconfdir}/udev/rules.d
rm -rf %{buildroot}%{_prefix}/html
+rm -f %{buildroot}%{_libdir}/*.la
-# rename
+cd conf; make install DESTDIR=%{buildroot}
for file in %{buildroot}%{_sysconfdir}/ups/*.sample
do
mv $file %{buildroot}%{_sysconfdir}/ups/`basename $file .sample`
@@ -181,7 +167,7 @@
%files
%defattr(-,root,root,-)
-%doc COPYING CREDITS ChangeLog README docs UPGRADING INSTALL NEWS
+%doc COPYING ChangeLog AUTHORS MAINTAINERS README docs UPGRADING INSTALL NEWS
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/ups.conf
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.conf
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
@@ -202,7 +188,6 @@
%{_mandir}/man8/cyberpower.8.gz
%{_mandir}/man8/everups.8.gz
%{_mandir}/man8/etapro.8.gz
-%{_mandir}/man8/fentonups.8.gz
%{_mandir}/man8/genericups.8.gz
%{_mandir}/man8/isbmex.8.gz
%{_mandir}/man8/liebert.8.gz
@@ -211,7 +196,6 @@
%{_mandir}/man8/nutupsdrv.8.gz
%{_mandir}/man8/oneac.8.gz
%{_mandir}/man8/powercom.8.gz
-%{_mandir}/man8/sms.8.gz
%{_mandir}/man8/tripplite.8.gz
%{_mandir}/man8/tripplitesu.8.gz
%{_mandir}/man8/victronups.8.gz
@@ -221,14 +205,10 @@
%{_mandir}/man8/energizerups.8.gz
%{_mandir}/man8/safenet.8.gz
%{_mandir}/man8/belkinunv.8.gz
-%{_mandir}/man8/hidups.8.gz
-%{_mandir}/man8/ippon.8.gz
-%{_mandir}/man8/newhidups.8.gz
%{_mandir}/man8/snmp-ups.8.gz
%{_mandir}/man8/bestfcom.8.gz
%{_mandir}/man8/cpsups.8.gz
%{_mandir}/man8/metasys.8.gz
-%{_mandir}/man8/mustek.8.gz
%{_mandir}/man8/bcmxcp.8*
%{_mandir}/man8/solis.8*
%{_mandir}/man8/upscode2.8*
@@ -241,6 +221,9 @@
%{_mandir}/man8/nitram.8.gz
%{_mandir}/man8/optiups.8.gz
%{_mandir}/man8/powerpanel.8.gz
+%{_mandir}/man8/megatec_usb.8.gz
+%{_mandir}/man8/rhino.8.gz
+%{_mandir}/man8/usbhid-ups.8.gz
%files client
%defattr(-,root,root)
@@ -255,7 +238,8 @@
%{_bindir}/upsrw
%{_sbindir}/upsmon
%{_sbindir}/upssched
-%{_sbindir}/upssched-cmd
+%{_bindir}/upssched-cmd
+%{_libdir}/libupsclient.so.*
%{_mandir}/man5/upsmon.conf.5.gz
%{_mandir}/man5/upssched.conf.5.gz
%{_mandir}/man8/upsc.8.gz
@@ -283,11 +267,20 @@
%defattr(-,root,root,-)
%{_bindir}/libupsclient-config
%{_includedir}/*
-%{_mandir}/man3/upscli_*
-%{_libdir}/*upsclient*
+%{_mandir}/man3/upscli*
+%{_libdir}/libupsclient.so
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
+* Fri Jul 13 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-1
+- new upstream version (Resolves: #248074)
+- initscripts update
+- spec file cleanup
+
+* Mon May 07 2007 Arnaud Quette <aquette-dev at gmail.com> 2.1.0-1
+- update to 2.1.0 development tree
+- HAL, ...
+
* Mon Mar 26 2007 Than Ngo <than at redhat.com> 2.0.5-3
- cleanup
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources 23 Jan 2007 10:47:26 -0000 1.14
+++ sources 13 Jul 2007 11:03:22 -0000 1.15
@@ -1,2 +1 @@
-59b6f3038a5ef64c584913e72bd850a2 nut-2.0.4.tar.gz
-b08fde86191154bbcfda860f95a5dca2 nut-2.0.5.tar.gz
+a3570515d80804051d4e7631e8a3eb12 nut-2.2.0.tar.gz
Index: ups.init
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/ups.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ups.init 9 Sep 2004 09:22:07 -0000 1.6
+++ ups.init 13 Jul 2007 11:03:22 -0000 1.7
@@ -85,6 +85,19 @@
start
}
+reload() {
+ # FIXME: upsd and upsmon always return 0
+ # => can't tell if reload was successful
+ if [ "$SERVER" = "yes" ]; then
+ action "Reloading upsd:" /usr/sbin/upsd -c reload
+ RETVAL=$?
+ fi
+ action "Reloading upsmon:" /usr/sbin/upsmon -c reload
+ if [ "$RETVAL" = 0 ]; then
+ RETVAL=$?
+ fi
+}
+
# See how we are called.
case "$1" in
start)
@@ -96,10 +109,16 @@
restart)
restart ;;
- condrestart)
+ try-restart)
[ -f /var/lock/subsys/ups ] && restart || :
;;
+ reload)
+ reload ;;
+
+ force-reload)
+ restart ;;
+
status)
if [ "$SERVER" = "yes" ]; then
if [ "$MODEL" = "upsdrvctl" ]; then
@@ -113,8 +132,8 @@
;;
*)
- echo $"Usage: $0 {start|stop|restart|condrestart|status}"
- exit 1
+ echo $"Usage: $0 {start|stop|restart|try-restart|reload|force-reload|status}"
+ RETVAL=3
esac
exit $RETVAL
Index: ups.sysconfig
===================================================================
RCS file: /cvs/pkgs/rpms/nut/devel/ups.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ups.sysconfig 9 Sep 2004 09:22:07 -0000 1.2
+++ ups.sysconfig 13 Jul 2007 11:03:22 -0000 1.3
@@ -3,7 +3,6 @@
# Model of the UPS (filename to call for it, without path)
# Example - one of
# apcsmart - APC SMartUPS and similar
-# fentonups - Fenton UPS
# optiups
# bestups
# genericups
--- nut-0.45.0-conffiles.patch DELETED ---
--- nut-0.45.4-conf.patch DELETED ---
--- nut-1.4.0-buildroot.patch DELETED ---
--- nut-2.0.5-multilib.patch DELETED ---
--- nut-2.0.5-pkgconfig.patch DELETED ---
--- nut-ipv6.patch DELETED ---
More information about the fedora-extras-commits
mailing list