rpms/nut/EL-4 nut-2.2.0-wrongssl.patch,NONE,1.1 nut.spec,1.47,1.48
Tomas Smetana (tsmetana)
fedora-extras-commits at redhat.com
Wed Sep 19 07:51:29 UTC 2007
- Previous message (by thread): rpms/ekiga/F-7 ekiga.spec,1.39,1.40 sources,1.12,1.13
- Next message (by thread): rpms/opal/F-7 opal.spec, 1.20, 1.21 sources, 1.10, 1.11 ekiga-429076-42.patch, 1.1, NONE ekiga-429076-50.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: tsmetana
Update of /cvs/pkgs/rpms/nut/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21339
Modified Files:
nut.spec
Added Files:
nut-2.2.0-wrongssl.patch
Log Message:
* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.1
- fix manpages encodings
- run ldconfig after client (un)install
- remove hal support for EL4
nut-2.2.0-wrongssl.patch:
--- NEW FILE nut-2.2.0-wrongssl.patch ---
--- nut-2.2.0/lib/libupsclient-config.in.wrongssl 2007-09-06 11:10:06.000000000 +0200
+++ nut-2.2.0/lib/libupsclient-config.in 2007-09-06 11:13:06.000000000 +0200
@@ -10,7 +10,7 @@
Version="@PACKAGE_VERSION@"
prefix=@prefix@
exec_prefix=@exec_prefix@
-Cflags="-I at includedir@ @SSL_CFLAGS@"
+Cflags="-I at includedir@ @LIBSSL_CFLAGS@"
arch=$(/bin/arch)
if [ "$arch" = "x86_64" -o "$arch" = "s390x" -o "$arch" = "ppc64" -o "$arch" = "ia64" ] ; then
@@ -18,7 +18,7 @@
else
libdir="/usr/lib"
fi
-Libs="-L$libdir @UPSCLI_LIBOBJ@ @SSL_LDFLAGS@"
+Libs="-L$libdir @UPSCLI_LIBOBJ@ @LIBSSL_LDFLAGS@"
case "$1" in
--- nut-2.2.0/lib/libupsclient.pc.in.wrongssl 2007-09-06 11:08:09.000000000 +0200
+++ nut-2.2.0/lib/libupsclient.pc.in 2007-09-06 11:08:30.000000000 +0200
@@ -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@
Index: nut.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nut/EL-4/nut.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- nut.spec 16 Aug 2007 10:31:13 -0000 1.47
+++ nut.spec 19 Sep 2007 07:50:56 -0000 1.48
@@ -9,12 +9,12 @@
Summary: Network UPS Tools
Name: nut
Version: 2.2.0
-Release: 2%{?dist}
+Release: 3.1%{?dist}
Group: Applications/System
License: GPLv2+
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Url: http://www.networkupstools.org/
-Source: http://www.networkupstools.org/source/2.0/%{name}-%{version}.tar.gz
+Source: http://www.networkupstools.org/source/2.2/%{name}-%{version}.tar.gz
Source1: ups.init
Source2: ups.sysconfig
@@ -22,10 +22,11 @@
Patch1: nut-2.2.0-multilib.patch
Patch2: nut-2.2.0-udevusb.patch
Patch3: nut-2.2.0-glibcopen.patch
+Patch4: nut-2.2.0-wrongssl.patch
-Requires: nut-client => 2.0.0 hal dbus-glib
-Requires(post): fileutils /sbin/chkconfig /sbin/service
-Requires(postun): fileutils /sbin/chkconfig /sbin/service
+Requires: nut-client => 2.0.0 dbus-glib shadow-utils
+Requires(post): fileutils chkconfig /sbin/service
+Requires(postun): fileutils chkconfig /sbin/service
BuildRequires: gd-devel
BuildRequires: freetype-devel
@@ -33,13 +34,11 @@
BuildRequires: libpng-devel
BuildRequires: net-snmp-devel
BuildRequires: elfutils-devel
-BuildRequires: libX11-devel
-BuildRequires: libXpm-devel
+BuildRequires: xorg-x11-devel
BuildRequires: libjpeg-devel
BuildRequires: fontconfig-devel
BuildRequires: pkgconfig
-BuildRequires: hal-devel
-BuildRequires: dbus-glib-devel
+BuildRequires: libusb-devel
BuildRequires: openssl-devel
%ifnarch s390 s390x
@@ -58,8 +57,6 @@
%package client
Group: Applications/System
Summary: Network UPS Tools client monitoring utilities
-Prereq: chkconfig
-Prereq: /usr/sbin/useradd
%description client
This package includes the client utilities that are required to monitor a
@@ -78,7 +75,7 @@
%package devel
Group: Development/Libraries
Summary: Development files for NUT Client
-Requires: %{name}-client = %{version}-%{release} webserver
+Requires: %{name}-client = %{version}-%{release} webserver openssl-devel
%description devel
This package contains the development header files and libraries
@@ -90,6 +87,7 @@
%patch1 -p1 -b .multilib
%patch2 -p1 -b .udevusb
%patch3 -p1 -b .open
+%patch4 -p1 -b .wrongssl
%build
%configure \
@@ -101,15 +99,29 @@
--sysconfdir=%{_sysconfdir}/ups \
--with-cgipath=%{cgidir} \
--with-drvpath=%{modeldir} \
- --with-all \
- --with-ipv6 \
+ --with-serial \
+ --with-usb \
+ --with-snmp \
+ --with-cgi \
+ --with-lib \
+ --with-ssl \
+ --with-ipv6 \
--with-gd-libs \
--with-linux-hiddev=%{_includedir}/linux/hiddev.h \
- --with-pkgconfig-dir=%{_libdir}/pkgconfig \
- --disable-static
+ --with-pkgconfig-dir=%{_libdir}/pkgconfig \
+ --disable-static
make %{?_smp_mflags}
+# fix old enconding manpages
+mv man/upscode2.8 man/upscode2.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/upscode2.8 man/upscode2.8.iso
+mv man/bcmxcp.8 man/bcmxcp.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp.8 man/bcmxcp.8.iso
+mv man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso
+iconv -f ISO8859-1 -t UTF-8 -o man/bcmxcp_usb.8 man/bcmxcp_usb.8.iso
+rm -f man/*.iso
+
%install
rm -rf %{buildroot}
@@ -152,6 +164,7 @@
%post client
/sbin/chkconfig --add ups
+/sbin/ldconfig
exit 0
%preun client
@@ -159,6 +172,7 @@
/sbin/service ups stop > /dev/null 2>&1
/sbin/chkconfig --del ups
fi
+/sbin/ldconfig
exit 0
%postun client
@@ -178,6 +192,7 @@
%config(noreplace) %attr(640,root,nut) %{_sysconfdir}/ups/upsd.users
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/sysconfig/ups
%config(noreplace) %attr(644,root,root) %{_sysconfdir}/udev/rules.d/*
+%config(noreplace) %attr(644,root,root) %{_sysconfdir}/hotplug/usb/*
%{modeldir}/*
%{_sbindir}/upsd
%{_bindir}/upslog
@@ -277,6 +292,14 @@
%{_libdir}/pkgconfig/libupsclient.pc
%changelog
+* Wed Sep 19 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3.1
+- fix manpages encodings
+- run ldconfig after client (un)install
+- remove hal support for EL4
+
+* Thu Sep 06 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-3
+- fix wrong libssl flags in devel, fix devel package dependencies
+
* Wed Aug 15 2007 Tomas Smetana <tsmetana at redhat.com> 2.2.0-2
- fix #249028 - usb udev rules
- update initscript and sysconfig file
- Previous message (by thread): rpms/ekiga/F-7 ekiga.spec,1.39,1.40 sources,1.12,1.13
- Next message (by thread): rpms/opal/F-7 opal.spec, 1.20, 1.21 sources, 1.10, 1.11 ekiga-429076-42.patch, 1.1, NONE ekiga-429076-50.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list