SPECS: v86d.spec - bcond klibc added, initramfs fixed and packaged.

[pluto]

Author: pluto                        Date: Thu Mar 20 11:09:30 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- bcond klibc added, initramfs fixed and packaged.

---- Files affected:
SPECS:
   v86d.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/v86d.spec
diff -u SPECS/v86d.spec:1.1 SPECS/v86d.spec:1.2
--- SPECS/v86d.spec:1.1	Sat Jan 26 21:18:31 2008
+++ SPECS/v86d.spec	Thu Mar 20 12:09:24 2008
@@ -2,9 +2,10 @@
 #
 # Conditional build:
 %bcond_with	x86emu	# x86emu instead of LRMI/vm86
+%bcond_with	klibc	# use klibc for initramfs purposes
 #
 %ifnarch %{ix86}
-%define	with_x86emu	1
+%define		with_x86emu	1
 %endif
 Summary:	uvesafb userspace helper that runs x86 code in an emulated environment
 Summary(pl.UTF-8):	Program pomocniczy uvesafb uruchamiający kod x86 w emulowanym środowisku
@@ -15,14 +16,19 @@
 Group:		Applications/System
 Source0:	http://dev.gentoo.org/~spock/projects/uvesafb/archive/%{name}-%{version}.tar.bz2
 # Source0-md5:	1c26f40af343bcc465f5832e2c9548d6
-Patch0:		%{name}-system-libs.patch
+Patch0:		%{name}-system-klibc.patch
+Patch1:		%{name}-system-libs.patch
 URL:		http://dev.gentoo.org/~spock/projects/uvesafb/
 BuildRequires:	linux-libc-headers >= 7:2.6.24
+%if %{with klibc}
+BuildRequires:	klibc-static >= 1.5.8-1
+%else
 %if %{with x86emu}
 BuildRequires:	x86emu-devel
 %else
 BuildRequires:	lrmi-devel
 %endif
+%endif
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -39,19 +45,26 @@
 %prep
 %setup -q
 %patch0 -p1
+%{?!with_klibc:%patch1 -p1}
+sed -i 's:-g -O2:$(OPTFLAGS):' Makefile
+# PLD-specific: system-wide v86d resides in /usr/sbin
+sed -i 's:/sbin/v86d 0755:/usr/sbin/v86d 0755:' misc/initramfs
 
 %build
 # not ac
 ./configure \
+	--with%{!?with_klibc:out}-klibc \
 	--with%{!?with_x86emu:out}-x86emu
+
 %{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags}%{!?with_x86emu: -I/usr/include/lrmi}"
+	%{!?with_klibc:CC="%{__cc}"} \
+	OPTFLAGS="%{rpmcflags}%{!?with_klibc:%{!?with_x86emu: -I/usr/include/lrmi}}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 install -D v86d $RPM_BUILD_ROOT%{_sbindir}/v86d
+install -D misc/initramfs $RPM_BUILD_ROOT%{_datadir}/v86d/initramfs
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -60,6 +73,8 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog README TODO
 %attr(755,root,root) %{_sbindir}/v86d
+%dir %{_datadir}/v86d
+%{_datadir}/v86d/initramfs
 
 %define date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -67,5 +82,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2008-03-20 11:09:24  pluto
+- bcond klibc added, initramfs fixed and packaged.
+
 Revision 1.1  2008-01-26 20:18:31  qboosh
 - new
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/v86d.spec?r1=1.1&r2=1.2&f=u