SPECS: suspend2-userui.spec - 0.7.2 - subpackages

[shadzik]

Author: shadzik                      Date: Thu Aug 23 13:19:05 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 0.7.2
- subpackages

---- Files affected:
SPECS:
   suspend2-userui.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: SPECS/suspend2-userui.spec
diff -u SPECS/suspend2-userui.spec:1.23 SPECS/suspend2-userui.spec:1.24
--- SPECS/suspend2-userui.spec:1.23	Mon Apr  2 23:58:40 2007
+++ SPECS/suspend2-userui.spec	Thu Aug 23 15:19:00 2007
@@ -1,22 +1,25 @@
 # $Revision$, $Date$
 
-%bcond_with	static	# don't use shared libraries
+%bcond_with	static		# don't use shared libraries
+%bcond_with	usplash		# build usplash UI
+%bcond_without	fbsplash	# don't build fbsplash UI
 
 Summary:	Suspend2 User UI
 Summary(de.UTF-8):	Suspend2 Benutzer Interface
 Summary(pl.UTF-8):	Interfejs użytkownika dla Suspend2
 Name:		suspend2-userui
-Version:	0.7.0
+Version:	0.7.2
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://www.suspend2.net/downloads/all/%{name}-%{version}.tar.gz
-# Source0-md5:	7a41e9195597319825ecee0d1f3aa166
+# Source0-md5:	7403ebf48a598ba13d5155b2660a06df
 Patch0:		%{name}-Makefile.patch
 Patch1:		%{name}-ppc.patch
 URL:		http://www.suspend2.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
+%if %{with fbsplash}
 BuildRequires:	freetype-devel
 BuildRequires:	lcms-devel
 BuildRequires:	libjpeg-devel
@@ -32,22 +35,57 @@
 BuildRequires:	libpng-static >= 1.2.12
 BuildRequires:	zlib-static
 %endif
+%endif
+%if %{with usplash}
+BuildRequires:	usplash
+%endif
 Requires:	hibernate >= 1.93
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Suspend2-userui allows you use a user interface while hibernating your
-laptop. There is a text-ui and a graphical fbsplash-ui available.
+Suspend2-userui allows you to use a user interface while hibernating
+your laptop. There is a text-ui and a graphical fbsplash-ui/usplash-ui
+available.
 
 %description -l de.UTF-8
 Suspend2-userui erlaubt es dir ein Benutzer Interface zu nutzen wenn
-du deinen Laptop einfrierst. Ein Tekst-UI und ein graphisches UI
-stehen zur Verfügung.
+du deinen Laptop einfrierst. Ein Tekst-UI und graphische UIs
+(fbsplash/usplash) stehen zur Verfügung.
 
 %description -l pl.UTF-8
 Suspend2-userui pozwala na używanie interfejsu użytkownika w procesie
 hibernacji laptopa. Dostępny jest tryb tekstowy oraz graficzny
-(fbsplash).
+(fbsplash/usplash).
+
+%package fbsplash
+Summary:	Suspend2 User UI for fbsplash
+Summary(de.UTF-8):	Suspend2 Benutzer Interface für fbsplash
+Summary(pl.UTF-8):	Interfejs użytkownika dla Suspend2 używającego fbsplash
+Group:		Applications/System
+
+%description fbsplash
+This package provides the fbsplash UI.
+
+%description fbsplash -l de.UTF-8
+Dieses Paket enthält das fbsplash UI.
+
+%description fbsplash -l pl.UTF-8
+Ta paczka zawiera UI dla fbsplasha.
+
+%package usplash
+Summary:	Suspend2 User UI for usplash
+Summary(de.UTF-8):	Suspend2 Benutzer Interface für usplash
+Summary(pl.UTF-8):	Interfejs użytkownika dla Suspend2 używającego usplash
+Group:		Applications/System
+
+%description usplash
+This package provides the usplash UI.
+
+%description usplash -l de.UTF-8
+Dieses Paket enthält das usplash UI.
+
+%description usplash -l pl.UTF-8
+Ta paczka zawiera UI dla usplasha.
 
 %prep
 %setup -q
@@ -58,17 +96,47 @@
 %endif
 
 %build
-%{__make} \
+%{__make} clean
+%{__make} tuxoniceui_text \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}" \
+	%{?with_static:LDFLAGS="-static"}
+
+%if %{with fbsplash}
+%{__make} -C fbsplash
+	CC="%{__cc}"
+	CFLAGS="%{rpmcflags}"
+	%{?with_static:LDFLAGS="-static"}
+
+%{__make} tuxoniceui_fbsplash \
 	CC="%{__cc}" \
 	CFLAGS="%{rpmcflags}" \
 	%{?with_static:LDFLAGS="-static"}
-	
+%endif
+
+%if %{with usplash}
+%{__make} -C usplash
+	CC="%{__cc}"
+	CFLAGS="%{rpmcflags}"
+	%{?with_static:LDFLAGS="-static"}
+
+%{__make} tuxoniceui_usplash \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags}" \
+	%{?with_static:LDFLAGS="-static"}
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_sbindir}
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+install tuxoniceui_text $RPM_BUILD_ROOT%{_sbindir}
+%if %{with fbsplash}
+install tuxoniceui_fbsplash $RPM_BUILD_ROOT%{_sbindir}
+%endif
+%if %{with usplash}
+install tuxoniceui_usplash $RPM_BUILD_ROOT%{_sbindir}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -76,7 +144,19 @@
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README USERUI_API KERNEL_API
-%attr(755,root,root) %{_sbindir}/suspend2ui_*
+%attr(755,root,root) %{_sbindir}/tuxoniceui_text
+
+%if %{with fbsplash}
+%files fbsplash
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/tuxoniceui_fbsplash
+%endif
+
+%if %{with usplash}
+%files usplash
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/tuxoniceui_usplash
+%endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -84,6 +164,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2007/08/23 13:19:00  shadzik
+- 0.7.2
+- subpackages
+
 Revision 1.23  2007/04/02 21:58:40  shadzik
 - fix build
 - clear TODO
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/suspend2-userui.spec?r1=1.23&r2=1.24&f=u