SPECS: v86d.spec - rel 3 - renamed bcond klibc -> initrd - build initrd sub...

[baggins]

Author: baggins                      Date: Mon Apr  6 12:42:09 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 3
- renamed bcond klibc -> initrd
- build initrd subpackage

---- Files affected:
SPECS:
   v86d.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/v86d.spec
diff -u SPECS/v86d.spec:1.21 SPECS/v86d.spec:1.22
--- SPECS/v86d.spec:1.21	Sat Nov 15 08:40:15 2008
+++ SPECS/v86d.spec	Mon Apr  6 14:42:03 2009
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_with	x86emu	# x86emu instead of LRMI/vm86
-%bcond_with	klibc	# use klibc for initramfs purposes
+%bcond_without	initrd	# don't build klibc based helper for initrd/initramfs
 #
 %ifnarch %{ix86}
 %define		with_x86emu	1
@@ -11,7 +11,7 @@
 Summary(pl.UTF-8):	Program pomocniczy uvesafb uruchamiający kod x86 w emulowanym środowisku
 Name:		v86d
 Version:	0.1.9
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://dev.gentoo.org/~spock/projects/uvesafb/archive/%{name}-%{version}.tar.bz2
@@ -22,19 +22,18 @@
 Patch2:		%{name}-klibc-ldflags.patch
 URL:		http://dev.gentoo.org/~spock/projects/uvesafb/
 BuildRequires:	linux-libc-headers >= 7:2.6.24
-%if %{with klibc}
+%if %{with initrd}
 BuildRequires:	klibc-static >= 1.5.8-1
-%if %{with x86emu}
-BuildRequires:	x86emu-devel(klibc)
+	%if %{with x86emu}
+BuildRequires:	x86emu-klibc-devel
+	%else
+BuildRequires:	lrmi-klibc-devel >= 0.10-6
+	%endif
 %endif
-%else
 %if %{with x86emu}
 BuildRequires:	x86emu-devel
 %else
 BuildRequires:	lrmi-devel >= 0.10-4
-%endif
-%endif
-%if %{without x86emu}
 Requires:	lrmi >= 0.10-4
 %endif
 ExclusiveArch:	%{ix86} %{x8664}
@@ -52,6 +51,19 @@
 uruchamiający kod x86. Jest wykorzystywany przez sterownik jądra
 Linuksa uvesafb. Obecnie obsługuje architektury x86 i x86-64.
 
+%package initrd
+Summary:	uvesafb userspace helper that runs x86 code in an emulated environment - initrd version
+Summary(pl.UTF-8):	Program pomocniczy uvesafb uruchamiający kod x86 w emulowanym środowisku - wersja dla initrd
+Group:		Base
+
+%description initrd
+uvesafb userspace helper that runs x86 code in an emulated environment
+- initrd version
+
+%description initrd -l pl.UTF-8
+Program pomocniczy uvesafb uruchamiający kod x86 w emulowanym środowisku
+- wersja dla initrd
+
 %prep
 %setup -q
 %patch0 -p1
@@ -60,18 +72,29 @@
 %patch2 -p1
 
 %build
+%if %{with initrd}
 # not ac
 ./configure \
-	--with%{!?with_klibc:out}-klibc \
+	--with-klibc \
 	--with%{!?with_x86emu:out}-x86emu
 
 %{__make} \
-%if %{with klibc}
 	LIB=%{_lib} \
-%else
-	CC="%{__cc}" \
+	CFLAGS="%{rpmcflags} -Os %{!?with_x86emu:-I/usr/include/klibc/lrmi}"
+
+mkdir -p initrd
+cp v86d initrd/
+%{__make} clean
 %endif
-	OPTFLAGS="%{rpmcflags}%{!?with_x86emu: -I/usr/include/lrmi}"
+
+# not ac
+./configure \
+	--without-klibc \
+	--with%{!?with_x86emu:out}-x86emu
+
+%{__make} \
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags} %{!?with_x86emu:-I/usr/include/lrmi}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +103,11 @@
 install %{name} $RPM_BUILD_ROOT%{_sbindir}/%{name}
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/modprobe.d/uvesafb.conf
 
+%if %{with initrd}
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install initrd/%{name} $RPM_BUILD_ROOT%{_libdir}/initrd
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -89,12 +117,23 @@
 %attr(755,root,root) %{_sbindir}/v86d
 %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/uvesafb.conf
 
+%if %{with initrd}
+%files initrd
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/initrd/v86d
+%endif
+
 %define date    %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2009/04/06 12:42:03  baggins
+- rel 3
+- renamed bcond klibc -> initrd
+- build initrd subpackage
+
 Revision 1.21  2008/11/15 07:40:15  qboosh
 - updated klibc-ldflags patch not to break on multilib systems
 
================================================================

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