SPECS: x86emu.spec - simplified klibc bcond by redefining dir macros

[qboosh]

Author: qboosh                       Date: Sat Nov 15 07:27:24 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- simplified klibc bcond by redefining dir macros

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

---- Diffs:

================================================================
Index: SPECS/x86emu.spec
diff -u SPECS/x86emu.spec:1.6 SPECS/x86emu.spec:1.7
--- SPECS/x86emu.spec:1.6	Thu Nov 13 22:06:22 2008
+++ SPECS/x86emu.spec	Sat Nov 15 08:27:19 2008
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_with	klibc	# use klibc for initramfs purposes
-
+#
 Summary:	Intel x86 CPU real mode emulator
 Summary(pl.UTF-8):	Emulator trybu rzeczywistego procesorów Intel x86
 Name:		x86emu
@@ -17,8 +17,13 @@
 Patch2:		%{name}-update-v86d.patch
 Patch3:		%{name}-klibc-makefile.patch
 URL:		http://www.scitechsoft.com/products/dev/x86_emulator.html
+%{?with_klibc:BuildRequires:	klibc-devel}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%if %{with klibc}
+%define		_libdir		%{_prefix}/%{_lib}/klibc
+%define		_includedir	%{_prefix}/include/klibc
+%endif
 
 %description
 The SciTech x86emu is an emulator for executing Intel x86 real mode
@@ -48,7 +53,7 @@
 Summary(pl.UTF-8):	Pliki nagłówkowe i biblioteka statyczna x86emu
 Group:		Development/Libraries
 %if %{with klibc}
-Provides:	%{name}-devel(klibc)
+Provides:	%{name}-devel(klibc) = %{version}-%{release}
 %endif
 
 %description devel
@@ -84,11 +89,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_libdir}%{?with_klibc:/klibc},%{_includedir}%{?with_klibc:/klibc}}
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
 
-install scitech/src/x86emu/libx86emu*.a $RPM_BUILD_ROOT%{_libdir}%{?with_klibc:/klibc}
-install scitech/include/x86emu.h $RPM_BUILD_ROOT%{_includedir}%{?with_klibc:/klibc}/x86emu.h
-cp -a scitech/include/x86emu $RPM_BUILD_ROOT%{_includedir}%{?with_klibc:/klibc}/x86emu
+install scitech/src/x86emu/libx86emu*.a $RPM_BUILD_ROOT%{_libdir}
+install scitech/include/x86emu.h $RPM_BUILD_ROOT%{_includedir}/x86emu.h
+cp -a scitech/include/x86emu $RPM_BUILD_ROOT%{_includedir}/x86emu
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,10 +103,10 @@
 %files devel
 %defattr(644,root,root,755)
 %doc scitech/src/x86emu/LICENSE
-%{_libdir}%{?with_klibc:/klibc}/libx86emu.a
+%{_libdir}/libx86emu.a
 %{!?with_klibc:%{_libdir}/libx86emud.a}
-%{_includedir}%{?with_klibc:/klibc}/x86emu.h
-%{_includedir}%{?with_klibc:/klibc}/x86emu
+%{_includedir}/x86emu.h
+%{_includedir}/x86emu
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -109,6 +114,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2008/11/15 07:27:19  qboosh
+- simplified klibc bcond by redefining dir macros
+
 Revision 1.6  2008/11/13 21:06:22  mguevara
 - rel 3; adds klibc bcond, x86emu-klibc-makefile.patch, provides
   x86emu-devel(klibc) when build with klibc
================================================================

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