rpms/VirtualBox-OSE/F-12 VirtualBox-OSE-3.1.0-visibility.patch, NONE, 1.1 .cvsignore, 1.11, 1.12 VirtualBox-OSE-3.1.0-strings.patch, 1.1, 1.2 VirtualBox-OSE.spec, 1.36, 1.37 sources, 1.11, 1.12 VirtualBox-OSE-3.0.4-visibility.patch, 1.1, NONE VirtualBox-OSE-90-vboxdrv.rules.hardening, 1.2, NONE
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6765/F-12
Modified Files:
.cvsignore VirtualBox-OSE-3.1.0-strings.patch
VirtualBox-OSE.spec sources
Added Files:
VirtualBox-OSE-3.1.0-visibility.patch
Removed Files:
VirtualBox-OSE-3.0.4-visibility.patch
VirtualBox-OSE-90-vboxdrv.rules.hardening
Log Message:
Merge from devel
VirtualBox-OSE-3.1.0-visibility.patch:
Config.kmk | 2 +-
src/VBox/Main/webservice/websrv-nsmap.xsl | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE VirtualBox-OSE-3.1.0-visibility.patch ---
Hack to fix up build of gsoap bindings on Rawhide.
Still needs to be looked into.
Lubomir Rintel <lkundrak(a)v3.sk>
diff -up VirtualBox-3.1.0_OSE/Config.kmk.visibility VirtualBox-3.1.0_OSE/Config.kmk
--- VirtualBox-3.1.0_OSE/Config.kmk.visibility 2009-11-30 20:51:47.000000000 +0100
+++ VirtualBox-3.1.0_OSE/Config.kmk 2009-11-30 20:58:22.495779448 +0100
@@ -2508,7 +2508,7 @@ ifeq ($(KBUILD_TARGET),win)
else # the gcc guys
TEMPLATE_VBOXR3EXE_TOOL = $(VBOX_GCC_TOOL)
-TEMPLATE_VBOXR3EXE_CXXFLAGS = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-hidden) $(VBOX_GCC_fvisibility-inlines-hidden)
+TEMPLATE_VBOXR3EXE_CXXFLAGS = -g -pipe $(VBOX_GCC_PEDANTIC_CXX) $(VBOX_GCC_Wno-variadic-macros) $(VBOX_GCC_OPT) $(VBOX_GCC_FP) -fno-strict-aliasing $(VBOX_GCC_fvisibility-inlines-hidden)
TEMPLATE_VBOXR3EXE_CXXFLAGS.x86 = -m32
TEMPLATE_VBOXR3EXE_CXXFLAGS.amd64 = -m64
# L4 currently can't handle exception handling.
diff -up VirtualBox-3.1.0_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl.visibility VirtualBox-3.1.0_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl
--- VirtualBox-3.1.0_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl.visibility 2009-03-13 11:39:18.000000000 +0100
+++ VirtualBox-3.1.0_OSE/src/VBox/Main/webservice/websrv-nsmap.xsl 2009-11-30 20:51:48.101779959 +0100
@@ -49,6 +49,7 @@
* Generated from: src/VBox/Main/idl/VirtualBox.xidl (VirtualBox's interface definitions in XML)
* Generator: src/VBox/Main/webservice/websrv-nsmap.xsl */
+#pragma GCC visibility push(default)
#include "soapH.h"
SOAP_NMAC struct Namespace namespaces[] =
{
@@ -64,6 +65,7 @@ SOAP_NMAC struct Namespace namespaces[]
<xsl:text><![CDATA[
{NULL, NULL, NULL, NULL}
};
+#pragma GCC visibility pop
]]></xsl:text>
</xsl:template>
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-12/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 12 Nov 2009 16:24:20 -0000 1.11
+++ .cvsignore 26 Jan 2010 14:45:17 -0000 1.12
@@ -1 +1,2 @@
-VirtualBox-3.1.0_BETA1_OSE.tar.bz2
+UserManual.pdf
+VirtualBox-3.1.2-OSE.tar.bz2
VirtualBox-OSE-3.1.0-strings.patch:
Frontends/VirtualBox/src/main.cpp | 18 +++++++++---------
Installer/linux/VBox.sh | 11 ++++++-----
Installer/linux/virtualbox.desktop | 2 +-
VMM/VM.cpp | 8 ++++----
4 files changed, 20 insertions(+), 19 deletions(-)
Index: VirtualBox-OSE-3.1.0-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-12/VirtualBox-OSE-3.1.0-strings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox-OSE-3.1.0-strings.patch 12 Nov 2009 16:24:20 -0000 1.1
+++ VirtualBox-OSE-3.1.0-strings.patch 26 Jan 2010 14:45:17 -0000 1.2
@@ -3,14 +3,14 @@
Lubomir Rintel <lkundrak(a)v3.sk>
diff -up VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-11-05 17:53:04.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-11-12 15:34:13.000000000 +0100
+--- VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp.strings 2009-11-20 07:46:44.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp 2009-11-22 01:13:05.266805602 +0100
@@ -72,13 +72,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 "
+- "there is a permission problem with /dev/vboxdrv. Please reinstall 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 "
@@ -33,14 +33,14 @@
-/* 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 try reinstalling 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.1.0_OSE/src/VBox/Installer/linux/VBox.sh.strings VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh
--- VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh.strings 2009-11-05 17:54:06.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2009-11-12 15:34:13.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/VBox.sh 2009-11-22 01:10:57.110802086 +0100
@@ -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
@@ -69,7 +69,7 @@
EOF
diff -up VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop
--- VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop.strings 2009-09-01 13:22:55.000000000 +0200
-+++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop 2009-11-12 15:34:13.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/Installer/linux/virtualbox.desktop 2009-11-22 01:10:57.114801682 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
@@ -80,8 +80,8 @@
Type=Application
Exec=VirtualBox
diff -up VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp
---- VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings 2009-11-10 16:47:29.000000000 +0100
-+++ VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp 2009-11-12 15:34:13.000000000 +0100
+--- VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp.strings 2009-11-20 07:46:35.000000000 +0100
++++ VirtualBox-3.1.0_OSE/src/VBox/VMM/VM.cpp 2009-11-22 01:10:57.127800658 +0100
@@ -336,8 +336,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-12/VirtualBox-OSE.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- VirtualBox-OSE.spec 12 Nov 2009 16:47:53 -0000 1.36
+++ VirtualBox-OSE.spec 26 Jan 2010 14:45:17 -0000 1.37
@@ -1,83 +1,73 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
# Standard compiler flags, without:
-# -Wall -- VirtualBox-OSE takes care of reasonable warning very well
+# -Wall -- VirtualBox-OSE takes care of reasonable warning very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
# -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//')
-# Do not disable hardening for anything but debugging!
-%bcond_without hardening
-
-%if %with hardening
-%define priv_mode %%attr(4755,root,root)
-%else
-%define priv_mode %%caps(cap_net_raw+ep)
-%endif
-
-Name: VirtualBox-OSE
-Version: 3.1.0
-Release: 0.1.beta1%{?dist}
-Summary: A general-purpose full virtualizer for PC hardware
-
-Group: Development/Tools
-License: GPLv2 or (GPLv2 and CDDL)
-URL: http://www.virtualbox.org/wiki/VirtualBox
-Source0: http://download.virtualbox.org/virtualbox/%{version}_BETA1/VirtualBox-%{v...
-Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
-Source3: VirtualBox-OSE-90-vboxdrv.rules
-Source4: VirtualBox-OSE-90-vboxdrv.rules.hardening
-Source5: VirtualBox-OSE-60-vboxguest.rules
-Source6: VirtualBox-OSE.modules
-Source7: VirtualBox-OSE-guest.modules
-Source8: VirtualBox-OSE-vboxresize.desktop
-Source9: VirtualBox-OSE.blacklist-kvm
-Patch1: VirtualBox-OSE-3.1.0-noupdate.patch
-Patch2: VirtualBox-OSE-3.1.0-strings.patch
-Patch3: VirtualBox-OSE-3.1.0-libcxx.patch
-Patch5: VirtualBox-OSE-3.1.0-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)
-
-BuildRequires: kBuild >= 0.1.5-1
-BuildRequires: SDL-devel xalan-c-devel
-BuildRequires: hal-devel
-BuildRequires: openssl-devel
-BuildRequires: libcurl-devel
-BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel
-BuildRequires: yasm
-BuildRequires: pulseaudio-libs-devel
-BuildRequires: libXmu-devel
-BuildRequires: python-devel
-BuildRequires: desktop-file-utils
-BuildRequires: libcap-devel
-BuildRequires: qt4-devel
-BuildRequires: gsoap-devel
-BuildRequires: xz
+Name: VirtualBox-OSE
+Version: 3.1.2
+Release: 1%{?dist}
+Summary: A general-purpose full virtualizer for PC hardware
+
+Group: Development/Tools
+License: GPLv2 or (GPLv2 and CDDL)
+URL: http://www.virtualbox.org/wiki/VirtualBox
+Source0: http://download.virtualbox.org/virtualbox/%{version}/VirtualBox-%{version...
+Source1: http://download.virtualbox.org/virtualbox/%{version}/UserManual.pdf
+Source3: VirtualBox-OSE-90-vboxdrv.rules
+Source5: VirtualBox-OSE-60-vboxguest.rules
+Source6: VirtualBox-OSE.modules
+Source7: VirtualBox-OSE-guest.modules
+Source8: VirtualBox-OSE-vboxresize.desktop
+Source9: VirtualBox-OSE.blacklist-kvm
+Patch1: VirtualBox-OSE-3.1.0-noupdate.patch
+Patch2: VirtualBox-OSE-3.1.0-strings.patch
+Patch3: VirtualBox-OSE-3.1.0-libcxx.patch
+Patch5: VirtualBox-OSE-3.1.0-xorg17.patch
+Patch9: VirtualBox-OSE-3.0.4-optflags.patch
+Patch10: VirtualBox-OSE-2.2.0-32bit.patch
+Patch11: VirtualBox-OSE-3.1.0-visibility.patch
+Patch12: VirtualBox-OSE-3.0.4-noansi.patch
+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: kBuild >= 0.1.5-1
+BuildRequires: SDL-devel xalan-c-devel
+BuildRequires: hal-devel
+BuildRequires: openssl-devel
+BuildRequires: libcurl-devel
+BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libXcursor-devel libIDL-devel
+BuildRequires: yasm
+BuildRequires: pulseaudio-libs-devel
+BuildRequires: libXmu-devel
+BuildRequires: python-devel
+BuildRequires: desktop-file-utils
+BuildRequires: libcap-devel
+BuildRequires: qt4-devel
+BuildRequires: gsoap-devel
+BuildRequires: xz
# For the X11 module
-BuildRequires: libdrm-devel
-BuildRequires: libpciaccess-devel
-BuildRequires: mesa-libGL-devel
-BuildRequires: pixman-devel
-BuildRequires: xorg-x11-proto-devel
-BuildRequires: xorg-x11-server-source
+BuildRequires: libdrm-devel
+BuildRequires: libpciaccess-devel
+BuildRequires: mesa-libGL-devel
+BuildRequires: pixman-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: xorg-x11-server-source
# Plague-specific weirdness
%if 0%{?fedora} > 11
-ExclusiveArch: i686 x86_64
+ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
-ExclusiveArch: i586 x86_64
+ExclusiveArch: i586 x86_64
%else
-ExclusiveArch: i386 x86_64
+ExclusiveArch: i386 x86_64
%endif
-Requires: %{name}-kmod = %{version}
-Provides: %{name}-kmod-common = %{version}
+Requires: %{name}-kmod = %{version}
+Provides: %{name}-kmod-common = %{version}
%description
A general-purpose full virtualizer and emulator for 32-bit and
@@ -85,34 +75,34 @@
%package devel
-Summary: %{name} SDK
-Group: Development/Libraries
-Requires: VirtualBox-OSE = %{version}-%{release}
-Requires: python-VirtualBox-OSE = %{version}-%{release}
+Summary: %{name} SDK
+Group: Development/Libraries
+Requires: VirtualBox-OSE = %{version}-%{release}
+Requires: python-VirtualBox-OSE = %{version}-%{release}
%description devel
%{name} Software Development Kit.
%package -n python-%{name}
-Summary: Python bindings for %{name}
-Group: Development/Libraries
-Requires: VirtualBox-OSE = %{version}-%{release}
+Summary: Python bindings for %{name}
+Group: Development/Libraries
+Requires: VirtualBox-OSE = %{version}-%{release}
%description -n python-%{name}
Python XPCOM bindings to %{name}.
%package guest
-Summary: %{name} Guest Additions
-Group: System Environment/Base
-Requires: %{name}-kmod = %{version}
-Provides: %{name}-kmod-common = %{version}
-Requires: hal
-Requires: xorg-x11-server-Xorg
-Requires: xorg-x11-xinit
-Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
-Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
+Summary: %{name} Guest Additions
+Group: System Environment/Base
+Requires: %{name}-kmod = %{version}
+Provides: %{name}-kmod-common = %{version}
+Requires: hal
+Requires: xorg-x11-server-Xorg
+Requires: xorg-x11-xinit
+Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
+Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
%description guest
Tools that utilize kernel modules for supporting integration
@@ -121,8 +111,8 @@
%package kmodsrc
-Summary: %{name} kernel module source code
-Group: System Environment/Kernel
+Summary: %{name} kernel module source code
+Group: System Environment/Kernel
%description kmodsrc
Source tree used for building kernel module packages (%{name}-kmod)
@@ -152,7 +142,6 @@
%build
./configure --disable-kmods --enable-webservice \
- %{!?with_hardening:--disable-hardening}
. ./env.sh
@@ -161,13 +150,12 @@
# really been installed to. Therefore we do not override any of
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
-
echo %{optflags}
-kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \
- VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
- KMK_REVISION=3000 KBUILD_KMK_REVISION=3000 \
- VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
- VBOX_GCC_R0_OPT="%{optflags}"
+kmk KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \
+ VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
+ KMK_REVISION=3000 KBUILD_KMK_REVISION=3000 \
+ VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
+ VBOX_GCC_R0_OPT="%{optflags}"
%install
@@ -196,52 +184,53 @@
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
- obj/bin/VBoxTunctl \
- obj/bin/VBoxBFE
+ obj/bin/VBoxTunctl \
+ obj/bin/VBoxBFE
# Components
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
- obj/bin/components/*
+ obj/bin/components/*
# Lib
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/*.so
+ obj/bin/*.so
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/V*.gc \
- obj/bin/V*.r0
+ obj/bin/V*.gc \
+ obj/bin/V*.r0 \
+ obj/bin/VBoxEFI*.fd
# Executabes
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/EfiThunk \
- obj/bin/VBoxHeadless \
- obj/bin/VBoxSDL \
- obj/bin/VBoxNetDHCP \
- obj/bin/VBoxNetAdpCtl \
- obj/bin/VirtualBox \
- obj/bin/VBoxManage \
- obj/bin/VBoxSVC \
- obj/bin/VBoxXPCOMIPCD \
- obj/bin/VBoxSysInfo.sh \
- obj/bin/vboxshell.py \
- obj/bin/VBoxTestOGL \
- obj/bin/vboxwebsrv \
- obj/bin/webtest
+ obj/bin/EfiThunk \
+ obj/bin/VBoxHeadless \
+ obj/bin/VBoxSDL \
+ obj/bin/VBoxNetDHCP \
+ obj/bin/VBoxNetAdpCtl \
+ obj/bin/VirtualBox \
+ obj/bin/VBoxManage \
+ obj/bin/VBoxSVC \
+ obj/bin/VBoxXPCOMIPCD \
+ obj/bin/VBoxSysInfo.sh \
+ obj/bin/vboxshell.py \
+ obj/bin/VBoxTestOGL \
+ obj/bin/vboxwebsrv \
+ obj/bin/webtest
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
- obj/bin/nls/*
+ obj/bin/nls/*
# SDK
cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
mv $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom \
- $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
+ $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
ln -sf ../../../../../../..%{python_sitelib}/virtualbox/xpcom \
- $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
+ $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
# Icon
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
- obj/bin/VBox.png
+ obj/bin/VBox.png
# Guest X.Org drivers
# With the xorg17 patch, the _17 driver builds against what's
@@ -250,48 +239,46 @@
%global x11_api 17
install -m 0755 -D obj/bin/additions/vboxmouse_drv_%{x11_api}.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
+ $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
install -m 0755 -D src/VBox/Additions/linux/installer/90-vboxguest.fdi \
- $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
+ $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
# Guest tools
-install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
- obj/bin/additions/mount.vboxsf \
- obj/bin/additions/VBoxService \
- obj/bin/additions/VBoxClient \
- obj/bin/additions/VBoxControl
+install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
+ obj/bin/additions/mount.vboxsf \
+ obj/bin/additions/VBoxService \
+ obj/bin/additions/VBoxClient \
+ obj/bin/additions/VBoxControl
install -m 0755 src/VBox/Additions/x11/Installer/VBoxRandR.sh \
- $RPM_BUILD_ROOT%{_bindir}/VBoxRandR
+ $RPM_BUILD_ROOT%{_bindir}/VBoxRandR
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
- $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
+ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
install -m 0755 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
- $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
+ $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
install -m 0755 -D %{SOURCE8} \
- $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
+ $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
-install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
- obj/bin/additions/VBoxOGL*.so
+install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
+ obj/bin/additions/VBoxOGL*.so
ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so
-
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
echo 'INSTALL_DIR=%{_libdir}/virtualbox' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
# 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/90-vboxdrv.rules
+install -p -m 0644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
# Install modules load script
@@ -304,12 +291,12 @@
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}
tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
- %{name}-kmod-%{version}
+ %{name}-kmod-%{version}
# 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
+ --remove-key=DocPath --remove-category=X-MandrivaLinux-System \
+ --vendor='' src/VBox/Installer/linux/virtualbox.desktop
%check
@@ -326,25 +313,25 @@
# it? Bring it back.
set +o posix
-diff -u <((find obj/bin/additions/* -maxdepth 0 -type f \
- -not -name 'autorun.sh' \
- -not -name '*_drv*' \
- -exec basename '{}' \;
- find obj/bin/* -maxdepth 0 -type f \
- -not -name 'tst*' \
- -not -name 'SUP*' \
- -not -name 'VBox.sh' \
- -not -name 'xpidl' \
- -not -name 'vboxkeyboard.tar.gz' \
- -exec basename '{}' \;) |sort) \
- <(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/* \
- $RPM_BUILD_ROOT%{_bindir}/* \
- $RPM_BUILD_ROOT%{_libdir}/*OGL*.so \
- $RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
- -maxdepth 0 -type f \
- -not -name '*.py[co]' \
- -not -name VBoxRandR \
- -not -name VBox -exec basename '{}' \; |sort)
+diff -u <((find obj/bin/additions/* -maxdepth 0 -type f \
+ -not -name 'autorun.sh' \
+ -not -name '*_drv*' \
+ -exec basename '{}' \;
+ find obj/bin/* -maxdepth 0 -type f \
+ -not -name 'tst*' \
+ -not -name 'SUP*' \
+ -not -name 'VBox.sh' \
+ -not -name 'xpidl' \
+ -not -name 'vboxkeyboard.tar.gz' \
+ -exec basename '{}' \;) |sort) \
+ <(find $RPM_BUILD_ROOT%{_libdir}/virtualbox/* \
+ $RPM_BUILD_ROOT%{_bindir}/* \
+ $RPM_BUILD_ROOT%{_libdir}/*OGL*.so \
+ $RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \
+ -maxdepth 0 -type f \
+ -not -name '*.py[co]' \
+ -not -name VBoxRandR \
+ -not -name VBox -exec basename '{}' \; |sort)
set -o posix
@@ -384,11 +371,11 @@
%{_libdir}/virtualbox/vboxwebsrv
%{_libdir}/virtualbox/webtest
%{_libdir}/virtualbox/EfiThunk
-%{priv_mode} %{_libdir}/virtualbox/VBoxHeadless
-%{priv_mode} %{_libdir}/virtualbox/VBoxSDL
-%{priv_mode} %{_libdir}/virtualbox/VBoxNetDHCP
-%{priv_mode} %{_libdir}/virtualbox/VBoxNetAdpCtl
-%{priv_mode} %{_libdir}/virtualbox/VirtualBox
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
+%attr(4755,root,root) %{_libdir}/virtualbox/VirtualBox
%{_datadir}/pixmaps/*
%{_datadir}/applications/*.desktop
%config %{_sysconfdir}/vbox/vbox.cfg
@@ -420,7 +407,6 @@
%{_libdir}/VBoxOGL*.so
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
-# %{_datadir}/gdm/autostart/LoginWindow
%exclude %{_datadir}/gdm
%{_datadir}/hal/fdi/policy/20thirdparty/90-vboxguest.fdi
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
@@ -434,6 +420,15 @@
%changelog
+* Tue Jan 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.2-1
+- New upstream release
+
+* Mon Nov 30 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-1
+- Upstream release (they do that quite often, huh?)
+
+* Sat Nov 21 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-0.1.beta2
+- Another upstream beta
+
* Thu Nov 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-0.1.beta1
- Upstream beta release
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-12/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 12 Nov 2009 16:24:20 -0000 1.11
+++ sources 26 Jan 2010 14:45:17 -0000 1.12
@@ -1 +1,2 @@
-851986a826c1ef2ec71bd82a59e79a21 VirtualBox-3.1.0_BETA1_OSE.tar.bz2
+052357bb684515035b3e561b35a1d6f2 UserManual.pdf
+e7808f16114f5b1a65aa2df1aa33e1a7 VirtualBox-3.1.2-OSE.tar.bz2
--- VirtualBox-OSE-3.0.4-visibility.patch DELETED ---
--- VirtualBox-OSE-90-vboxdrv.rules.hardening DELETED ---
14 years, 3 months
rpms/VirtualBox-OSE-kmod/devel VirtualBox-OSE-kmod.spec,1.35,1.36
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6175
Modified Files:
VirtualBox-OSE-kmod.spec
Log Message:
* Tue Jan 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.2-1
- New release
Index: VirtualBox-OSE-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE-kmod/devel/VirtualBox-OSE-kmod.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- VirtualBox-OSE-kmod.spec 6 Dec 2009 21:57:12 -0000 1.35
+++ VirtualBox-OSE-kmod.spec 26 Jan 2010 14:43:44 -0000 1.36
@@ -11,7 +11,7 @@
%bcond_without hardening
Name: VirtualBox-OSE-kmod
-Version: 3.1.0
+Version: 3.1.2
Release: 1%{?dist}
Summary: Kernel module for VirtualBox-OSE
@@ -92,6 +92,9 @@
%changelog
+* Tue Jan 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.2-1
+- New release
+
* Sun Dec 06 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-1
- stable
14 years, 3 months
rpms/VirtualBox-OSE/devel .cvsignore, 1.13, 1.14 VirtualBox-OSE.spec, 1.43, 1.44 sources, 1.13, 1.14
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27020
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Log Message:
* Tue Jan 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.2-1
- New upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore 30 Nov 2009 20:08:24 -0000 1.13
+++ .cvsignore 26 Jan 2010 13:20:50 -0000 1.14
@@ -1,2 +1,2 @@
-VirtualBox-3.1.0-OSE.tar.bz2
UserManual.pdf
+VirtualBox-3.1.2-OSE.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/VirtualBox-OSE.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- VirtualBox-OSE.spec 6 Dec 2009 14:44:15 -0000 1.43
+++ VirtualBox-OSE.spec 26 Jan 2010 13:20:50 -0000 1.44
@@ -7,7 +7,7 @@
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
Name: VirtualBox-OSE
-Version: 3.1.0
+Version: 3.1.2
Release: 1%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -420,6 +420,9 @@
%changelog
+* Tue Jan 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.2-1
+- New upstream release
+
* Mon Nov 30 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-1
- Upstream release (they do that quite often, huh?)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 30 Nov 2009 20:08:25 -0000 1.13
+++ sources 26 Jan 2010 13:20:50 -0000 1.14
@@ -1,2 +1,2 @@
-442dff6ff4a8fe92d223d303b475a146 VirtualBox-3.1.0-OSE.tar.bz2
-51a6eebe5fedc6ac386fe39c1fba5b98 UserManual.pdf
+052357bb684515035b3e561b35a1d6f2 UserManual.pdf
+e7808f16114f5b1a65aa2df1aa33e1a7 VirtualBox-3.1.2-OSE.tar.bz2
14 years, 3 months
rpms/avidemux/devel avidemux.spec,1.28,1.29
by Stewart Adam
Author: firewing
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8968
Modified Files:
avidemux.spec
Log Message:
* Mon Jan 25 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2-2
- Temporary workaround for build failure on rawhide
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- avidemux.spec 18 Jan 2010 21:13:36 -0000 1.28
+++ avidemux.spec 25 Jan 2010 22:47:10 -0000 1.29
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -198,6 +198,9 @@
%install
rm -rf $RPM_BUILD_ROOT
+# Temporary workaround since the i18n files aren't being built
+mkdir $RPM_BUILD_ROOT/%{_datadir}/%{name}
+
make -C build install DESTDIR=$RPM_BUILD_ROOT
make -C build_plugins install DESTDIR=$RPM_BUILD_ROOT
# Install the build configuration for devel package
@@ -258,7 +261,10 @@
%{_includedir}/ADM_coreConfig.h
%changelog
-* Mon Jan 18 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2
+* Mon Jan 25 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2-2
+- Temporary workaround for build failure on rawhide
+
+* Mon Jan 18 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2-1
- Update to 2.5.2 release
* Thu Nov 5 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 2.5.1-6.20091010svn
14 years, 3 months
rpms/libquicktime/devel libquicktime.spec,1.15,1.16
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5494
Modified Files:
libquicktime.spec
Log Message:
Rebuild
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- libquicktime.spec 16 Jan 2010 17:11:57 -0000 1.15
+++ libquicktime.spec 25 Jan 2010 22:12:26 -0000 1.16
@@ -1,7 +1,7 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.1.4
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
@@ -129,6 +129,9 @@
# --------------------------------------------------------------------
%changelog
+* Mon Jan 25 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.1.4-2
+- Rebuild
+
* Sat Jan 16 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.1.4-1
- Update to 1.1.4
14 years, 3 months
rpms/gstreamer-plugins-ugly/devel gstreamer-plugins-ugly.spec, 1.21, 1.22
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-ugly/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4204
Modified Files:
gstreamer-plugins-ugly.spec
Log Message:
* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.13-2
- Rebuild for new libcdio and new x264
Index: gstreamer-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-ugly/devel/gstreamer-plugins-ugly.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- gstreamer-plugins-ugly.spec 7 Nov 2009 14:17:07 -0000 1.21
+++ gstreamer-plugins-ugly.spec 25 Jan 2010 19:38:33 -0000 1.22
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.13
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -32,9 +32,9 @@
BuildRequires: libmad-devel >= 0.15.0
BuildRequires: mpeg2dec-devel >= 0.4.0
BuildRequires: liboil-devel
-BuildRequires: libcdio-devel
+BuildRequires: libcdio-devel >= 0.82
BuildRequires: twolame-devel
-BuildRequires: x264-devel
+BuildRequires: x264-devel >= 0.0.0-0.27
BuildRequires: opencore-amr-devel
BuildRequires: PyXML
@@ -111,6 +111,9 @@
%changelog
+* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.13-2
+- Rebuild for new libcdio and new x264
+
* Sat Nov 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.13-1
- New upstream release 0.10.13
14 years, 3 months
rpms/audacious-plugins-freeworld/F-12 audacious-ffaudio.desktop, NONE, 1.1 audacious-plugins-2.2-m4a.patch, NONE, 1.1 audacious-plugins-2.2-madplug.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 audacious-aac.desktop, 1.1, 1.2 audacious-mp3.desktop, 1.1, 1.2 audacious-plugins-freeworld.spec, 1.5, 1.6 sources, 1.4, 1.5 audacious-alac.desktop, 1.1, NONE audacious-plugins-1.3.4-sse-disable.patch, 1.1, NONE audacious-wma.desktop, 1.1, NONE
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8493
Modified Files:
.cvsignore audacious-aac.desktop audacious-mp3.desktop
audacious-plugins-freeworld.spec sources
Added Files:
audacious-ffaudio.desktop audacious-plugins-2.2-m4a.patch
audacious-plugins-2.2-madplug.patch
Removed Files:
audacious-alac.desktop
audacious-plugins-1.3.4-sse-disable.patch
audacious-wma.desktop
Log Message:
* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-2
- Don't hang when trying to identify unknown files as mp3 files (rf1031)
--- NEW FILE audacious-ffaudio.desktop ---
[Desktop Entry]
Name=Audacious
Comment=Play music
Comment[hu]=Zene lejátszása
Exec=audacious
Icon=audacious.png
MimeType=audio/x-ms-wma;audio/alac;audio/x-musepack;
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
NoDisplay=true
audacious-plugins-2.2-m4a.patch:
ffaudio-core.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE audacious-plugins-2.2-m4a.patch ---
diff -up audacious-plugins-2.2/src/ffaudio/ffaudio-core.c~ audacious-plugins-2.2/src/ffaudio/ffaudio-core.c
--- audacious-plugins-2.2/src/ffaudio/ffaudio-core.c~ 2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2/src/ffaudio/ffaudio-core.c 2009-12-19 15:15:03.000000000 +0100
@@ -664,6 +664,9 @@ static gchar *ffaudio_fmts[] = {
/* VQF */
"vqf",
+ /* Apple Lossless (alac) */
+ "m4a",
+
/* end of table */
NULL
};
audacious-plugins-2.2-madplug.patch:
plugin.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE audacious-plugins-2.2-madplug.patch ---
diff -up audacious-plugins-2.2/src/madplug/plugin.c~ audacious-plugins-2.2/src/madplug/plugin.c
--- audacious-plugins-2.2/src/madplug/plugin.c~ 2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2/src/madplug/plugin.c 2010-01-25 16:09:29.000000000 +0100
@@ -440,6 +440,10 @@ audmad_is_our_fd(const gchar *filename,
}
}
}
+
+ if (state == STATE_RESYNC_DO) /* reached end of data */
+ state = STATE_FATAL;
+
break;
}
} while (state != STATE_FATAL && tries < max_resync_tries);
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 21 Aug 2009 14:45:57 -0000 1.4
+++ .cvsignore 25 Jan 2010 15:44:42 -0000 1.5
@@ -1 +1 @@
-audacious-plugins-2.1.tgz
+audacious-plugins-2.2.tgz
Index: audacious-aac.desktop
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/audacious-aac.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-aac.desktop 10 Aug 2008 10:54:05 -0000 1.1
+++ audacious-aac.desktop 25 Jan 2010 15:44:42 -0000 1.2
@@ -8,6 +8,4 @@
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.10
NoDisplay=true
Index: audacious-mp3.desktop
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/audacious-mp3.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- audacious-mp3.desktop 10 Aug 2008 10:54:05 -0000 1.1
+++ audacious-mp3.desktop 25 Jan 2010 15:44:42 -0000 1.2
@@ -8,6 +8,4 @@
Categories=GTK;AudioVideo;Player;
Terminal=false
Type=Application
-Encoding=UTF-8
-X-Desktop-File-Install-Version=0.10
NoDisplay=true
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/audacious-plugins-freeworld.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- audacious-plugins-freeworld.spec 21 Aug 2009 14:45:57 -0000 1.5
+++ audacious-plugins-freeworld.spec 25 Jan 2010 15:44:42 -0000 1.6
@@ -1,8 +1,13 @@
-%define aud_ver 2.1
+# TODO:
+# - add more mime types to .desktop file for 'ffaudio' plugin
+# - add BR sidplay2-devel and find a way to make the built sid.so
+# plugin an alternative to Fedora's sidplay1 based sid.so
+
+%define aud_ver 2.2
Name: audacious-plugins-freeworld
-Version: 2.1
-Release: 1%{?dist}
+Version: 2.2
+Release: 2%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -11,8 +16,9 @@
Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
Source1: audacious-mp3.desktop
Source2: audacious-aac.desktop
-Source3: audacious-wma.desktop
-Source4: audacious-alac.desktop
+Source3: audacious-ffaudio.desktop
+Patch0: audacious-plugins-2.2-m4a.patch
+Patch1: audacious-plugins-2.2-madplug.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: audacious-devel >= %{aud_ver}
@@ -21,14 +27,14 @@
BuildRequires: lame-devel, libmms-devel, libmad-devel
BuildRequires: gettext, libbinio-devel
BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
+# ffaudio plugin
+BuildRequires: faad2-devel ffmpeg-devel
# require all the plugins
Requires: %{name}-mp3 = %{version}-%{release}
Requires: %{name}-aac = %{version}-%{release}
-Requires: %{name}-wma = %{version}-%{release}
-Requires: %{name}-alac = %{version}-%{release}
-Requires: %{name}-tta = %{version}-%{release}
Requires: %{name}-mms = %{version}-%{release}
+Requires: %{name}-ffaudio = %{version}-%{release}
# obsolete old freshrpms package
Provides: audacious-plugins-extras = %{version}-%{release}
@@ -39,6 +45,9 @@
user interface based on Winamp 2.x skins. It is based on ("forked off")
BMP.
+This package contains additional plugins for the Audacious media player.
+
+
%package mp3
Summary: MP3 playback plugin for Audacious
Group: Applications/Multimedia
@@ -47,9 +56,6 @@
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
-Provides: bmp-mp3 = 0.9.7.1
-Obsoletes: bmp-mp3 <= 0.9.7.1
-
# obsolete old livna package
Provides: audacious-plugins-nonfree-mp3 = %{version}-%{release}
Obsoletes: audacious-plugins-nonfree-mp3 < %{version}-%{release}
@@ -82,60 +88,26 @@
This is the plugin needed to play AAC audio files.
-%package wma
-Summary: WMA playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
+%package ffaudio
+Summary: FFMpeg/FAAD2 based input plugin for Audacious
+Group: Applications/Multimedia
+Requires: audacious-plugins >= %{aud_ver}
Requires(post): desktop-file-utils >= 0.9
Requires(postun): desktop-file-utils >= 0.9
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-wma = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release}
-
-%description wma
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-BMP.
-
-This is the plugin needed to play WMA audio files.
-
-
-%package alac
-Summary: ALAC playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
-
-Requires(post): desktop-file-utils >= 0.9
-Requires(postun): desktop-file-utils >= 0.9
-
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-alac = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release}
-
-%description alac
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-
-This is the plugin needed to play ALAC (Apple Lossless Audio Codec)
-audio files.
+# obsolete discontinued plugins
+Obsoletes: audacious-plugins-freeworld-alac <= 2.1
+Obsoletes: audacious-plugins-freeworld-tta <= 2.1
+Obsoletes: audacious-plugins-freeworld-wma <= 2.1
+
+# obsolete old livna packages
+Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release}
+Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release}
-
-%package tta
-Summary: TTA playback plugin for Audacious
-Group: Applications/Multimedia
-Requires: audacious-plugins >= %{aud_ver}
-
-# obsolete old livna package
-Provides: audacious-plugins-nonfree-tta = %{version}-%{release}
-Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release}
-
-%description tta
-Audacious is a media player that currently uses a skinned
-user interface based on Winamp 2.x skins. It is based on ("forked off")
-
-This is the plugin needed to play TTA audio files.
+%description ffaudio
+FFMpeg/FAAD2 based input plugin for Audacious.
%package mms
@@ -157,6 +129,9 @@
%prep
%setup -q -n audacious-plugins-%{version}
+%patch0 -p1
+%patch1 -p1
+sed -i '\,^.SILENT:,d' buildsys.mk.in
%build
@@ -168,9 +143,7 @@
--disable-dependency-tracking
make V=1 %{?_smp_mflags} -C src/madplug
make V=1 %{?_smp_mflags} -C src/aac
-make V=1 %{?_smp_mflags} -C src/wma
-make V=1 %{?_smp_mflags} -C src/alac
-make V=1 %{?_smp_mflags} -C src/tta
+make V=1 %{?_smp_mflags} -C src/ffaudio
make V=1 %{?_smp_mflags} -C src/mms
@@ -178,9 +151,7 @@
rm -rf $RPM_BUILD_ROOT
make -C src/madplug install DESTDIR=$RPM_BUILD_ROOT
make -C src/aac install DESTDIR=$RPM_BUILD_ROOT
-make -C src/wma install DESTDIR=$RPM_BUILD_ROOT
-make -C src/alac install DESTDIR=$RPM_BUILD_ROOT
-make -C src/tta install DESTDIR=$RPM_BUILD_ROOT
+make -C src/ffaudio install DESTDIR=$RPM_BUILD_ROOT
make -C src/mms install DESTDIR=$RPM_BUILD_ROOT
desktop-file-install --vendor livna \
@@ -191,16 +162,13 @@
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE2}
-desktop-file-install --vendor livna \
+desktop-file-install --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE3}
-desktop-file-install --vendor livna \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- %{SOURCE4}
-
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -217,16 +185,10 @@
%postun aac
update-desktop-database %{_datadir}/applications
-%post wma
-update-desktop-database %{_datadir}/applications
-
-%postun wma
+%post ffaudio
update-desktop-database %{_datadir}/applications
-%post alac
-update-desktop-database %{_datadir}/applications
-
-%postun alac
+%postun ffaudio
update-desktop-database %{_datadir}/applications
@@ -244,25 +206,23 @@
%{_libdir}/audacious/Input/aac.so
%{_datadir}/applications/livna-audacious-aac.desktop
-%files wma
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/wma.so
-%{_datadir}/applications/livna-audacious-wma.desktop
-
-%files alac
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/alac.so
-%{_datadir}/applications/livna-audacious-alac.desktop
-
-%files tta
+%files ffaudio
%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/tta.so
+%{_libdir}/audacious/Input/ffaudio.so
+%{_datadir}/applications/audacious-ffaudio.desktop
%files mms
%defattr(-,root,root,-)
%{_libdir}/audacious/Transport/mms.so
+
%changelog
+* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-2
+- Don't hang when trying to identify unknown files as mp3 files (rf1031)
+
+* Sat Dec 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-1
+- Update to 2.2
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.5.1-2
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-12/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 21 Aug 2009 14:45:57 -0000 1.4
+++ sources 25 Jan 2010 15:44:42 -0000 1.5
@@ -1 +1 @@
-087fcb1f6fb8429b267f18ed3e3acb7a audacious-plugins-2.1.tgz
+ed6790bf5667c824eda72301f0a886a8 audacious-plugins-2.2.tgz
--- audacious-alac.desktop DELETED ---
--- audacious-plugins-1.3.4-sse-disable.patch DELETED ---
--- audacious-wma.desktop DELETED ---
14 years, 3 months
rpms/audacious-plugins-freeworld/devel audacious-plugins-2.2-madplug.patch, NONE, 1.1 audacious-plugins-freeworld.spec, 1.6, 1.7
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6622
Modified Files:
audacious-plugins-freeworld.spec
Added Files:
audacious-plugins-2.2-madplug.patch
Log Message:
* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-2
- Don't hang when trying to identify unknown files as mp3 files (rf1031)
audacious-plugins-2.2-madplug.patch:
plugin.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE audacious-plugins-2.2-madplug.patch ---
diff -up audacious-plugins-2.2/src/madplug/plugin.c~ audacious-plugins-2.2/src/madplug/plugin.c
--- audacious-plugins-2.2/src/madplug/plugin.c~ 2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2/src/madplug/plugin.c 2010-01-25 16:09:29.000000000 +0100
@@ -440,6 +440,10 @@ audmad_is_our_fd(const gchar *filename,
}
}
}
+
+ if (state == STATE_RESYNC_DO) /* reached end of data */
+ state = STATE_FATAL;
+
break;
}
} while (state != STATE_FATAL && tries < max_resync_tries);
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- audacious-plugins-freeworld.spec 19 Dec 2009 15:59:56 -0000 1.6
+++ audacious-plugins-freeworld.spec 25 Jan 2010 15:25:28 -0000 1.7
@@ -7,7 +7,7 @@
Name: audacious-plugins-freeworld
Version: 2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Additional plugins for the Audacious media player
Group: Applications/Multimedia
@@ -18,6 +18,7 @@
Source2: audacious-aac.desktop
Source3: audacious-ffaudio.desktop
Patch0: audacious-plugins-2.2-m4a.patch
+Patch1: audacious-plugins-2.2-madplug.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: audacious-devel >= %{aud_ver}
@@ -129,6 +130,7 @@
%prep
%setup -q -n audacious-plugins-%{version}
%patch0 -p1
+%patch1 -p1
sed -i '\,^.SILENT:,d' buildsys.mk.in
@@ -215,6 +217,9 @@
%changelog
+* Mon Jan 25 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-2
+- Don't hang when trying to identify unknown files as mp3 files (rf1031)
+
* Sat Dec 19 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-1
- Update to 2.2
14 years, 3 months
rpms/vcdimager/devel vcdimager.spec,1.6,1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vcdimager/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30165
Modified Files:
vcdimager.spec
Log Message:
Rebuild again
Index: vcdimager.spec
===================================================================
RCS file: /cvs/free/rpms/vcdimager/devel/vcdimager.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vcdimager.spec 23 Jan 2010 20:12:08 -0000 1.6
+++ vcdimager.spec 24 Jan 2010 11:13:27 -0000 1.7
@@ -1,7 +1,7 @@
Summary: VideoCD (pre-)mastering and ripping tool
Name: vcdimager
Version: 0.7.23
-Release: 12%{?dist}
+Release: 13%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.gnu.org/software/vcdimager/
@@ -116,7 +116,7 @@
%changelog
-* Sat Jan 23 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0.7.23-12
+* Sun Jan 24 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0.7.23-13
- Rebuild for libcdio
* Wed Nov 25 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 0.7.23-11
14 years, 3 months