- move tests to %check section

This commit is contained in:
Rex Dieter 2006-12-12 06:37:48 +00:00
parent 4641b5f160
commit 7a10b478a0
3 changed files with 32 additions and 10 deletions

21
fltk-1.1.7-test.patch Normal file
View File

@ -0,0 +1,21 @@
--- 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

View File

@ -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 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# 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: libpng-devel
BuildRequires: libGL-devel libGLU-devel
BuildRequires: pkgconfig
BuildRequires: desktop-file-utils
BuildRequires: man
%package devel
Summary: Development package for %{name}
@ -69,6 +71,7 @@ interactive GUI designer for FLTK.
%setup -q -n %{name}-%{version}%{?extraversion}
%patch1 -p1 -b .199656
%patch2 -p1 -b .test
%build
@ -110,6 +113,10 @@ make -C test uninstall-linux DESTDIR=$RPM_BUILD_ROOT
rm -f $RPM_BUILD_ROOT%{_mandir}/man?/{sudoku,checkers}*
%check
make test ||:
%clean
rm -rf $RPM_BUILD_ROOT
@ -161,6 +168,9 @@ update-desktop-database >& /dev/null ||:
%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)

View File

@ -1,9 +0,0 @@
[Desktop Entry]
Name=Fluid
Comment=Fast Light User Interface Designer
Exec=fluid
Icon=fluid
Terminal=false
Type=Application
Encoding=UTF-8
Categories=Development;GUIDesigner;