SPECS: x86emu.spec - rel 4 - klibc-devel subpackage instead of a lot of hacks

[baggins]

Author: baggins                      Date: Mon Apr  6 11:55:24 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4
- klibc-devel subpackage instead of a lot of hacks

---- Files affected:
SPECS:
   x86emu.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/x86emu.spec
diff -u SPECS/x86emu.spec:1.7 SPECS/x86emu.spec:1.8
--- SPECS/x86emu.spec:1.7	Sat Nov 15 08:27:19 2008
+++ SPECS/x86emu.spec	Mon Apr  6 13:55:19 2009
@@ -1,13 +1,13 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_with	klibc	# use klibc for initramfs purposes
+%bcond_without	klibc	# use klibc for initrd/initramfs purposes
 #
 Summary:	Intel x86 CPU real mode emulator
 Summary(pl.UTF-8):	Emulator trybu rzeczywistego procesorów Intel x86
 Name:		x86emu
 Version:	0.8
-Release:	3
+Release:	4
 License:	MIT
 Group:		Libraries
 Source0:	http://www.scitechsoft.com/ftp/devel/obsolete/x86emu/%{name}-%{version}.tar.gz
@@ -21,8 +21,8 @@
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if %{with klibc}
-%define		_libdir		%{_prefix}/%{_lib}/klibc
-%define		_includedir	%{_prefix}/include/klibc
+%define		_klibdir		%{_prefix}/%{_lib}/klibc
+%define		_kincludedir	%{_prefix}/include/klibc
 %endif
 
 %description
@@ -52,9 +52,6 @@
 Summary:	Header files and static x86emu library
 Summary(pl.UTF-8):	Pliki nagłówkowe i biblioteka statyczna x86emu
 Group:		Development/Libraries
-%if %{with klibc}
-Provides:	%{name}-devel(klibc) = %{version}-%{release}
-%endif
 
 %description devel
 Header files and static x86emu library.
@@ -62,6 +59,17 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe i biblioteka statyczna x86emu.
 
+%package klibc-devel
+Summary:	Header files and static x86emu library for klibc
+Summary(pl.UTF-8):	Pliki nagłówkowe i biblioteka statyczna x86emu dla klibc
+Group:		Development/Libraries
+
+%description klibc-devel
+Header files and static x86emu library for klibc.
+
+%description klibc-devel -l pl.UTF-8
+Pliki nagłówkowe i biblioteka statyczna x86emu dla klibc.
+
 %prep
 %setup -q -c
 %patch0 -p1
@@ -72,8 +80,13 @@
 %build
 %if %{with klibc}
 %{__make} -C scitech/src/x86emu -f makefile.klibc \
-	OPT="%{rpmcflags}"
-%else # klibc
+	OPT="%{rpmcflags} -Os"
+
+mkdir -p klibc
+cp scitech/src/x86emu/libx86emu*.a klibc/
+%{__make} -C scitech/src/x86emu -f makefile.klibc clean
+%endif
+
 %{__make} -C scitech/src/x86emu -f makefile.linux \
 	CC="%{__cc}" \
 	OPT="%{rpmcflags}"
@@ -85,7 +98,6 @@
 	CC="%{__cc}" \
 	OPT="%{rpmcflags}"
 %endif
-%endif # klibc
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -95,6 +107,13 @@
 install scitech/include/x86emu.h $RPM_BUILD_ROOT%{_includedir}/x86emu.h
 cp -a scitech/include/x86emu $RPM_BUILD_ROOT%{_includedir}/x86emu
 
+%if %{with klibc}
+install -d $RPM_BUILD_ROOT{%{_klibdir},%{_kincludedir}}
+install klibc/libx86emu*.a $RPM_BUILD_ROOT%{_klibdir}
+install scitech/include/x86emu.h $RPM_BUILD_ROOT%{_kincludedir}/x86emu.h
+cp -a scitech/include/x86emu $RPM_BUILD_ROOT%{_kincludedir}/x86emu
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -104,16 +123,29 @@
 %defattr(644,root,root,755)
 %doc scitech/src/x86emu/LICENSE
 %{_libdir}/libx86emu.a
-%{!?with_klibc:%{_libdir}/libx86emud.a}
+%{_libdir}/libx86emud.a
 %{_includedir}/x86emu.h
 %{_includedir}/x86emu
 
+%if %{with klibc}
+%files klibc-devel
+%defattr(644,root,root,755)
+%doc scitech/src/x86emu/LICENSE
+%{_klibdir}/libx86emu.a
+%{_kincludedir}/x86emu.h
+%{_kincludedir}/x86emu
+%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.8  2009/04/06 11:55:19  baggins
+- rel 4
+- klibc-devel subpackage instead of a lot of hacks
+
 Revision 1.7  2008/11/15 07:27:19  qboosh
 - simplified klibc bcond by redefining dir macros
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/x86emu.spec?r1=1.7&r2=1.8&f=u