SPECS: powersoftplus.spec - build psmain - added bcond qt

sls sls at pld-linux.org
Mon Feb 4 22:06:14 CET 2008


Author: sls                          Date: Mon Feb  4 21:06:14 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- build psmain
- added bcond qt

---- Files affected:
SPECS:
   powersoftplus.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/powersoftplus.spec
diff -u SPECS/powersoftplus.spec:1.13 SPECS/powersoftplus.spec:1.14
--- SPECS/powersoftplus.spec:1.13	Mon Feb  4 21:29:00 2008
+++ SPECS/powersoftplus.spec	Mon Feb  4 22:06:09 2008
@@ -1,6 +1,10 @@
 # $Revision$, $Date$
 # TODO:
 # - netclient and psmain descriptions
+#
+# Conditional build:
+%bcond_without	qt		# build psmain client (qt-dependent)
+#
 Summary:	EVER UPS monitoring utilities
 Summary(pl.UTF-8):	Narzędzia do monitorowania zasilaczy awaryjnych UPS firmy EVER
 Name:		powersoftplus
@@ -17,6 +21,8 @@
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libstdc++-devel
+%{?with_qt:BuildRequires:	qmake}
+%{?with_qt:BuildRequires:	qt-devel}
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
 Requires:	SysVinit
@@ -90,6 +96,15 @@
 	PIXPATH="%{_datadir}/%{name}" \
 	LIBUPATH=%{_libdir}
 
+%if %{with qt}
+cd psmain/src
+qmake
+%{__make} \
+	UIC=/usr/bin/uic \
+	MOC=/usr/bin/moc \
+	CXXFLAGS=-I/usr/include/qt/
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -117,11 +132,9 @@
 #mv $RPM_BUILD_ROOT/etc/powersoftplus $RPM_BUILD_ROOT/etc/psplus
 ln -sf %{_sbindir}/powersoftplus $RPM_BUILD_ROOT%{_bindir}/powersoftplus
 
-#
-# TODO:
-#  psmain should be compiled but isn't - sorry I have no time to fix this now, 
-#  so I just copy precompiled version
+%if %{with qt}
 cp psmain/bin/psmain $RPM_BUILD_ROOT%{_bindir}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -161,9 +174,11 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/netclient
 
+%if %{with qt}
 %files psmain
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/psmain
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -171,6 +186,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2008-02-04 21:06:09  sls
+- build psmain
+- added bcond qt
+
 Revision 1.13  2008-02-04 20:29:00  qboosh
 - "pl" means Polish
 - cleanup; descs still needed
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/powersoftplus.spec?r1=1.13&r2=1.14&f=u



More information about the pld-cvs-commit mailing list