Author: sparky Date: Sat Sep 20 23:50:37 2008 GMT Module: SPECS Tag: HEAD ---- Log message: - fixes patch - fix output binary name - pass rpmcflags
---- Files affected: SPECS: kvm.spec (1.63 -> 1.64) ---- Diffs: ================================================================ Index: SPECS/kvm.spec diff -u SPECS/kvm.spec:1.63 SPECS/kvm.spec:1.64 --- SPECS/kvm.spec:1.63 Fri Sep 19 15:05:56 2008 +++ SPECS/kvm.spec Sun Sep 21 01:50:31 2008 @@ -34,6 +34,7 @@ Group: Applications/System Source0: http://dl.sourceforge.net/kvm/%{pname}-%{version}.tar.gz # Source0-md5: 5a00ac6ee704fbf537a751522bd37d15 +Patch0: %{name}-fixes.patch URL: http://kvm.qumranet.com/kvmwiki BuildRequires: bash BuildRequires: sed >= 4.0 @@ -66,18 +67,22 @@ %ifarch %{ix86} %define carch i386 %define karch x86 +%define qemuarch x86_64 %endif %ifarch %{x8664} %define carch x86_64 %define karch x86 +%define qemuarch x86_64 %endif %ifarch ia64 %define carch ia64 %define karch ia64 +%define qemuarch ia64 %endif %ifarch ppc %define carch powerpc %define karch powerpc +%define qemuarch ppcemb %endif %description @@ -130,6 +135,7 @@ %prep %setup -q -n %{pname}-%{version} +%patch0 -p1 sed -i -e 's#header-sync-$(if $(WANT_MODULE),n,y)#header-sync-n#g' Makefile @@ -145,6 +151,8 @@ --prefix=%{_prefix} \ --kerneldir=%{_kernelsrcdir} +echo "CFLAGS=%{rpmcflags}" >> user/config.mak + rm -f kernel/include/asm ln -s %{_kernelsrcdir}/include/asm-%{karch} kernel/include/asm @@ -171,7 +179,7 @@ %endif # changing binary name to avoid conflict with qemu -mv -f $RPM_BUILD_ROOT%{_bindir}/qemu-system-x86_64 $RPM_BUILD_ROOT%{_bindir}/%{pname} +mv -f $RPM_BUILD_ROOT%{_bindir}/qemu-system-%{qemuarch} $RPM_BUILD_ROOT%{_bindir}/%{pname} install kvm_stat $RPM_BUILD_ROOT%{_bindir} install -D scripts/65-kvm.rules $RPM_BUILD_ROOT/etc/udev/rules.d/kvm.rules @@ -227,6 +235,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.64 2008/09/20 23:50:31 sparky +- fixes patch +- fix output binary name +- pass rpmcflags + Revision 1.63 2008/09/19 13:05:56 sparky - configure and kernel arch are different ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kvm.spec?r1=1.63&r2=1.64&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
