SPECS (AC-branch): qemu.spec - cosmetics

glen glen at pld-linux.org
Wed Jan 23 00:19:41 CET 2008


Author: glen                         Date: Tue Jan 22 23:19:41 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- cosmetics

---- Files affected:
SPECS:
   qemu.spec (1.85.2.25 -> 1.85.2.26) 

---- Diffs:

================================================================
Index: SPECS/qemu.spec
diff -u SPECS/qemu.spec:1.85.2.25 SPECS/qemu.spec:1.85.2.26
--- SPECS/qemu.spec:1.85.2.25	Tue Jan 22 00:44:34 2008
+++ SPECS/qemu.spec	Wed Jan 23 00:19:35 2008
@@ -33,21 +33,22 @@
 %undefine	with_userspace
 %endif
 
-%define	_kqemu_version	1.3.0pre11
-%define	_qemu_version	0.9.1
-%define		_rel	1
+%define		kqemu_version	1.3.0pre11
+%define		qemu_version	0.9.1
 %define		pname	qemu
+
+%define		rel	1
 Summary:	QEMU CPU Emulator
 Summary(pl):	QEMU - emulator procesora
 Name:		%{pname}%{_alt_kernel}
-Version:	%{_qemu_version}
-Release:	%{_rel}%{?with_kqemu:k}
+Version:	%{qemu_version}
+Release:	%{rel}%{?with_kqemu:k}
 License:	GPL
 Group:		Applications/Emulators
 #Source0Download: http://fabrice.bellard.free.fr/qemu/download.html
 Source0:	http://fabrice.bellard.free.fr/qemu/%{pname}-%{version}.tar.gz
 # Source0-md5:	6591df8e9270eb358c881de4ebea1262
-Source1:	http://fabrice.bellard.free.fr/qemu/k%{pname}-%{_kqemu_version}.tar.gz
+Source1:	http://fabrice.bellard.free.fr/qemu/k%{pname}-%{kqemu_version}.tar.gz
 # Source1-md5:	970521874ef8b1ba4598925ace5936c3
 Patch0:		%{pname}-nostatic.patch
 Patch1:		%{pname}-cc.patch
@@ -119,8 +120,8 @@
 %package -n kernel%{_alt_kernel}-misc-kqemu
 Summary:	kqemu - kernel module
 Summary(pl):	kqemu - modu³ j±dra
-Version:	%{_kqemu_version}
-Release:	%{_rel}@%{_kernel_ver_str}
+Version:	%{kqemu_version}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_up}
 License:	GPL v2
@@ -136,8 +137,8 @@
 %package -n kernel%{_alt_kernel}-smp-misc-kqemu
 Summary:	kqemu - SMP kernel module
 Summary(pl):	kqemu - modu³ j±dra SMP
-Version:	%{_kqemu_version}
-Release:	%{_rel}@%{_kernel_ver_str}
+Version:	%{kqemu_version}
+Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
 %{?with_dist_kernel:%requires_releq_kernel_smp}
 License:	GPL v2
@@ -158,7 +159,7 @@
 %endif
 %endif
 
-%setup -q -n %{pname}-%{_qemu_version} %{?with_kernel:-a1}
+%setup -q -n %{pname}-%{qemu_version} %{?with_kernel:-a1}
 %patch0 -p1
 %patch1 -p1
 %patch3 -p1
@@ -184,7 +185,7 @@
 %endif
 
 %if %{with kernel}
-echo -n > kqemu-%{_kqemu_version}/install.sh
+echo -n > kqemu-%{kqemu_version}/install.sh
 
 cat <<'EOF' > modprobe.conf
 # enable dynamic major
@@ -205,7 +206,7 @@
 
 %build
 %if %{with kernel}
-cd kqemu-%{_kqemu_version}
+cd kqemu-%{kqemu_version}
 
 %{__sed} -i 's#include ../config-host.mak##' ./common/Makefile
 %ifarch %{x8664}
@@ -274,7 +275,7 @@
 %endif
 
 %if %{with kernel}
-%install_kernel_modules -m kqemu-%{_kqemu_version}/kqemu -d misc
+%install_kernel_modules -m kqemu-%{kqemu_version}/kqemu -d misc
 install -d $RPM_BUILD_ROOT/etc/{modprobe.d/%{_kernel_ver}{,smp},udev/rules.d}
 install modprobe.conf $RPM_BUILD_ROOT/etc/modprobe.d/%{_kernel_ver}/kqemu.conf
 %if %{with smp} && %{with dist_kernel}
@@ -324,7 +325,7 @@
 %if %{with up} || %{without dist_kernel}
 %files -n kernel%{_alt_kernel}-misc-kqemu
 %defattr(644,root,root,755)
-%doc kqemu-%{_kqemu_version}/LICENSE
+%doc kqemu-%{kqemu_version}/LICENSE
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/kqemu.rules
 %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/%{_kernel_ver}/kqemu.conf
 /lib/modules/%{_kernel_ver}/misc/kqemu.ko*
@@ -333,7 +334,7 @@
 %if %{with smp} && %{with dist_kernel}
 %files -n kernel%{_alt_kernel}-smp-misc-kqemu
 %defattr(644,root,root,755)
-%doc kqemu-%{_kqemu_version}/LICENSE
+%doc kqemu-%{kqemu_version}/LICENSE
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/rules.d/kqemu.rules
 %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/%{_kernel_ver}smp/kqemu.conf
 /lib/modules/%{_kernel_ver}smp/misc/kqemu.ko*
@@ -346,8 +347,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.85.2.26  2008-01-22 23:19:35  glen
+- cosmetics
+
 Revision 1.85.2.25  2008-01-21 23:44:34  undefine
-- add qemu-ppc_old_binutils.patch to fix build on ppc with our AnCientic binutils (don't use function from binutils 2.17, when we use 2.15 on ac
+- add qemu-ppc_old_binutils.patch to fix build on ppc with our AnCientic
+  binutils (don't use function from binutils 2.17, when we use 2.15 on ac
 - release 1 - works fine.
 
 Revision 1.85.2.24  2008-01-19 20:57:33  undefine
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/qemu.spec?r1=1.85.2.25&r2=1.85.2.26&f=u



More information about the pld-cvs-commit mailing list