Author: qboosh Date: Fri Feb 8 20:23:49 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- added nousb patch to make USB support optional; now builds on !x86 (w/o USB
support)
---- Files affected:
SPECS:
powersoftplus.spec (1.20 -> 1.21)
---- Diffs:
================================================================
Index: SPECS/powersoftplus.spec
diff -u SPECS/powersoftplus.spec:1.20 SPECS/powersoftplus.spec:1.21
--- SPECS/powersoftplus.spec:1.20 Fri Feb 8 20:32:11 2008
+++ SPECS/powersoftplus.spec Fri Feb 8 21:23:44 2008
@@ -4,8 +4,12 @@
# - maybe convert *.bmp to *.png (needs paths update in src/*.h)
#
# Conditional build:
-%bcond_without qt # build psmain client (qt-dependent)
+%bcond_without qt # psmain client (qt-dependent)
+%bcond_without usb # USB support (relies on x86-only library)
#
+%ifnarch %{ix86}
+%undefine with_usb
+%endif
Summary: EVER UPS monitoring utilities
Summary(pl.UTF-8): Narzędzia do monitorowania zasilaczy awaryjnych UPS
firmy EVER
Name: powersoftplus
@@ -21,18 +25,17 @@
Patch1: %{name}-paths.patch
Patch2: %{name}-types.patch
Patch3: %{name}-system-ftd.patch
+Patch4: %{name}-nousb.patch
URL: http://www.ever.com.pl/pl/prod_psp.php
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: libftd2xx-devel >= 0.4.10
+%{?with_usb:BuildRequires: libftd2xx-devel >= 0.4.10}
BuildRequires: libstdc++-devel
-%{?with_qt:BuildRequires: qmake}
-%{?with_qt:BuildRequires: qt-devel}
+%{?with_qt:BuildRequires: qmake >= 6:3.3}
+%{?with_qt:BuildRequires: qt-devel >= 6:3.3}
BuildRequires: sed >= 4.0
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
-# beause of sb's choice to use closed-source ftd library...
-ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sysconfdir /etc/powersoftplus
@@ -96,6 +99,7 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%build
%{__aclocal}
@@ -103,7 +107,8 @@
%{__autoheader}
%{__automake}
%configure \
- --bindir=%{_sbindir}
+ --bindir=%{_sbindir} \
+ --enable-usb%{!?with_usb:=no}
%{__make}
@@ -188,6 +193,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.21 2008-02-08 20:23:44 qboosh
+- added nousb patch to make USB support optional; now builds on !x86 (w/o USB
support)
+
Revision 1.20 2008-02-08 19:32:11 qboosh
- added types, system-ftd patches; use system libftd2xx (so License can be
true for .rpm)
- libfd2xx is closed-source, x86-only - EA added
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/powersoftplus.spec?r1=1.20&r2=1.21&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
