SPECS: powersoftplus.spec - added types, system-ftd patches; use s...

Fri Feb 8 20:32:16 CET 2008

Author: qboosh                       Date: Fri Feb  8 19:32:16 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added types, system-ftd patches; use system libftd2xx (so License can be true for .rpm)
- libfd2xx is closed-source, x86-only - EA added
- build cleanup
- updated URL
- updated init script (fixed force-reload, added try-restart)
- psmain descriptions

---- Files affected:
SPECS:
   powersoftplus.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: SPECS/powersoftplus.spec
diff -u SPECS/powersoftplus.spec:1.19 SPECS/powersoftplus.spec:1.20

--- SPECS/powersoftplus.spec:1.19	Thu Feb  7 18:47:58 2008
+++ SPECS/powersoftplus.spec	Fri Feb  8 20:32:11 2008
@@ -1,7 +1,7 @@
 # $Revision$, $Date$
 # TODO:
-# - netclient and psmain descriptions
-# - maybe convert *.bmp to *.png
+# - netclient description
+# - maybe convert *.bmp to *.png (needs paths update in src/*.h)
 #
 # Conditional build:
 %bcond_without	qt		# build psmain client (qt-dependent)
@@ -11,7 +11,7 @@
 Name:		powersoftplus
 Version:	0.1.8
 Release:	0.3
-License:	GPL
+License:	GPL v2+
 Group:		Daemons
 Source0:	http://www.ever.com.pl/pl/pliki/%{name}-%{version}-x86.tar.gz
 # Source0-md5:	e39d39335d7168f1fcf473471a50c35d
@@ -19,16 +19,20 @@
 Source2:	%{name}.sysconfig
 Patch0:		%{name}-make.patch
 Patch1:		%{name}-paths.patch
-URL:		http://www.ever.com.pl/powersoft_prod.php
+Patch2:		%{name}-types.patch
+Patch3:		%{name}-system-ftd.patch
+URL:		http://www.ever.com.pl/pl/prod_psp.php
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	libftd2xx-devel >= 0.4.10
 BuildRequires:	libstdc++-devel
 %{?with_qt:BuildRequires:	qmake}
 %{?with_qt:BuildRequires:	qt-devel}
 BuildRequires:	sed >= 4.0
 Requires(post,preun):	/sbin/chkconfig
-Requires:	SysVinit
 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
@@ -71,17 +75,27 @@
 netclient
 
 %package psmain
-Summary:	psmain
+Summary:	PowerSoft Plus Control Panel
+Summary(pl.UTF-8):	Panel sterowania PowerSoft Plus
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 
 %description psmain
-psmain
+PowerSoft Plus Control Panel is a user interface for PowerSoft Plus
+monitoring program. It displays all parameters available for selected
+UPS type.
+
+%description psmain -l pl.UTF-8
+PowerSoft Plus Control Panel to interfejs użytkownika do programu
+monitorującego PowerSoft Plus. Wyświetla wszystkie parametry dostępne
+dla wybranego typu UPS-a.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %{__aclocal}
@@ -89,41 +103,29 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--bindir=%{_sbindir} \
-	--prefix=/usr
+	--bindir=%{_sbindir}
 
-%{__make} \
-	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	DEBUG="%{rpmcflags} -I/usr/include/ncurses" \
-	PIXPATH="%{_datadir}/%{name}" \
-	LIBUPATH=%{_libdir}
+%{__make}
 
 %if %{with qt}
 cd psmain/src
-qmake
+qmake \
+	QMAKE_CXX="%{__cxx}" \
+	QMAKE_LINK="%{__cxx}" \
+	QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags} -DHAVE_CONFIG_H" \
+	QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
 %{__make} \
-	UIC=/usr/bin/uic \
-	MOC=/usr/bin/moc \
-	CXXFLAGS="%{rpmcxxflags} -I/usr/include/qt/ -DHAVE_CONFIG_H"
+	QTDIR=/usr
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_bindir}
 
-install -d $RPM_BUILD_ROOT{%{_libdir},%{_bindir}}
 %{__make} install \
 	CONFPATH=$RPM_BUILD_ROOT%{_sysconfdir} \
 	PIXPATH=$RPM_BUILD_ROOT%{_datadir}/%{name} \
-	DESTDIR=$RPM_BUILD_ROOT \
-	LIBUPATH=$RPM_BUILD_ROOT%{_libdir} \
-	LIBPATH=$RPM_BUILD_ROOT%{_libdir}
-
-rm $RPM_BUILD_ROOT%{_libdir}/libftd2xx.{so,so.0}
-ln -sf %{_libdir}/libftd2xx.so.0.4.10 $RPM_BUILD_ROOT%{_libdir}/ibftd2xx.so
-ln -sf %{_libdir}/libftd2xx.so.0.4.10 $RPM_BUILD_ROOT%{_libdir}/ibftd2xx.so.0
-
-rm $RPM_BUILD_ROOT%{_libdir}/ibftd2xx.{so,so.0}
+	DESTDIR=$RPM_BUILD_ROOT
 
 install -d $RPM_BUILD_ROOT{%{_sbindir},/var/{run,log},%{_sysconfdir},/etc/{rc.d/init.d,sysconfig}}
 
@@ -132,11 +134,10 @@
 
 touch $RPM_BUILD_ROOT/var/log/powersoftplus.log
 
-#mv $RPM_BUILD_ROOT/etc/powersoftplus $RPM_BUILD_ROOT/etc/psplus
 ln -sf %{_sbindir}/powersoftplus $RPM_BUILD_ROOT%{_bindir}/powersoftplus
 
 %if %{with qt}
-cp psmain/bin/psmain $RPM_BUILD_ROOT%{_bindir}
+install psmain/bin/psmain $RPM_BUILD_ROOT%{_bindir}
 %endif
 
 %clean
@@ -144,7 +145,6 @@
 
 %post
 /sbin/chkconfig --add powersoftplus
-/sbin/ldconfig
 if [ -f /var/lock/subsys/powersoftplus ]; then
 	/etc/rc.d/init.d/powersoftplus restart >&2
 else
@@ -158,18 +158,16 @@
 	fi
 	/sbin/chkconfig --del powersoftplus
 fi
-/sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO Pomoc.pdf
 %attr(755,root,root) %{_sbindir}/%{name}
 %attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_libdir}/*.so*
 %attr(754,root,root) /etc/rc.d/init.d/powersoftplus
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/powersoftplus
 %attr(750,root,root) %dir %{_sysconfdir}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*.conf
 %attr(640,root,root) %ghost /var/log/powersoftplus.log
 
 %files netclient
@@ -190,6 +188,14 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
+- build cleanup
+- updated URL
+- updated init script (fixed force-reload, added try-restart)
+- psmain descriptions
+
 Revision 1.19  2008-02-07 17:47:58  sls
 - psmain requires main package
 - TODO entry
@@ -250,4 +256,3 @@
 
 Revision 1.1  2005/01/24 13:33:20  arekm
 - initial
-
================================================================

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

