SPECS: suspend.spec - up to 20060807 snap

[arekm]

Author: arekm                        Date: Thu Sep 28 10:28:59 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 20060807 snap

---- Files affected:
SPECS:
   suspend.spec (1.24 -> 1.25) 

---- Diffs:

================================================================
Index: SPECS/suspend.spec
diff -u SPECS/suspend.spec:1.24 SPECS/suspend.spec:1.25
--- SPECS/suspend.spec:1.24	Fri Sep 15 21:24:53 2006
+++ SPECS/suspend.spec	Thu Sep 28 12:28:53 2006
@@ -1,6 +1,8 @@
 # $Revision$, $Date$
-%define	_snap	20060807
-%define	_rel	2
+%bcond_with	splashy
+#
+%define	_snap	20060928
+%define	_rel	1
 Summary:	Suspend to RAM
 Summary(de):	Einfrieren in den Systemspeicher (RAM)
 Summary(pl):	Zamrażanie w RAM
@@ -11,12 +13,15 @@
 Group:		Applications/System
 Source0:	http://ep09.pld-linux.org/~arekm/%{name}-%{_snap}.tar.gz
 # Source0-md5:	c89ebdf1b25e31d05ae86c73e68c4289
-Patch0:		%{name}-zlib.patch
+Patch0:		%{name}-build.patch
 URL:		http://sourceforge.net/projects/suspend
 BuildRequires:	glibc-static
+BuildRequires:	libgcrypt-static
+BuildRequires:	libgpg-error-static
 BuildRequires:	liblzf-static
 BuildRequires:	pciutils-devel
 BuildRequires:	sed >= 4.0
+%{?with_splashy:BuildRequires:	splashy-devel}
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -37,16 +42,19 @@
 
 %build
 %{__make} \
+	CONFIG_COMPRESS=yes \
+	CONFIG_ENCRYPT=yes \
+	%{?with_splashy:CONFIG_SPLASHY=yes} \
 	CC="%{__cc}" \
 	ARCH="%{_target_cpu}" \
-	CC_FLAGS="%{rpmcflags} -DCONFIG_COMPRESS" \
-	LD_FLAGS="%{rpmldflags} -llzf"
+	CFLAGS="%{rpmcflags}" \
+	LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_sbindir},%{_sysconfdir}}
 
-install resume s2both s2disk s2ram $RPM_BUILD_ROOT%{_sbindir}
+install resume s2both s2disk s2ram suspend-keygen $RPM_BUILD_ROOT%{_sbindir}
 install conf/suspend.conf $RPM_BUILD_ROOT%{_sysconfdir}
 
 %clean
@@ -64,6 +72,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.25  2006/09/28 10:28:53  arekm
+- up to 20060807 snap
+
 Revision 1.24  2006/09/15 19:24:53  glen
 - s2ram and s2both need symbols from zlib; rel 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/suspend.spec?r1=1.24&r2=1.25&f=u