rpms/fltk/devel fltk-1.1.7-test.patch, NONE, 1.1 fltk.spec, 1.21, 1.22 fluid.desktop, 1.1, NONE

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/extras/rpms/fltk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20475

Modified Files:
	fltk.spec 
Added Files:
	fltk-1.1.7-test.patch 
Removed Files:
	fluid.desktop 
Log Message:
* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-6
- move tests to %check section


fltk-1.1.7-test.patch:

--- NEW FILE fltk-1.1.7-test.patch ---
--- fltk-1.1.7/Makefile.test	2006-01-15 12:36:16.000000000 -0600
+++ fltk-1.1.7/Makefile	2006-12-12 00:34:49.000000000 -0600
@@ -27,7 +27,7 @@
 
 include makeinclude
 
-DIRS	=	$(IMAGEDIRS) src fluid test documentation
+DIRS	=	$(IMAGEDIRS) src fluid documentation
 
 all: makeinclude
 	for dir in $(DIRS); do\
@@ -35,6 +35,9 @@
 		(cd $$dir; $(MAKE) $(MFLAGS)) || break;\
 	done
 
+test:	
+	(cd test;; $(MAKE) $(MFLAGS)) ||:
+
 install: makeinclude
 	-mkdir -p $(DESTDIR)$(bindir)
 	$(RM) $(DESTDIR)$(bindir)/fltk-config


Index: fltk.spec
===================================================================
RCS file: /cvs/extras/rpms/fltk/devel/fltk.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- fltk.spec	12 Dec 2006 06:05:54 -0000	1.21
+++ fltk.spec	12 Dec 2006 06:37:48 -0000	1.22
@@ -2,7 +2,7 @@
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.1.7
-Release:	5%{?dist}
+Release:	6%{?dist}
 
 License:	LGPL with exceptions
 Group:		System Environment/Libraries
@@ -12,6 +12,7 @@
 
 # See http://bugzilla.redhat.com/199656
 Patch1:         fltk-1.1.7-config.patch
+Patch2:         fltk-1.1.7-test.patch
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 BuildRequires:  libICE-devel libSM-devel
@@ -26,6 +27,7 @@
 BuildRequires:  libGL-devel libGLU-devel 
 BuildRequires:  pkgconfig
 BuildRequires:  desktop-file-utils
+BuildRequires:	man
 
 %package devel
 Summary:	Development package for %{name}
@@ -69,6 +71,7 @@
 %setup -q -n %{name}-%{version}%{?extraversion}
 
 %patch1 -p1 -b .199656
+%patch2 -p1 -b .test
 
 
 %build
@@ -110,6 +113,10 @@
 rm -f  $RPM_BUILD_ROOT%{_mandir}/man?/{sudoku,checkers}*
 
 
+%check
+make test ||:
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -161,6 +168,9 @@
 
 
 %changelog
+* Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-6
+- move tests to %%check section
+
 * Mon Dec 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1.7-5
 - use included icon/.desktop files
 - fix up fltk-config (#199656)


--- fluid.desktop DELETED ---