SPECS: splashutils.spec - add fbres back - hack to build static fb...

[glen]

Author: glen                         Date: Thu Apr 24 01:41:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- add fbres back
- hack to build static fbcondecor_helper

---- Files affected:
SPECS:
   splashutils.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/splashutils.spec
diff -u SPECS/splashutils.spec:1.36 SPECS/splashutils.spec:1.37
--- SPECS/splashutils.spec:1.36	Tue Apr 22 19:00:06 2008
+++ SPECS/splashutils.spec	Thu Apr 24 03:41:35 2008
@@ -1,6 +1,7 @@
 # $Revision$, $Date$
 # TODO
 # - static linking for initrd
+# - move all the .static to initrd dir and package
 # Conditional build:
 %bcond_without	verbose		# verbose build (V=1)
 %bcond_without	initrd	# build klibc static initrd binaries
@@ -8,11 +9,13 @@
 Summary(pl.UTF-8):	Narzędzia do ustawiania splash
 Name:		splashutils
 Version:	1.5.4
-Release:	0.2
+Release:	0.3
 License:	GPL
 Group:		Applications/System
 Source0:	http://dev.gentoo.org/~spock/projects/splashutils/archive/%{name}-%{version}.tar.bz2
 # Source0-md5:	325e11440bb040c72b71556ece17a7dd
+Source1:	http://dev.gentoo.org/~spock/projects/gensplash/archive/misc%{name}-0.1.5.tar.bz2
+# Source1-md5:	20fc3ed2407edc8cd97623bf7f1c5c7b
 Source2:	%{name}.init
 Source3:	%{name}.sysconfig
 Patch0:		%{name}-libs.patch
@@ -24,7 +27,6 @@
 URL:		http://dev.gentoo.org/~spock/projects/splashutils/
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
 BuildRequires:	freetype-devel
 BuildRequires:	gpm-devel
 BuildRequires:	klibc-devel >= 1.1.1-1
@@ -32,6 +34,7 @@
 BuildRequires:	libjpeg-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libpng-devel
+BuildRequires:	libtool
 BuildRequires:	linux-libc-headers >= 7:2.6.9.1-1.5
 BuildRequires:	zlib-devel
 %if %{with initrd}
@@ -74,7 +77,7 @@
 Static splashutils libraries
 
 %prep
-%setup -q %{?notyet:-a1}
+%setup -q -a1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -83,6 +86,8 @@
 #%patch1 -p0
 #%patch2 -p1
 
+mv miscsplashutils-* miscsplashutils
+
 mkdir -p nobuild
 mv libs/freetype-* nobuild
 mv libs/jpeg-* nobuild
@@ -102,6 +107,7 @@
 %if %{with initrd}
 # build klibc static for initrd
 %configure \
+	--with-klibc-compiler="klcc" \
 	--with-themedir=%{_sysconfdir}/splash \
 	--with-gpm \
 	--with-mng \
@@ -110,9 +116,19 @@
 	--with-ttf \
 	--with-ttf-kernel
 
-%{__make} -j1 %{?with_verbose:QUIET=false}
+cd src
+%{__make} \
+	fbcondecor_helper
+	%{?with_verbose:QUIET=false}
+
+# relink. as libtool discarded -static
+%{__cc} -static -Os -w -ffunction-sections -fdata-sections -I. -I/usr/include/freetype2 -I/usr/include -O2 -fno-strict-aliasing -fwrapv -march=i686 -mtune=pentium4 -gdwarf-2 -g2 -Wl,--as-needed -Wl,-z -Wl,relro -Wl,-z -Wl,-combreloc -o fbcondecor_helper fbcondecor_helper-kernel.o fbcondecor_helper-libfbsplash.o fbcondecor_helper-libfbsplashrender.o fbcondecor_helper-fbcon_decor.o fbcondecor_helper-common.o fbcondecor_helper-parse.o fbcondecor_helper-list.o fbcondecor_helper-render.o fbcondecor_helper-image.o fbcondecor_helper-effects.o fbcondecor_helper-ttf.o  -ljpeg -lpng -lfreetype -lz -lm
+cd ..
 
-%{__make} install DESTDIR=`pwd`/klibc
+%{__make} -j1 \
+	%{?with_verbose:QUIET=false}
+
+%{__make} install DESTDIR=$(pwd)/initrd
 %{__make} clean
 %endif
 
@@ -128,7 +144,13 @@
 	--with-ttf \
 	--with-ttf-kernel
 
-%{__make} -j1 %{?with_verbose:QUIET=false}
+%{__make} -j1 \
+	%{?with_verbose:QUIET=false}
+
+%{__make} -C miscsplashutils \
+	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -Os -I/usr/include/freetype2" \
+	LIBDIR="%{_libdir}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -138,6 +160,13 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+install miscsplashutils/{fbres,fbtruetype/{fbtruetype,fbtruetype.static}} $RPM_BUILD_ROOT%{_bindir}
+
+%if %{with initrd}
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install initrd/sbin/fbcondecor_helper $RPM_BUILD_ROOT%{_libdir}/initrd
+%endif
+
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/splash
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/splash
 rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
@@ -172,6 +201,9 @@
 %attr(755,root,root) /sbin/fbsplashd.static
 %attr(755,root,root) /sbin/splash-functions.sh
 %attr(755,root,root) /sbin/splash_util.static
+%attr(755,root,root) %{_bindir}/fbres
+%attr(755,root,root) %{_bindir}/fbtruetype
+%attr(755,root,root) %{_bindir}/fbtruetype.static
 %attr(755,root,root) %{_bindir}/bootsplash2fbsplash
 %attr(755,root,root) %{_bindir}/splash_manager
 %attr(755,root,root) %{_bindir}/splash_resize
@@ -180,6 +212,7 @@
 %attr(755,root,root) %{_sbindir}/fbcondecor_ctl
 %attr(755,root,root) %{_sbindir}/fbsplashd
 %attr(755,root,root) %{_sbindir}/splash_geninitramfs
+
 %attr(755,root,root) %{_libdir}/libfbsplash.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libfbsplash.so.1
 %attr(755,root,root) %{_libdir}/libfbsplashrender.so.*.*.*
@@ -189,6 +222,10 @@
 %dir %{_sysconfdir}/splash
 %dir /var/run/splashutils
 
+# for initrd
+%dir %{_libdir}/initrd
+%{_libdir}/initrd/fbcondecor_helper
+
 %files devel
 %defattr(644,root,root,755)
 %{_libdir}/libfbsplash.so
@@ -210,6 +247,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2008-04-24 01:41:35  glen
+- add fbres back
+- hack to build static fbcondecor_helper
+
 Revision 1.36  2008-04-22 17:00:06  glen
 - cosmetic: relative path on initramfs
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/splashutils.spec?r1=1.36&r2=1.37&f=u