rpms/qmc2/F-11 .cvsignore, 1.10, 1.11 qmc2-ini.patch, 1.5, 1.6 qmc2.spec, 1.17, 1.18 sources, 1.10, 1.11
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/qmc2/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8664
Modified Files:
.cvsignore qmc2-ini.patch qmc2.spec sources
Log Message:
* Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.15.b11
- Updated to 0.2b11
- Updated the ini patch
- Dropped F12 rawhide workaround
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-11/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 20 Jul 2009 22:04:04 -0000 1.10
+++ .cvsignore 11 Sep 2009 07:58:28 -0000 1.11
@@ -1 +1 @@
-qmc2-0.2.b10.tar.bz2
+qmc2-0.2.b11.tar.bz2
qmc2-ini.patch:
Index: qmc2-ini.patch
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-11/qmc2-ini.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qmc2-ini.patch 23 Apr 2009 20:00:44 -0000 1.5
+++ qmc2-ini.patch 11 Sep 2009 07:58:28 -0000 1.6
@@ -1,7 +1,7 @@
---- inst/qmc2.ini.template.ini~ 2009-03-30 18:33:59.000000000 +0200
-+++ inst/qmc2.ini.template 2009-04-16 11:49:51.000000000 +0200
-@@ -17,7 +17,42 @@
- qmc2-sdlmess\FilesAndDirectories\TitleDirectory=DATADIR/qmc2/ttl/
+--- inst/qmc2.ini.template.ini~ 2009-07-22 23:25:59.000000000 +0200
++++ inst/qmc2.ini.template 2009-09-11 09:29:17.000000000 +0200
+@@ -19,7 +19,42 @@
+ qmc2-sdlmess\FilesAndDirectories\PCBDirectory=DATADIR/qmc2/pcb/
[MAME]
+Configuration\Global\rompath="DATADIR/mame/roms;DATADIR/mame/chds"
Index: qmc2.spec
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-11/qmc2.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- qmc2.spec 20 Jul 2009 22:04:04 -0000 1.17
+++ qmc2.spec 11 Sep 2009 07:58:28 -0000 1.18
@@ -1,8 +1,8 @@
-%define beta b10
+%define beta b11
Name: qmc2
Version: 0.2
-Release: 0.14.%{beta}%{?dist}
+Release: 0.15.%{beta}%{?dist}
Summary: M.A.M.E./M.E.S.S. Catalog / Launcher II, common files
Group: Applications/Emulators
@@ -140,8 +140,14 @@
%changelog
+* Fri Sep 11 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.15.b11
+- Updated to 0.2b11
+- Updated the ini patch
+- Dropped F12 rawhide workaround
+
* Mon Jul 20 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.14.b10
- Updated to 0.2b10
+- Added F12 rawhide config
* Mon Jun 08 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0.2-0.13.b9
- Updated to 0.2b9
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/qmc2/F-11/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 20 Jul 2009 22:04:04 -0000 1.10
+++ sources 11 Sep 2009 07:58:28 -0000 1.11
@@ -1 +1 @@
-a6e2bca1e82d492b46ab5ecb4e86e0a1 qmc2-0.2.b10.tar.bz2
+0ee553277bb67b20003debf4f9496b35 qmc2-0.2.b11.tar.bz2
15 years, 3 months
rpms/VirtualBox-OSE/F-11 VirtualBox-OSE-3.0.4-noansi.patch, NONE, 1.1 VirtualBox-OSE-3.0.6-strings.patch, NONE, 1.1 VirtualBox-OSE-3.0.6-xorg17.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 VirtualBox-OSE.spec, 1.14, 1.15 sources, 1.7, 1.8 VirtualBox-OSE-3.0.0-strings.patch, 1.1, NONE VirtualBox-OSE-3.0.2-xinput2.patch, 1.1, NONE VirtualBox-OSE-3.0.2-xorg17.patch, 1.1, NONE VirtualBox-OSE-3.0.4-pulse0916.patch, 1.1, NONE VirtualBox-OSE-3.0.4-vblank.patch, 1.1, NONE VirtualBox-OSE-3.0.4-videodrv6.patch, 1.1, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5541/F-11
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.0.4-noansi.patch
VirtualBox-OSE-3.0.6-strings.patch
VirtualBox-OSE-3.0.6-xorg17.patch
Removed Files:
VirtualBox-OSE-3.0.0-strings.patch
VirtualBox-OSE-3.0.2-xinput2.patch
VirtualBox-OSE-3.0.2-xorg17.patch
VirtualBox-OSE-3.0.4-pulse0916.patch
VirtualBox-OSE-3.0.4-vblank.patch
VirtualBox-OSE-3.0.4-videodrv6.patch
Log Message:
Merge from devel
VirtualBox-OSE-3.0.4-noansi.patch:
--- NEW FILE VirtualBox-OSE-3.0.4-noansi.patch ---
On Rawhide as of 01 Sep 2009 x86_64 /usr/include/bits/mathinline.h
contains a non-iso/ansi c inline assembly construct.
Lubomir Rintel <lkundrak(a)v3.sk>
diff -up VirtualBox-3.0.4_OSE/src/libs/xpcom18a4/Makefile.kmk.noansi VirtualBox-3.0.4_OSE/src/libs/xpcom18a4/Makefile.kmk
--- VirtualBox-3.0.4_OSE/src/libs/xpcom18a4/Makefile.kmk.noansi 2009-09-01 09:32:07.000000000 -0600
+++ VirtualBox-3.0.4_OSE/src/libs/xpcom18a4/Makefile.kmk 2009-09-01 09:33:27.000000000 -0600
@@ -79,7 +79,7 @@ TEMPLATE_XPCOM_CFLAGS.release = -O
TEMPLATE_XPCOM_CFLAGS.profile = -O
TEMPLATE_XPCOM_CFLAGS.freebsd = -pthread
TEMPLATE_XPCOM_CFLAGS.l4 = -nostdinc
-TEMPLATE_XPCOM_CFLAGS.linux = -pthread -ansi
+TEMPLATE_XPCOM_CFLAGS.linux = -pthread
TEMPLATE_XPCOM_CFLAGS.solaris = -fno-omit-frame-pointer # for now anyway.
TEMPLATE_XPCOM_DEFS = MOZILLA_CLIENT=1 NDEBUG=1 _IMPL_NS_COM \
XPCOM_DLL_BASE=\"$(basename $(notdir $(LIB_XPCOM)))\" \
diff -up VirtualBox-3.0.4_OSE/Config.kmk.noansi VirtualBox-3.0.4_OSE/Config.kmk
--- VirtualBox-3.0.4_OSE/Config.kmk.noansi 2009-09-01 10:03:45.000000000 -0600
+++ VirtualBox-3.0.4_OSE/Config.kmk 2009-09-01 10:12:21.000000000 -0600
@@ -3517,7 +3517,7 @@ if1of ($(KBUILD_TARGET), dragonfly freeb
TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.x86 = -m elf_i386
TEMPLATE_VBOXGUESTR3XF86MOD_LDFLAGS.amd64 = -m elf_x86_64
endif
-TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=c99
+TEMPLATE_VBOXGUESTR3XF86MOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3EXE_CFLAGS) -fno-merge-constants -std=gnu99
TEMPLATE_VBOXGUESTR3XF86MOD_CXXFLAGS= $(TEMPLATE_VBOXGUESTR3EXE_CXXFLAGS) -fno-merge-constants
TEMPLATE_VBOXGUESTR3XF86MOD_SYSSUFF = .o
TEMPLATE_VBOXGUESTR3XF86MOD_LIBS = \
@@ -3533,7 +3533,7 @@ TEMPLATE_VBOXGUESTR3XORGMOD = VBox
TEMPLATE_VBOXGUESTR3XORGMOD_EXTENDS = VBOXGUESTR3DLL
TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TYPE) = $(NO_SUCH_VARIABLE)
TEMPLATE_VBOXGUESTR3XORGMOD_LIBS.$(KBUILD_TARGET) = $(NO_SUCH_VARIABLE)
-TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=c99
+TEMPLATE_VBOXGUESTR3XORGMOD_CFLAGS = $(TEMPLATE_VBOXGUESTR3DLL_CFLAGS) -std=gnu99
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS = $(TEMPLATE_VBOXGUESTR3DLL_DEFS) LOG_TO_BACKDOOR
ifeq ($(KBUILD_TARGET_ARCH),amd64)
TEMPLATE_VBOXGUESTR3XORGMOD_DEFS += _XSERVER64
VirtualBox-OSE-3.0.6-strings.patch:
--- NEW FILE VirtualBox-OSE-3.0.6-strings.patch ---
Replace some strings which ones that (sometimes) make more sense.
Lubomir Rintel <lkundrak(a)v3.sk>
diff -up VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-09-09 20:09:15.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-09-10 22:09:50.000000000 +0200
@@ -71,13 +71,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
- "there is a permission problem with /dev/vboxdrv. Re-setup the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
- "package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
+ "loaded.<br/><br/>"
+ "If you installed or VirtualBox OSE package recently you need to restart "
+ "the computer for the driver to load.<br/><br/>"
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges:<br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -100,9 +100,9 @@ QString g_QStrHintOtherNoDriver = QAppli
"Make sure the kernel module has been loaded successfully."
);
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
- "It may help to reinstall VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -up VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh.strings VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh.strings 2009-09-09 20:09:47.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2009-09-10 22:09:50.000000000 +0200
@@ -36,19 +36,20 @@ elif ! lsmod|grep -q vboxdrv; then
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+ load. Reboot the computer, or insert the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevtrigger' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
+ can not possibly happen and there's nothing you can do about it.
You will not be able to start VMs until this problem is fixed.
EOF
diff -up VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop
--- VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings 2009-09-09 20:09:48.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop 2009-09-10 22:09:51.000000000 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
-Name=Sun VirtualBox
+Name=VirtualBox OSE
GenericName=Virtual Machine
Type=Application
Exec=VirtualBox
diff -up VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp.strings VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp
--- VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp.strings 2009-09-09 20:10:03.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp 2009-09-10 22:09:51.000000000 +0200
@@ -334,8 +334,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCP
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Reboot the computer, or insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -376,8 +376,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCP
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
VirtualBox-OSE-3.0.6-xorg17.patch:
--- NEW FILE VirtualBox-OSE-3.0.6-xorg17.patch ---
>From 468cc92d3d0b5a12ae0dc360f3d0b9fe8588e4f0 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 11 Sep 2009 07:57:33 +0200
Subject: [PATCH] Build drivers for XOrg 1.7 ABI
And only them.
---
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 26 +++++------
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 55 +++++++++++++++----------
2 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index 98e44d4..c5d80ed 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -61,7 +61,7 @@ endif
#
# vboxmouse_drv_70
#
-DLLS += vboxmouse_drv_70
+#DLLS += vboxmouse_drv_70
vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_70_DEFS = \
XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
@@ -82,7 +82,7 @@ vboxmouse_drv_70_SOURCES = \
#
# vboxmouse_drv_71
#
-DLLS += vboxmouse_drv_71
+#DLLS += vboxmouse_drv_71
vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
vboxmouse_drv_71_INCS := \
@@ -99,7 +99,7 @@ vboxmouse_drv_71_SOURCES = \
#
# vboxmouse_drv_14
#
-DLLS += vboxmouse_drv_14
+#DLLS += vboxmouse_drv_14
vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_14_INCS := \
@@ -116,7 +116,7 @@ vboxmouse_drv_14_SOURCES = \
#
# vboxmouse_drv_15
#
-DLLS += vboxmouse_drv_15
+#DLLS += vboxmouse_drv_15
vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_15_INCS := \
@@ -131,7 +131,7 @@ vboxmouse_drv_15_SOURCES = \
#
# vboxmouse_drv_16
#
-DLLS += vboxmouse_drv_16
+#DLLS += vboxmouse_drv_16
vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_16_INCS := \
@@ -150,15 +150,13 @@ vboxmouse_drv_16_SOURCES = \
DLLS += vboxmouse_drv_17
vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxmouse_drv_17_INCS := \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/Xext \
$(PATH_SUB_CURRENT)
vboxmouse_drv_17_SOURCES = \
vboxmouse_15.c
@@ -166,7 +164,7 @@ vboxmouse_drv_17_SOURCES = \
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 10a2936..abb7f6a 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -113,7 +113,7 @@ endif # target linux
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a properity.
#
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
@@ -139,7 +139,7 @@ vboxvideo_drv_70_SOURCES = \
#
# vboxvideo_drv_71
#
-DLLS += vboxvideo_drv_71
+#DLLS += vboxvideo_drv_71
vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -158,7 +158,7 @@ vboxvideo_drv_71_SOURCES = \
#
# vboxvideo_drv_13
#
-DLLS += vboxvideo_drv_13
+#DLLS += vboxvideo_drv_13
vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -180,7 +180,7 @@ vboxvideo_drv_13_SOURCES = \
# This uses the same code (vboxvideo_13.c) as 1.3, but is built
# for 1.4 as well in case there should be any relevant header changes.
#
-DLLS += vboxvideo_drv_14
+#DLLS += vboxvideo_drv_14
vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_14_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -199,7 +199,7 @@ vboxvideo_drv_14_SOURCES = \
#
# vboxvideo_drv_15
#
-DLLS += vboxvideo_drv_15
+#DLLS += vboxvideo_drv_15
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS \
@@ -220,7 +220,7 @@ vboxvideo_drv_15_SOURCES = \
#
# vboxvideo_drv_16
#
-DLLS += vboxvideo_drv_16
+#DLLS += vboxvideo_drv_16
vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -245,22 +245,33 @@ DLLS += vboxvideo_drv_17
vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxvideo_drv_17_INCS = \
- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/Mesa-7.5/include \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source \
+ /usr/share/xorg-x11-server-source/fb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ddc \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dri \
+ /usr/share/xorg-x11-server-source/hw/xfree86/i2c \
+ /usr/share/xorg-x11-server-source/hw/xfree86/int10 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/modes \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \
+ /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vbe \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \
+ /usr/share/xorg-x11-server-source/hw/xquartz/xpr \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/miext/damage \
+ /usr/share/xorg-x11-server-source/randr \
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
vboxvideo_drv_17_SOURCES = \
vboxvideo_15.c \
vboxutils.c \
@@ -269,7 +280,7 @@ vboxvideo_drv_17_SOURCES = \
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
--
1.6.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 9 Aug 2009 18:05:39 -0000 1.7
+++ .cvsignore 11 Sep 2009 07:09:24 -0000 1.8
@@ -1,2 +1,2 @@
UserManual.pdf
-VirtualBox-3.0.4-OSE.tar.bz2
+VirtualBox-3.0.6-OSE.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/VirtualBox-OSE.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- VirtualBox-OSE.spec 22 Aug 2009 04:57:11 -0000 1.14
+++ VirtualBox-OSE.spec 11 Sep 2009 07:09:24 -0000 1.15
@@ -6,15 +6,8 @@
# -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
-# Hardening is basically a lot of seemingly useless checks that are here to
-# mitigate impact of eventual security issue in setuid root VBox. When we
-# use the filesystem capabilities instead of running privileged, it can't
-# be used.
-%if 0%{?fedora} > 11
-%bcond_with hardening
-%else
+# Do not disable hardening for anything but debugging!
%bcond_without hardening
-%endif
%if %with hardening
%define priv_mode %%attr(4755,root,root)
@@ -23,8 +16,8 @@
%endif
Name: VirtualBox-OSE
-Version: 3.0.4
-Release: 7%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -40,16 +33,13 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE.blacklist-kvm
Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
-Patch2: VirtualBox-OSE-3.0.0-strings.patch
+Patch2: VirtualBox-OSE-3.0.6-strings.patch
Patch3: VirtualBox-OSE-3.0.2-libcxx.patch
-Patch4: VirtualBox-OSE-3.0.4-pulse0916.patch
-Patch5: VirtualBox-OSE-3.0.2-xorg17.patch
-Patch6: VirtualBox-OSE-3.0.2-xinput2.patch
-Patch7: VirtualBox-OSE-3.0.4-videodrv6.patch
-Patch8: VirtualBox-OSE-3.0.4-vblank.patch
+Patch5: VirtualBox-OSE-3.0.6-xorg17.patch
Patch9: VirtualBox-OSE-3.0.4-optflags.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
Patch11: VirtualBox-OSE-3.0.4-visibility.patch
+Patch12: VirtualBox-OSE-3.0.4-noansi.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -146,14 +136,11 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
-%patch4 -p1 -b .pulse0916
%patch5 -p1 -b .xorg17
-%patch6 -p1 -b .xinput2
-%patch7 -p1 -b .videodrv6
-%patch8 -p1 -b .vblank
%patch9 -p1 -b .optflags
%patch10 -p1 -b .32bit
%patch11 -p1 -b .visibility
+%patch12 -p1 -b .noansi
# Remove prebuilt binary tools
rm -rf kBuild
@@ -306,7 +293,8 @@
# Install udev rules
%define vboxdrv_udev %{?with_hardening:%{SOURCE4}}%{?!with_hardening:%{SOURCE3}}
-install -p -m 0644 -D %{vboxdrv_udev} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxadd.rules
+install -p -m 0644 -D %{vboxdrv_udev} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
+install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxadd.rules
# Install modules load script
install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
@@ -323,7 +311,7 @@
# Menu entry
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
- --vendor='' src/VBox/Installer/linux/VirtualBox.desktop
+ --vendor='' src/VBox/Installer/linux/virtualbox.desktop
%check
@@ -447,8 +435,14 @@
%changelog
+* Thu Sep 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.6-1
+- Bring hardening back, stupid Lubomir
+- Update to recent upstream release
+- Drop upstreamed patches for Fedora 12 Alpha support
+
* Sat Aug 22 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-7
- Correct the path in udev rule and adjust for non-hardening
+- Fix build with recent x86_64 glibc
* Thu Aug 20 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-6
- No exceptions in R0 code, should fix unresolved symbol problem
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 9 Aug 2009 18:05:39 -0000 1.7
+++ sources 11 Sep 2009 07:09:24 -0000 1.8
@@ -1,2 +1,2 @@
-e37a6625c9048269112e96cc286aade0 UserManual.pdf
-70d4c7b1f271120723a16c9d2b3ba46f VirtualBox-3.0.4-OSE.tar.bz2
+7b9dcaa2339f122db12228c6501c2176 UserManual.pdf
+8249090b4e08ca2eff3efa9f836f370b VirtualBox-3.0.6-OSE.tar.bz2
--- VirtualBox-OSE-3.0.0-strings.patch DELETED ---
--- VirtualBox-OSE-3.0.2-xinput2.patch DELETED ---
--- VirtualBox-OSE-3.0.2-xorg17.patch DELETED ---
--- VirtualBox-OSE-3.0.4-pulse0916.patch DELETED ---
--- VirtualBox-OSE-3.0.4-vblank.patch DELETED ---
--- VirtualBox-OSE-3.0.4-videodrv6.patch DELETED ---
15 years, 3 months
rpms/VirtualBox-OSE-kmod/F-11 VirtualBox-OSE-kmod.spec,1.27,1.28
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5167/F-11
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
Merge from devel
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/F-11/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- VirtualBox-OSE-kmod.spec 1 Sep 2009 05:15:01 -0000 1.27
+++ VirtualBox-OSE-kmod.spec 11 Sep 2009 07:07:52 -0000 1.28
@@ -3,11 +3,15 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%define buildforkernels newest
+#define buildforkernels newest
+
+# Allow only root to access vboxdrv regardless of the file mode
+# use only for debugging!
+%bcond_without hardening
Name: VirtualBox-OSE-kmod
-Version: 3.0.4
-Release: 2%{?dist}.6
+Version: 3.0.6
+Release: 1%{?dist}
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -17,11 +21,9 @@
Source1: VirtualBox-OSE-kmod-1.6.4-kernel-variants.txt
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}
+%global AkmodsBuildRequires %{_bindir}/kmodtool, VirtualBox-OSE-kmodsrc = %{version}, xz
BuildRequires: %{AkmodsBuildRequires}
-Requires: VirtualBox-OSE = %{version}-%{release}
-
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i586 i686 x86_64
@@ -39,7 +41,7 @@
%prep
%setup -T -c
-tar --use-compress-program lzma -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.lzma
+tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}.tar.xz
# error out if there was something wrong with kmodtool
%{?kmodtool_check}
@@ -47,6 +49,9 @@
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} --filterfile %{SOURCE1} 2>/dev/null
+# This is hardcoded in Makefiles
+# Kto zisti, preco tu nefunguje %%without hardening ma u mna nanuk
+%{?with_hardening:find %{name}-%{version} -name Makefile |xargs sed 's/-DVBOX_WITH_HARDENING//' -i}
for kernel_version in %{?kernel_versions} ; do
cp -al %{name}-%{version} _kmod_build_${kernel_version%%___*}
@@ -85,23 +90,14 @@
%changelog
-* Tue Sep 01 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.6
-- rebuild for new kernels
+* Mon Aug 17 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.6-1
+- Update to 3.0.6, re-enable hardening
-* Thu Aug 27 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.5
-- rebuild for new kernels
-
-* Sun Aug 23 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.4
-- rebuild for new kernels
+* Mon Aug 17 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-4
+- Source package is now xz-compressed
-* Sat Aug 22 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.3
-- rebuild for new kernels
-
-* Sat Aug 15 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.2
-- rebuild for new kernels
-
-* Fri Aug 14 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.0.4-2.1
-- rebuild for new kernels
+* Sat Aug 15 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
+- Make it possible to disable hardening, do so by default
* Sun Aug 09 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- New release
15 years, 3 months
rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-kmod.spec,1.23,1.24
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5069
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Mon Aug 17 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.6-1
- Update to 3.0.6, re-enable hardening
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- VirtualBox-OSE-kmod.spec 20 Aug 2009 19:58:04 -0000 1.23
+++ VirtualBox-OSE-kmod.spec 11 Sep 2009 07:06:47 -0000 1.24
@@ -6,11 +6,12 @@
#define buildforkernels newest
# Allow only root to access vboxdrv regardless of the file mode
-%bcond_with hardening
+# use only for debugging!
+%bcond_without hardening
Name: VirtualBox-OSE-kmod
-Version: 3.0.4
-Release: 4%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
Summary: Kernel module for VirtualBox-OSE
Group: System Environment/Kernel
@@ -89,6 +90,9 @@
%changelog
+* Mon Aug 17 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.6-1
+- Update to 3.0.6, re-enable hardening
+
* Mon Aug 17 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-4
- Source package is now xz-compressed
15 years, 3 months
rpms/VirtualBox-OSE/devel VirtualBox-OSE-3.0.6-strings.patch, NONE, 1.1 VirtualBox-OSE-3.0.6-xorg17.patch, NONE, 1.1 .cvsignore, 1.7, 1.8 VirtualBox-OSE.spec, 1.31, 1.32 sources, 1.7, 1.8 VirtualBox-OSE-3.0.0-strings.patch, 1.1, NONE VirtualBox-OSE-3.0.2-xinput2.patch, 1.1, NONE VirtualBox-OSE-3.0.2-xorg17.patch, 1.1, NONE VirtualBox-OSE-3.0.4-pulse0916.patch, 1.1, NONE VirtualBox-OSE-3.0.4-vblank.patch, 1.1, NONE VirtualBox-OSE-3.0.4-videodrv6.patch, 1.1, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4201/devel
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.0.6-strings.patch
VirtualBox-OSE-3.0.6-xorg17.patch
Removed Files:
VirtualBox-OSE-3.0.0-strings.patch
VirtualBox-OSE-3.0.2-xinput2.patch
VirtualBox-OSE-3.0.2-xorg17.patch
VirtualBox-OSE-3.0.4-pulse0916.patch
VirtualBox-OSE-3.0.4-vblank.patch
VirtualBox-OSE-3.0.4-videodrv6.patch
Log Message:
Import 3.0.6 VirtualBox-OSE
VirtualBox-OSE-3.0.6-strings.patch:
--- NEW FILE VirtualBox-OSE-3.0.6-strings.patch ---
Replace some strings which ones that (sometimes) make more sense.
Lubomir Rintel <lkundrak(a)v3.sk>
diff -up VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-09-09 20:09:15.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-09-10 22:09:50.000000000 +0200
@@ -71,13 +71,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
- "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
- "there is a permission problem with /dev/vboxdrv. Re-setup the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. Users of Ubuntu, Fedora or Mandriva should install the DKMS "
- "package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
+ "loaded.<br/><br/>"
+ "If you installed or VirtualBox OSE package recently you need to restart "
+ "the computer for the driver to load.<br/><br/>"
+ "Alternatively, you may attempt to load the driver by issuing the "
+ "following command with system administrator (root) privileges:<br/><br/>"
+ " <font color=blue>'/etc/sysconfig/modules/VirtualBox-OSE.modules'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -100,9 +100,9 @@ QString g_QStrHintOtherNoDriver = QAppli
"Make sure the kernel module has been loaded successfully."
);
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
- "It may help to reinstall VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
diff -up VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh.strings VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh.strings 2009-09-09 20:09:47.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/VBox.sh 2009-09-10 22:09:50.000000000 +0200
@@ -36,19 +36,20 @@ elif ! lsmod|grep -q vboxdrv; then
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
+ load. Reboot the computer, or insert the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox-OSE.modules' (as root)
You will not be able to start VMs until this problem is fixed.
EOF
elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
+WARNING: The character device /dev/vboxdrv does not exist. Try running
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevtrigger' (as root)
- and if that is not successful, try to re-install the package.
+ and if that is not successful, then you're in situation that
+ can not possibly happen and there's nothing you can do about it.
You will not be able to start VMs until this problem is fixed.
EOF
diff -up VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop
--- VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings 2009-09-09 20:09:48.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/Installer/linux/virtualbox.desktop 2009-09-10 22:09:51.000000000 +0200
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
Version=1.0
-Name=Sun VirtualBox
+Name=VirtualBox OSE
GenericName=Virtual Machine
Type=Application
Exec=VirtualBox
diff -up VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp.strings VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp
--- VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp.strings 2009-09-09 20:10:03.000000000 +0200
+++ VirtualBox-3.0.6_OSE/src/VBox/VMM/VM.cpp 2009-09-10 22:09:51.000000000 +0200
@@ -334,8 +334,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCP
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Reboot the computer, or insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -376,8 +376,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCP
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Insert the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox-OSE.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
VirtualBox-OSE-3.0.6-xorg17.patch:
--- NEW FILE VirtualBox-OSE-3.0.6-xorg17.patch ---
>From 468cc92d3d0b5a12ae0dc360f3d0b9fe8588e4f0 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 11 Sep 2009 07:57:33 +0200
Subject: [PATCH] Build drivers for XOrg 1.7 ABI
And only them.
---
src/VBox/Additions/x11/vboxmouse/Makefile.kmk | 26 +++++------
src/VBox/Additions/x11/vboxvideo/Makefile.kmk | 55 +++++++++++++++----------
2 files changed, 45 insertions(+), 36 deletions(-)
diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
index 98e44d4..c5d80ed 100644
--- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -61,7 +61,7 @@ endif
#
# vboxmouse_drv_70
#
-DLLS += vboxmouse_drv_70
+#DLLS += vboxmouse_drv_70
vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_70_DEFS = \
XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X
@@ -82,7 +82,7 @@ vboxmouse_drv_70_SOURCES = \
#
# vboxmouse_drv_71
#
-DLLS += vboxmouse_drv_71
+#DLLS += vboxmouse_drv_71
vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS)
vboxmouse_drv_71_INCS := \
@@ -99,7 +99,7 @@ vboxmouse_drv_71_SOURCES = \
#
# vboxmouse_drv_14
#
-DLLS += vboxmouse_drv_14
+#DLLS += vboxmouse_drv_14
vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_14_INCS := \
@@ -116,7 +116,7 @@ vboxmouse_drv_14_SOURCES = \
#
# vboxmouse_drv_15
#
-DLLS += vboxmouse_drv_15
+#DLLS += vboxmouse_drv_15
vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_15_INCS := \
@@ -131,7 +131,7 @@ vboxmouse_drv_15_SOURCES = \
#
# vboxmouse_drv_16
#
-DLLS += vboxmouse_drv_16
+#DLLS += vboxmouse_drv_16
vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
vboxmouse_drv_16_INCS := \
@@ -150,15 +150,13 @@ vboxmouse_drv_16_SOURCES = \
DLLS += vboxmouse_drv_17
vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxmouse_drv_17_INCS := \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15 \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/Xext \
$(PATH_SUB_CURRENT)
vboxmouse_drv_17_SOURCES = \
vboxmouse_15.c
@@ -166,7 +164,7 @@ vboxmouse_drv_17_SOURCES = \
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 10a2936..abb7f6a 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -113,7 +113,7 @@ endif # target linux
# base keywords instead of using .solaris or .linux.
# Also it is *important* to use := and not = when deriving a properity.
#
-DLLS += vboxvideo_drv_70
+#DLLS += vboxvideo_drv_70
vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
if1of ($(KBUILD_TARGET), linux)
vboxvideo_drv_70_CFLAGS += \
@@ -139,7 +139,7 @@ vboxvideo_drv_70_SOURCES = \
#
# vboxvideo_drv_71
#
-DLLS += vboxvideo_drv_71
+#DLLS += vboxvideo_drv_71
vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -158,7 +158,7 @@ vboxvideo_drv_71_SOURCES = \
#
# vboxvideo_drv_13
#
-DLLS += vboxvideo_drv_13
+#DLLS += vboxvideo_drv_13
vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -180,7 +180,7 @@ vboxvideo_drv_13_SOURCES = \
# This uses the same code (vboxvideo_13.c) as 1.3, but is built
# for 1.4 as well in case there should be any relevant header changes.
#
-DLLS += vboxvideo_drv_14
+#DLLS += vboxvideo_drv_14
vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_14_DEFS := $(vboxvideo_drv_70_DEFS)
@@ -199,7 +199,7 @@ vboxvideo_drv_14_SOURCES = \
#
# vboxvideo_drv_15
#
-DLLS += vboxvideo_drv_15
+#DLLS += vboxvideo_drv_15
vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS \
@@ -220,7 +220,7 @@ vboxvideo_drv_15_SOURCES = \
#
# vboxvideo_drv_16
#
-DLLS += vboxvideo_drv_16
+#DLLS += vboxvideo_drv_16
vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
@@ -245,22 +245,33 @@ DLLS += vboxvideo_drv_17
vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
-## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
vboxvideo_drv_17_INCS = \
- $(VBOX_PATH_X11_ROOT)/fontsproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/glproto-1.4.10 \
- $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
- $(VBOX_PATH_X11_ROOT)/libdrm-2.4.13 \
- $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
- $(VBOX_PATH_X11_ROOT)/Mesa-7.5/include \
- $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
- $(VBOX_PATH_X11_ROOT)/randrproto-1.3.0 \
- $(VBOX_PATH_X11_ROOT)/renderproto-0.11 \
- $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.1.0 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.99-20090831 \
- $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
- $(VBOX_PATH_X11_ROOT)/xproto-7.0.15
+ /usr/include/drm \
+ /usr/include/X11/dri \
+ /usr/include/pixman-1 \
+ /usr/share/xorg-x11-server-source \
+ /usr/share/xorg-x11-server-source/fb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/common \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ddc \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dixmods/extmod \
+ /usr/share/xorg-x11-server-source/hw/xfree86/dri \
+ /usr/share/xorg-x11-server-source/hw/xfree86/i2c \
+ /usr/share/xorg-x11-server-source/hw/xfree86/int10 \
+ /usr/share/xorg-x11-server-source/hw/xfree86/modes \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support \
+ /usr/share/xorg-x11-server-source/hw/xfree86/os-support/bus \
+ /usr/share/xorg-x11-server-source/hw/xfree86/ramdac \
+ /usr/share/xorg-x11-server-source/hw/xfree86/shadowfb \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vbe \
+ /usr/share/xorg-x11-server-source/hw/xfree86/vgahw \
+ /usr/share/xorg-x11-server-source/hw/xquartz/xpr \
+ /usr/share/xorg-x11-server-source/include \
+ /usr/share/xorg-x11-server-source/mi \
+ /usr/share/xorg-x11-server-source/miext/damage \
+ /usr/share/xorg-x11-server-source/randr \
+ /usr/share/xorg-x11-server-source/Xext \
+ /usr/share/xorg-x11-server-source/render \
+ /usr/share/xorg-x11-server-source/hw/xfree86/parser
vboxvideo_drv_17_SOURCES = \
vboxvideo_15.c \
vboxutils.c \
@@ -269,7 +280,7 @@ vboxvideo_drv_17_SOURCES = \
# Check the undefined symbols in the X.Org modules against lists of allowed
# symbols. Not very elegant, but it will catch problems early.
-ifdef VBOX_WITH_TESTCASES
+ifdef NOT_VBOX_WITH_TESTCASES
# ifndef VBOX_ONLY_ADDITIONS
if1of ($(KBUILD_TARGET),linux solaris)
ifeq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
--
1.6.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore 9 Aug 2009 14:25:32 -0000 1.7
+++ .cvsignore 11 Sep 2009 06:59:37 -0000 1.8
@@ -1,2 +1,2 @@
-VirtualBox-3.0.4-OSE.tar.bz2
UserManual.pdf
+VirtualBox-3.0.6-OSE.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- VirtualBox-OSE.spec 1 Sep 2009 16:37:58 -0000 1.31
+++ VirtualBox-OSE.spec 11 Sep 2009 06:59:37 -0000 1.32
@@ -6,15 +6,8 @@
# -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
-# Hardening is basically a lot of seemingly useless checks that are here to
-# mitigate impact of eventual security issue in setuid root VBox. When we
-# use the filesystem capabilities instead of running privileged, it can't
-# be used.
-%if 0%{?fedora} > 11
-%bcond_with hardening
-%else
+# Do not disable hardening for anything but debugging!
%bcond_without hardening
-%endif
%if %with hardening
%define priv_mode %%attr(4755,root,root)
@@ -23,8 +16,8 @@
%endif
Name: VirtualBox-OSE
-Version: 3.0.4
-Release: 7%{?dist}
+Version: 3.0.6
+Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -40,13 +33,9 @@
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE.blacklist-kvm
Patch1: VirtualBox-OSE-2.2.0-noupdate.patch
-Patch2: VirtualBox-OSE-3.0.0-strings.patch
+Patch2: VirtualBox-OSE-3.0.6-strings.patch
Patch3: VirtualBox-OSE-3.0.2-libcxx.patch
-Patch4: VirtualBox-OSE-3.0.4-pulse0916.patch
-Patch5: VirtualBox-OSE-3.0.2-xorg17.patch
-Patch6: VirtualBox-OSE-3.0.2-xinput2.patch
-Patch7: VirtualBox-OSE-3.0.4-videodrv6.patch
-Patch8: VirtualBox-OSE-3.0.4-vblank.patch
+Patch5: VirtualBox-OSE-3.0.6-xorg17.patch
Patch9: VirtualBox-OSE-3.0.4-optflags.patch
Patch10: VirtualBox-OSE-2.2.0-32bit.patch
Patch11: VirtualBox-OSE-3.0.4-visibility.patch
@@ -147,11 +136,7 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
-%patch4 -p1 -b .pulse0916
%patch5 -p1 -b .xorg17
-%patch6 -p1 -b .xinput2
-%patch7 -p1 -b .videodrv6
-%patch8 -p1 -b .vblank
%patch9 -p1 -b .optflags
%patch10 -p1 -b .32bit
%patch11 -p1 -b .visibility
@@ -326,7 +311,7 @@
# Menu entry
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
- --vendor='' src/VBox/Installer/linux/VirtualBox.desktop
+ --vendor='' src/VBox/Installer/linux/virtualbox.desktop
%check
@@ -450,6 +435,11 @@
%changelog
+* Thu Sep 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.6-1
+- Bring hardening back, stupid Lubomir
+- Update to recent upstream release
+- Drop upstreamed patches for Fedora 12 Alpha support
+
* Sat Aug 22 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-7
- Correct the path in udev rule and adjust for non-hardening
- Fix build with recent x86_64 glibc
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources 9 Aug 2009 14:25:32 -0000 1.7
+++ sources 11 Sep 2009 06:59:37 -0000 1.8
@@ -1,2 +1,2 @@
-70d4c7b1f271120723a16c9d2b3ba46f VirtualBox-3.0.4-OSE.tar.bz2
-e37a6625c9048269112e96cc286aade0 UserManual.pdf
+7b9dcaa2339f122db12228c6501c2176 UserManual.pdf
+8249090b4e08ca2eff3efa9f836f370b VirtualBox-3.0.6-OSE.tar.bz2
--- VirtualBox-OSE-3.0.0-strings.patch DELETED ---
--- VirtualBox-OSE-3.0.2-xinput2.patch DELETED ---
--- VirtualBox-OSE-3.0.2-xorg17.patch DELETED ---
--- VirtualBox-OSE-3.0.4-pulse0916.patch DELETED ---
--- VirtualBox-OSE-3.0.4-vblank.patch DELETED ---
--- VirtualBox-OSE-3.0.4-videodrv6.patch DELETED ---
15 years, 3 months
rpms/mythtv/devel mythtv.spec,1.45,1.46 sources,1.25,1.26
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29490
Modified Files:
mythtv.spec sources
Log Message:
* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21770
- Update to pre-0.22 svn trunk revision 21770
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- mythtv.spec 9 Sep 2009 13:23:34 -0000 1.45
+++ mythtv.spec 11 Sep 2009 04:46:48 -0000 1.46
@@ -61,7 +61,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r21745
+%define _svnrev r21770
%define branch trunk
#
@@ -1475,6 +1475,9 @@
################################################################################
%changelog
+* Fri Sep 11 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21770
+- Update to pre-0.22 svn trunk revision 21770
+
* Wed Sep 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-0.2.svn.r21745
- Update to pre-0.22 svn trunk revision 21745
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources 9 Sep 2009 13:23:34 -0000 1.25
+++ sources 11 Sep 2009 04:46:48 -0000 1.26
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-00263ea4c5192c3713e4324d21c1ccad mythtv-0.22.tar.bz2
-d81d07b06346e9cf19570f1d92b0d68f mythplugins-0.22.tar.bz2
+356ab84a78b8ebd96733acac071983e5 mythtv-0.22.tar.bz2
+297bcaf1d6d8b110def3157de919b316 mythplugins-0.22.tar.bz2
15 years, 3 months
rpms/sdlmame/devel .cvsignore, 1.54, 1.55 sdlmame.spec, 1.64, 1.65 sources, 1.55, 1.56
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5196
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Mon Sep 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-0.4.0133u5
- Updated to 0.133u5
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/.cvsignore,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- .cvsignore 31 Aug 2009 11:59:23 -0000 1.54
+++ .cvsignore 10 Sep 2009 10:48:41 -0000 1.55
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0133u4.zip
+sdlmame0133u5.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sdlmame.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sdlmame.spec 31 Aug 2009 12:45:28 -0000 1.64
+++ sdlmame.spec 10 Sep 2009 10:48:41 -0000 1.65
@@ -1,4 +1,4 @@
-%define beta 0133u4
+%define beta 0133u5
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0134
-Release: 0.3.%{?beta}%{?dist}
+Release: 0.4.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -200,6 +200,9 @@
%changelog
+* Mon Sep 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-0.4.0133u5
+- Updated to 0.133u5
+
* Mon Aug 31 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0134-0.3.0133u4
- Updated to 0.133u4
- Added unidasm to the -tools subpackage
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/devel/sources,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sources 31 Aug 2009 11:59:23 -0000 1.55
+++ sources 10 Sep 2009 10:48:41 -0000 1.56
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-407345a8bc5148e508cc5ba9dfa06d21 sdlmame0133u4.zip
+b06b34b543cf699873a6b5cdc9af9e58 sdlmame0133u5.zip
15 years, 3 months
rpms/sidplay/F-11 sidplay.spec,1.8,1.9
by Linus Walleij
Author: snirkel
Update of /cvs/nonfree/rpms/sidplay/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2803
Modified Files:
sidplay.spec
Log Message:
Another BR
Index: sidplay.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay/F-11/sidplay.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sidplay.spec 9 Sep 2009 23:13:25 -0000 1.8
+++ sidplay.spec 9 Sep 2009 23:35:59 -0000 1.9
@@ -3,7 +3,7 @@
Name: sidplay
Version: 2.0.9
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A command-line tool for playing back SID files
URL: http://sidplay2.sourceforge.net/
Group: Applications/Multimedia
@@ -23,6 +23,7 @@
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
+BuildRequires: alsa-lib-devel
Provides: sidplay2
Obsoletes: sidplay2
@@ -60,6 +61,9 @@
%{_bindir}/*
%changelog
+* Thu Sep 10 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-10
+- Requires alsa-lib-devel too!
+
* Thu Sep 10 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-9
- Think it BuildRequires libtool then it'll build I hope?
15 years, 3 months
rpms/sidplay/devel sidplay.spec,1.8,1.9
by Linus Walleij
Author: snirkel
Update of /cvs/nonfree/rpms/sidplay/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv2695/sidplay/devel
Modified Files:
sidplay.spec
Log Message:
Another BR
Index: sidplay.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay/devel/sidplay.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sidplay.spec 9 Sep 2009 23:12:26 -0000 1.8
+++ sidplay.spec 9 Sep 2009 23:33:14 -0000 1.9
@@ -3,7 +3,7 @@
Name: sidplay
Version: 2.0.9
-Release: 9%{?dist}
+Release: 10%{?dist}
Summary: A command-line tool for playing back SID files
URL: http://sidplay2.sourceforge.net/
Group: Applications/Multimedia
@@ -23,6 +23,7 @@
BuildRequires: automake
BuildRequires: autoconf
BuildRequires: libtool
+BuildRequires: alsa-lib-devel
Provides: sidplay2
Obsoletes: sidplay2
@@ -60,6 +61,9 @@
%{_bindir}/*
%changelog
+* Thu Sep 10 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-10
+- Requires alsa-lib-devel too!
+
* Thu Sep 10 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-9
- Think it BuildRequires libtool then it'll build I hope?
15 years, 3 months
rpms/sidplay/F-11 sidplay.spec,1.7,1.8
by Linus Walleij
Author: snirkel
Update of /cvs/nonfree/rpms/sidplay/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1351
Modified Files:
sidplay.spec
Log Message:
A missing libtool BuildRequires should be all
Index: sidplay.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sidplay/F-11/sidplay.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sidplay.spec 8 Sep 2009 22:40:58 -0000 1.7
+++ sidplay.spec 9 Sep 2009 23:13:25 -0000 1.8
@@ -3,7 +3,7 @@
Name: sidplay
Version: 2.0.9
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: A command-line tool for playing back SID files
URL: http://sidplay2.sourceforge.net/
Group: Applications/Multimedia
@@ -22,6 +22,7 @@
BuildRequires: libstdc++-devel
BuildRequires: automake
BuildRequires: autoconf
+BuildRequires: libtool
Provides: sidplay2
Obsoletes: sidplay2
@@ -59,12 +60,15 @@
%{_bindir}/*
%changelog
-* Mon Sep 07 2009 Bernie Innocenti <bernie(a)codewiz.org> 2.0.9-7
+* Thu Sep 10 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-9
+- Think it BuildRequires libtool then it'll build I hope?
+
+* Mon Sep 7 2009 Bernie Innocenti <bernie(a)codewiz.org> 2.0.9-8
- Add sidplay-alsa.patch, stolen from Gentoo
- Add sidplay-autohell-fixes.patch, rolled in house
- Rock!
-* Mon May 11 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-6
+* Mon May 11 2009 Linus Walleij <triad(a)df.lth.se> 2.0.9-7
- Located a suspect GCC 4.4.0 rebuild bug.
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.0.9-6
15 years, 3 months