SPECS: splashutils.spec - splash_kern builds with klibc now (truet...

[pluto]

Author: pluto                        Date: Tue Jun 14 00:54:50 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- splash_kern builds with klibc now (truetype support nfy).
- release 0.2.

---- Files affected:
SPECS:
   splashutils.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: SPECS/splashutils.spec
diff -u SPECS/splashutils.spec:1.16 SPECS/splashutils.spec:1.17
--- SPECS/splashutils.spec:1.16	Mon Jun 13 19:57:15 2005
+++ SPECS/splashutils.spec	Tue Jun 14 02:54:44 2005
@@ -10,7 +10,7 @@
 Summary(pl):	Narzędzia do ustawiania fbsplash
 Name:		splashutils
 Version:	1.1.9.6
-Release:	0.1
+Release:	0.2
 License:	GPL
 Group:		System
 Source0:	http://dev.gentoo.org/~spock/projects/gensplash/archive/%{name}-%{version}.tar.bz2
@@ -21,8 +21,10 @@
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-makefile.patch
+Patch1:		%{name}-config.patch
 URL:		http://dev.gentoo.org/~spock/projects/gensplash/
 BuildRequires:	freetype-static
+BuildRequires:	glibc-static
 BuildRequires:	klibc >= 1.0
 BuildRequires:	libjpeg-static
 BuildRequires:	libpng-static
@@ -39,15 +41,22 @@
 %prep
 %setup -q -a1
 %patch0 -p1
-rm -rf libs
+%patch1 -p1
+rm -rf libs/klibc*
+rm -rf libs/zlib*
 
 %build
-%{__make} splash_kern splash_user \
+%{__make} splash_kern \
+	CC=klcc \
 	CRT0=%{_libdir}/klibc/crt0.o \
 	LIBC=%{_libdir}/klibc/libc.a
 
+%{__make} splash_user \
+	CC=%{__cc} \
+	CFLAGS="%{rpmcflags} -Os"
+
 %{__make} -C miscsplashutils-%{_misc_ver} \
-	CFLAGS="%{rpmcflags} -I/usr/include/freetype2" \
+	CFLAGS="%{rpmcflags} -Os -I/usr/include/freetype2" \
 	LIBDIR="%{_libdir}"
 
 %install
@@ -87,6 +96,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2005/06/14 00:54:44  pluto
+- splash_kern builds with klibc now (truetype support nfy).
+- release 0.2.
+
 Revision 1.16  2005/06/13 17:57:15  pluto
 - updated to 1.1.9.6, use klibc, nfy.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/splashutils.spec?r1=1.16&r2=1.17&f=u