rpms/xscreensaver/F-8 xscreensaver.spec,1.64,1.65

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/xscreensaver/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25768

Modified Files:
	xscreensaver.spec 
Log Message:
* Thu Jul 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
- Build some test binaries for debugging



Index: xscreensaver.spec
===================================================================
RCS file: /cvs/extras/rpms/xscreensaver/F-8/xscreensaver.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- xscreensaver.spec	17 Jul 2008 01:59:19 -0000	1.64
+++ xscreensaver.spec	24 Jul 2008 02:17:35 -0000	1.65
@@ -14,14 +14,15 @@
 %define pam_ver       0.80-7
 %define autoconf_ver  2.53
 
-%define update_po     1
+%define update_po     0
+%define build_tests   1
 
 Buildroot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Summary:         X screen saver and locker
 Name:            %{name}
 Version:         %{mainversion}
-Release:         %{fedora_rel}%{?dist}%{?extrarel}
+Release:         %{fedora_rel}%{?dist}%{?extrarel}.1
 Epoch:           1
 License:         BSD
 Group:           Amusements/Graphics
@@ -104,6 +105,11 @@
 Requires:        %{name}-gl-extras = %{epoch}:%{version}-%{release}
 Requires:        gnome-screensaver
 
+%package tests
+Summary:         Test programs related to XScreenSaver
+Group:           Development/Debuggers
+Requires:        %{name}-base = %{epoch}:%{version}-%{release}
+
 
 %description
 A modular screen saver and locker for the X Window System.
@@ -166,6 +172,8 @@
 This package contains desktop files of gl-extras screensavers
 for gnome-screensaver compatibility.
 
+%description tests
+This package contains some test programs to debug XScreenSaver.
 
 
 %prep
@@ -279,6 +287,22 @@
    driver/screensaver-properties.desktop.in
 %endif
 
+# Disable (don't build) some tests
+# apm: doesn't compile
+# passwd: causes segv
+# mlstring: causes OOM
+sed -i.test \
+   -e 's|test-apm[ \t][ \t]*t|t|' \
+   -e 's|test-passwd[ \t][ \t]*t|t|' \
+   -e 's|test-mlstring[ \t][ \t]*t|t|' \
+   driver/Makefile.in
+sed -i.dir -e '/TEST_FADE_OBJS =/s|UTILS_SRC|UTILS_BIN|' driver/Makefile.in
+
+# test-fade: give more time between fading
+sed -i.delay -e 's| delay = 1| delay = 3|' driver/test-fade.c
+# test-grab: testing time too long, setting time 15 min -> 20 sec
+sed -i.delay -e 's|60 \* 15|20|' driver/test-grab.c
+
 %build
 autoconf
 
@@ -331,6 +355,11 @@
 
 %endif
 
+# test
+%if %{build_tests}
+make tests -C driver
+%endif
+
 %install
 archdir=`./config.guess`
 cd $archdir
@@ -464,6 +493,17 @@
    fi
 done
 
+# tests
+%if %{build_tests}
+echo "%%defattr(-,root,root,-)" > $dd/tests.files
+cd driver
+for tests in `find . -name test-\* -perm -0700` ; do
+   install -cpm 0755 $tests ${RPM_BUILD_ROOT}%{_libexecdir}/xscreensaver
+   echo "%{_libexecdir}/xscreensaver/$tests" >> $dd/tests.files
+done
+cd ..
+%endif
+
 # create desktop entry for gnome-screensaver
 create_desktop(){
    COMMAND=`cat $1 | sed -n -e 's|^<screen.*name=\"\([^ ][^ ]*\)\".*$|\1|p'`
@@ -540,6 +580,11 @@
 %files -f base.files base
 %defattr(-,root,root,-)
 
+%if %{build_tests}
+%files -f tests.files tests
+%defattr(-,root,root,-)
+%endif
+
 %files -f extras.files extras
 %defattr(-,root,root,-)
 
@@ -558,6 +603,9 @@
 %defattr(-,root,root,-)
 
 %changelog
+* Thu Jul 24 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp>
+- Build some test binaries for debugging
+
 * Thu Jul 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1:5.06-1
 - Update to 5.06