Browse Source

new upstream release

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9798 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 8 years ago
parent
commit
d2f487bd89
2 changed files with 22 additions and 7 deletions
  1. 8 3
      d/debootstrap/debootstrap-vl.spec
  2. 14 4
      q/qemu/qemu-vl.spec

+ 8 - 3
d/debootstrap/debootstrap-vl.spec

@@ -1,5 +1,5 @@
 Name:           debootstrap
-Version:        1.0.46
+Version:        1.0.74
 Release:        1%{?_dist_release}
 Summary:        Debian GNU/Linux bootstrapper
 
@@ -7,8 +7,8 @@ Group:          System Environment/Base
 License:        MIT
 URL:            http://code.erisian.com.au/Wiki/debootstrap
 Source0:        http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_%{version}.tar.gz
-Patch0:         debootstrap-devices.patch
-Patch1:         debootstrap-perms.patch
+Patch0:         debootstrap-1.0.74-devices.patch
+Patch1:         debootstrap-1.0.74-perms.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:      noarch
 
@@ -68,6 +68,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Nov 08 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.0.74-1
+- new upstream release
+- update Patch0 (debootstrap-1.0.74-devices.patch)
+- update Patch1 (debootstrap-1.0.74-perms.patch)
+
 * Fri Mar 22 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 1.0.46-1
 - new upstream release
 

+ 14 - 4
q/qemu/qemu-vl.spec

@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Summary(ja): QEMU 高速なプロセッサ・エミュレーター
 Name: qemu
-Version: 1.7.1
+Version: 2.4.1
 Release: 1%{?_dist_release}
 License: GPLv2+ and LGPLv2+ and BSD
 Group: Development/Tools
@@ -23,6 +23,8 @@ Source6: ksmtuned.init
 Source7: ksmtuned
 Source8: ksmtuned.conf
 
+Patch0: qemu-2.4.1-build-fix-vine.patch
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: SDL-devel zlib-devel which texi2html gnutls-devel cyrus-sasl-devel
@@ -70,8 +72,6 @@ BuildRequires: libfdt-devel
 BuildRequires: check-devel
 # For virtfs
 BuildRequires: libcap-devel
-Requires: %{name}-user = %{version}-%{release}
-
 
 Requires: %{name}-user = %{version}-%{release}
 Requires: %{name}-system-x86 = %{version}-%{release}
@@ -283,6 +283,7 @@ such as kvmtrace and kvm_stat.
 
 %prep
 %setup -q
+%patch0 -p1 
 
 %build
 # --build-id option is used fedora 8 onwards for giving info to the debug packages.
@@ -390,6 +391,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_prefix}/lib/pkgconfig/libcacard.pc
 rm -rf ${RPM_BUILD_ROOT}%{_includedir}/cacard
 rm -rf ${RPM_BUILD_ROOT}%{_includedir}/cacard
 
+
 # the pxe gpxe images will be symlinks to the images on
 # /usr/share/gpxe, as QEMU doesn't know how to look
 # for other paths, yet.
@@ -476,6 +478,7 @@ fi
 %doc %{qemudocdir}/LICENSE
 %dir %{_datadir}/%{name}/
 %{_datadir}/%{name}/keymaps/
+%{_datadir}/%{name}/trace-events
 %{_mandir}/man1/qemu.1*
 %{_mandir}/man1/virtfs-proxy-helper.1*
 %{_mandir}/man8/qemu-nbd.8*
@@ -520,6 +523,7 @@ fi
 %{_bindir}/qemu-system-i386
 %{_bindir}/qemu-system-x86_64
 %{_datadir}/%{name}/bios.bin
+%{_datadir}/%{name}/bios-256k.bin
 %{_datadir}/%{name}/sgabios.bin
 %{_datadir}/%{name}/linuxboot.bin
 %{_datadir}/%{name}/multiboot.bin
@@ -529,6 +533,7 @@ fi
 %{_datadir}/%{name}/vgabios-qxl.bin
 %{_datadir}/%{name}/vgabios-stdvga.bin
 %{_datadir}/%{name}/vgabios-vmware.bin
+%{_datadir}/%{name}/vgabios-virtio.bin
 %{_datadir}/%{name}/pxe-e1000.rom
 %{_datadir}/%{name}/pxe-virtio.rom
 %{_datadir}/%{name}/pxe-pcnet.rom
@@ -544,7 +549,6 @@ fi
 %{_datadir}/%{name}/q35-acpi-dsdt.aml
 %{_datadir}/%{name}/qemu_logo_no_text.svg
 %{_datadir}/%{name}/qemu-icon.bmp
-%config(noreplace) %{_sysconfdir}/qemu/target-x86_64.conf
 %ifarch %{ix86} x86_64
 %{_bindir}/qemu-kvm
 %{_sysconfdir}/sysconfig/modules/kvm.modules
@@ -560,6 +564,7 @@ fi
 %{_datadir}/%{name}/openbios-sparc32
 %{_datadir}/%{name}/openbios-sparc64
 %{_datadir}/%{name}/QEMU,tcx.bin
+%{_datadir}/%{name}/QEMU,cgthree.bin
 
 %files system-arm
 %defattr(-,root,root)
@@ -581,6 +586,7 @@ fi
 # %{_datadir}/%{name}/video.x
 # %{_datadir}/%{name}/bamboo.dtb
 %{_datadir}/%{name}/ppc_rom.bin
+%{_datadir}/%{name}/u-boot.e500
 
 %files system-cris
 %defattr(-,root,root)
@@ -603,6 +609,10 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
+* Sun Nov 08 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.1-1
+- new upstream release
+- add Patch0 (qemu-2.4.1-build-fix-vine.patch)
+
 * Sat Jul 05 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.7.1-1
 - new upstream release