rpms/VirtualBox-OSE/F-15 VirtualBox-OSE-4.1.2-libcxx.patch, NONE, 1.1 VirtualBox-OSE-4.1.2-noupdate.patch, NONE, 1.1 VirtualBox-OSE-4.1.2-testmangle.patch, NONE, 1.1 VirtualBox-OSE-4.1.2-usblib.patch, NONE, 1.1 VirtualBox-OSE-4.1.2-vboxpci.patch, NONE, 1.1 vboxweb-service, NONE, 1.1 .cvsignore, 1.28, 1.29 VirtualBox-OSE-90-vboxdrv.rules, 1.5, 1.6 VirtualBox-OSE.spec, 1.69, 1.70 sources, 1.28, 1.29 VirtualBox-OSE-3.2.0-noupdate.patch, 1.1, NONE VirtualBox-OSE-3.2.6-vboxkeyboard.patch, 1.1, NONE VirtualBox-OS
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31159
Modified Files:
.cvsignore VirtualBox-OSE-90-vboxdrv.rules VirtualBox-OSE.spec
sources
Added Files:
VirtualBox-OSE-4.1.2-libcxx.patch
VirtualBox-OSE-4.1.2-noupdate.patch
VirtualBox-OSE-4.1.2-testmangle.patch
VirtualBox-OSE-4.1.2-usblib.patch
VirtualBox-OSE-4.1.2-vboxpci.patch vboxweb-service
Removed Files:
VirtualBox-OSE-3.2.0-noupdate.patch
VirtualBox-OSE-3.2.6-vboxkeyboard.patch
VirtualBox-OSE-4.0.0-usblib.patch
VirtualBox-OSE-4.0.2-gcc46.patch
VirtualBox-OSE-4.0.2-libcxx.patch
Log Message:
* Sun Nov 27 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.2-1
- fix bug #1877, the fix is update VirtualBox-OSE to 4.1.x
- small fix for bug #1979.
- from 4.1.2.f16 Lubomir Rintel <lkundrak(a)v3.sk>
- New release Lubomir
- Assign USB devices to vboxusers
- Add a web service
- Install MIME types for disk images
VirtualBox-OSE-4.1.2-libcxx.patch:
Config.kmk | 4 ++--
configure | 2 +-
src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +----
src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +-
src/VBox/HostDrivers/Support/Makefile.kmk | 2 +-
src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------
src/VBox/HostDrivers/win/Makefile.kmk | 2 +-
src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +-
src/VBox/Installer/win/Resources/Makefile.kmk | 2 +-
src/VBox/Installer/win/Stub/Makefile.kmk | 2 +-
src/VBox/Storage/testcase/Makefile.kmk | 2 +-
src/libs/liblzf-3.4/Makefile.kmk | 2 +-
src/libs/zlib-1.2.1/Makefile.kmk | 3 +--
14 files changed, 20 insertions(+), 24 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.2-libcxx.patch ---
>From dd383911ef6a9a43c17b18d48b17cd82d6c8feb9 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Fri, 18 Jun 2010 10:58:14 +0200
Subject: [PATCH 2/3] Do not include statically linked libstdc++
Not a good idea if we don't need to be binary-compatible across exotic
distribution. Doesn't work with trunk glibc heading towards 2.11 anyways.
Static linking is not really supported anyways.
---
Config.kmk | 4 ++--
configure | 2 +-
.../WINNT/Graphics/Video/disp/Makefile.kmk | 2 +-
src/VBox/Additions/x11/VBoxClient/Makefile.kmk | 5 +----
src/VBox/Frontends/VirtualBox/Makefile.kmk | 2 +-
src/VBox/HostDrivers/Support/Makefile.kmk | 2 +-
src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk | 12 ++++++------
src/VBox/HostDrivers/win/Makefile.kmk | 2 +-
src/VBox/Installer/win/InstallHelper/Makefile.kmk | 2 +-
src/VBox/Installer/win/Resources/Makefile.kmk | 2 +-
src/VBox/Installer/win/Stub/Makefile.kmk | 2 +-
src/VBox/Storage/testcase/Makefile.kmk | 2 +-
src/libs/liblzf-3.4/Makefile.kmk | 2 +-
src/libs/zlib-1.2.1/Makefile.kmk | 2 +-
17 files changed, 23 insertions(+), 26 deletions(-)
diff --git a/Config.kmk b/Config.kmk
index 0ea34d8..2ec388c 100644
--- a/Config.kmk
+++ b/Config.kmk
@@ -3163,7 +3163,7 @@ TEMPLATE_VBOXR3EXE_LIBS = pthread m rt dl
TEMPLATE_VBOXR3EXE_LIBS = \
$(L4_LIBDIR)/libvboxserver.s.so \
$(L4_LIBDIR)/libuc++.0.s.so \
- supc++ gcc_eh gcc \
+ stdc++ \
$(L4_LIBDIR)/libdl.s.so \
$(L4_LIBDIR)/libuc.0.s.so
else ifeq ($(KBUILD_TARGET),os2)
@@ -3311,7 +3311,7 @@ endif
# Temporary: Renaming the template and warnings will be errors (soon).
#
TEMPLATE_VBoxR3Static = New name for VBOXR3STATIC
-TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3STATIC
+TEMPLATE_VBoxR3Static_EXTENDS = VBOXR3EXE
TEMPLATE_VBoxR3Static_EXTENDS_BY = appending
ifeq ($(KBUILD_TARGET),win)
TEMPLATE_VBoxR3Static_CFLAGS += $(VBOX_VCC_WERR)
diff --git a/configure b/configure
index 987cf1b..75d556c 100755
--- a/configure
+++ b/configure
@@ -2582,7 +2582,7 @@ fi
if [ "$OS" = "linux" ]; then
# don't check for the static libstdc++ in the PUEL version as we build the
# additions at a dedicated box
- [ $OSE -ge 1 ] && check_staticlibstdcxx
+ #[ $OSE -ge 1 ] && check_staticlibstdcxx
if [ $WITH_KMODS -eq 1 ]; then
check_linux
else
diff --git a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
index 52fb6d3..af7ba4b 100644
--- a/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
+++ b/src/VBox/Additions/WINNT/Graphics/Video/disp/Makefile.kmk
@@ -160,7 +160,7 @@ endif #ifdef VBOX_WITH_WDDM
ifdef VBOXVIDEOWINDBG
DLLS += vbvdbg
-vbvdbg_TEMPLATE = VBOXR3STATIC
+vbvdbg_TEMPLATE = VBOXR3EXE
vbvdbg_DEFS = UNICODE _UNICODE
vbvdbg_SOURCES = \
wddm/dbg/VBoxVideoWinDbg.cpp \
diff --git a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
index ee73ed0..e359702 100644
--- a/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
+++ b/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
@@ -50,10 +50,7 @@ VBoxClient_LIBS = \
X11 \
Xrandr \
Xt
-# These are static replacements for gcc-specific parts of libstdc++
-VBoxClient_LIBS += \
- supc++ \
- gcc_eh
+VBoxClient_LIBS += stdc++
ifdef VBOX_X11_SEAMLESS_GUEST
VBoxClient_DEFS += SEAMLESS_GUEST DYNAMIC_RESIZE
VBoxClient_SOURCES += \
diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk
index ed0163b..2ee8418 100644
--- a/src/VBox/Frontends/VirtualBox/Makefile.kmk
+++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk
@@ -957,7 +957,7 @@ endif # darwin
if defined(VBOX_WITH_VIDEOHWACCEL)
if1of ($(KBUILD_TARGET), win linux freebsd)
LIBRARIES += VBoxOGL2D
- VBoxOGL2D_TEMPLATE = VBOXR3STATIC
+ VBoxOGL2D_TEMPLATE = VBOXR3EXE
VBoxOGL2D_USES = qt4
VBoxOGL2D_SDKS = QT4
VBoxOGL2D_DEFS = IN_RING3 QT_NO_DEBUG QT_THREAD_SUPPORT QT_SHARED HAVE_CONFIG_H $(ARCH_BITS_DEFS) VBOX_WITH_VIDEOHWACCEL VBOX_GUI_USE_QGL
diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk
index bf77085..9d67f49 100644
--- a/src/VBox/HostDrivers/Support/Makefile.kmk
+++ b/src/VBox/HostDrivers/Support/Makefile.kmk
@@ -95,7 +95,7 @@ SUPR3_SOURCES = \
#
# Static version of SUPR3.
#
-SUPR3Static_TEMPLATE = VBOXR3STATIC
+SUPR3Static_TEMPLATE = VBOXR3EXE
SUPR3Static_EXTENDS = SUPR3
#
diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
index a40f46d..e29273f 100644
--- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
@@ -141,7 +141,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
# WinNetConfig - static library with host network interface config API
#
LIBRARIES.win += WinNetConfig
- WinNetConfig_TEMPLATE = VBOXR3STATIC
+ WinNetConfig_TEMPLATE = VBOXR3EXE
WinNetConfig_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
WinNetConfig_SDKS = WINPSDK W2K3DDK
WinNetConfig_SOURCES = \
@@ -152,7 +152,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
# NetFltInstall
#
PROGRAMS.win += NetFltInstall
- NetFltInstall_TEMPLATE = VBOXR3STATIC
+ NetFltInstall_TEMPLATE = VBOXR3EXE
NetFltInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL
NetFltInstall_SOURCES = win/tools/VBoxNetFltInstall.cpp
NetFltInstall_LIBS = \
@@ -166,7 +166,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
# NetFltUninstall
#
PROGRAMS.win += NetFltUninstall
- NetFltUninstall_TEMPLATE = VBOXR3STATIC
+ NetFltUninstall_TEMPLATE = VBOXR3EXE
NetFltUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL
NetFltUninstall_SOURCES = win/tools/VBoxNetFltUninstall.cpp
NetFltUninstall_LIBS = \
@@ -179,7 +179,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
# NetAdpInstall
#
PROGRAMS.win += NetAdpInstall
- NetAdpInstall_TEMPLATE = VBOXR3STATIC
+ NetAdpInstall_TEMPLATE = VBOXR3EXE
NetAdpInstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL
NetAdpInstall_SOURCES = win/tools/VBoxNetAdpInstall.cpp
NetAdpInstall_LIBS = \
@@ -193,7 +193,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
# NetAdpUninstall
#
PROGRAMS.win += NetAdpUninstall
- NetAdpUninstall_TEMPLATE = VBOXR3STATIC
+ NetAdpUninstall_TEMPLATE = VBOXR3EXE
NetAdpUninstall_SDKS = WINPSDK W2K3DDK VBOX_NTDLL
NetAdpUninstall_SOURCES = win/tools/VBoxNetAdpUninstall.cpp
NetAdpUninstall_LIBS = \
@@ -206,7 +206,7 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \
# VBoxNetFltNobj
#
DLLS.win += VBoxNetFltNobj
- VBoxNetFltNobj_TEMPLATE = VBOXR3STATIC
+ VBoxNetFltNobj_TEMPLATE = VBOXR3EXE
if defined(VBOX_SIGNING_MODE)
VBoxNetFltNobj_NOINST = true
endif
diff --git a/src/VBox/HostDrivers/win/Makefile.kmk b/src/VBox/HostDrivers/win/Makefile.kmk
index 19c15d5..6d2366f 100644
--- a/src/VBox/HostDrivers/win/Makefile.kmk
+++ b/src/VBox/HostDrivers/win/Makefile.kmk
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
LIBRARIES += VBoxDrvCfg
-VBoxDrvCfg_TEMPLATE = VBOXR3STATIC
+VBoxDrvCfg_TEMPLATE = VBOXR3EXE
VBoxDrvCfg_SDKS = WINPSDK W2K3DDK
VBoxDrvCfg_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
VBoxDrvCfg_SOURCES = cfg/VBoxDrvCfg.cpp
diff --git a/src/VBox/Installer/win/InstallHelper/Makefile.kmk b/src/VBox/Installer/win/InstallHelper/Makefile.kmk
index 5271e49..aa18e57 100644
--- a/src/VBox/Installer/win/InstallHelper/Makefile.kmk
+++ b/src/VBox/Installer/win/InstallHelper/Makefile.kmk
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../..
include $(KBUILD_PATH)/subheader.kmk
DLLS += VBoxInstallHelper
-VBoxInstallHelper_TEMPLATE = VBOXR3STATIC
+VBoxInstallHelper_TEMPLATE = VBOXR3EXE
VBoxInstallHelper_DEFS = _WIN32_WINNT=0x0501 _UNICODE UNICODE
VBoxInstallHelper_DEFS += VBOX_SVN_REV=$(VBOX_SVN_REV)
VBoxInstallHelper_DEPS = $(VBOX_SVN_REV_KMK)
diff --git a/src/VBox/Installer/win/Resources/Makefile.kmk b/src/VBox/Installer/win/Resources/Makefile.kmk
index 77ea1b7..5e58fdc 100644
--- a/src/VBox/Installer/win/Resources/Makefile.kmk
+++ b/src/VBox/Installer/win/Resources/Makefile.kmk
@@ -19,7 +19,7 @@ SUB_DEPTH = ../../../../..
include $(KBUILD_PATH)/subheader.kmk
DLLS += VBoxRes
-VBoxRes_TEMPLATE = VBOXR3STATIC
+VBoxRes_TEMPLATE = VBOXR3EXE
VBoxRes_DEPS = $(VBOX_SVN_REV_KMK)
VBoxRes_SOURCES = \
dummy.cpp \
diff --git a/src/VBox/Installer/win/Stub/Makefile.kmk b/src/VBox/Installer/win/Stub/Makefile.kmk
index a8f89eb..6cf55cc 100644
--- a/src/VBox/Installer/win/Stub/Makefile.kmk
+++ b/src/VBox/Installer/win/Stub/Makefile.kmk
@@ -22,7 +22,7 @@ include $(KBUILD_PATH)/subheader.kmk
if "$(KBUILD_TARGET_ARCH)" == "x86"
TEMPLATE_VBOXSTUB = Drop the signing, we will sign it later.
-TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3STATIC
+TEMPLATE_VBOXSTUB_EXTENDS = VBOXR3EXE
TEMPLATE_VBOXSTUB_POST_CMDS = $(NO_SUCH_VARIABLE)
PROGRAMS.x86 += VBoxStub
diff --git a/src/VBox/Storage/testcase/Makefile.kmk b/src/VBox/Storage/testcase/Makefile.kmk
index f935b05..40f6bf2 100644
--- a/src/VBox/Storage/testcase/Makefile.kmk
+++ b/src/VBox/Storage/testcase/Makefile.kmk
@@ -68,7 +68,7 @@ ifdef VBOX_WITH_TESTCASES
#
# vbox-img - static because it migth be used as at standalone tool.
#
- vbox-img_TEMPLATE = VBOXR3STATIC
+ vbox-img_TEMPLATE = VBOXR3EXE
vbox-img_DEFS += IN_VBOXDDU IN_VBOXDDU_STATIC VBOX_HDD_NO_DYNAMIC_BACKENDS IN_RT_R3
vbox-img_SOURCES = \
vbox-img.cpp \
diff --git a/src/libs/liblzf-3.4/Makefile.kmk b/src/libs/liblzf-3.4/Makefile.kmk
index 44088fa..0afe89a 100644
--- a/src/libs/liblzf-3.4/Makefile.kmk
+++ b/src/libs/liblzf-3.4/Makefile.kmk
@@ -33,7 +33,7 @@ VBox-liblzf_SOURCES = \
lzf_c.c \
lzf_d.c
-VBox-liblzf-static_TEMPLATE = VBOXR3STATIC
+VBox-liblzf-static_TEMPLATE = VBOXR3EXE
VBox-liblzf-static_BLD_TYPE = $(VBox-liblzf_BLD_TYPE)
VBox-liblzf-static_DEFS = $(VBox-liblzf_DEFS)
VBox-liblzf-static_DEFS.x86 = $(VBox-liblzf_DEFS.x86)
diff --git a/src/libs/zlib-1.2.1/Makefile.kmk b/src/libs/zlib-1.2.1/Makefile.kmk
index fde8b7c..405d354 100644
--- a/src/libs/zlib-1.2.1/Makefile.kmk
+++ b/src/libs/zlib-1.2.1/Makefile.kmk
@@ -39,7 +39,7 @@ VBox-zlib_SOURCES = \
inftrees.c \
inffast.c
-VBox-zlib-static_TEMPLATE = VBOXR3STATIC
+VBox-zlib-static_TEMPLATE = VBOXR3EXE
VBox-zlib-static_DEFS = $(VBox-zlib_DEFS)
VBox-zlib-static_SOURCES = $(VBox-zlib_SOURCES)
--
1.7.1
VirtualBox-OSE-4.1.2-noupdate.patch:
VBoxUpdateDlg.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.2-noupdate.patch ---
>From a16880964c51ff647c94e6aaf83ec67f6d1aeca5 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Wed, 28 Apr 2010 11:53:40 +0200
Subject: [PATCH 2/2] Disable automatic check for updates
Our OS provides superior way of dealing with updates (PackageKit).
Let's not bug the user with updates that are not yet packaged.
---
.../Frontends/VirtualBox/src/VBoxUpdateDlg.cpp | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
index f135c26..cc8399b 100644
--- a/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
+++ b/src/VBox/Frontends/VirtualBox/src/VBoxUpdateDlg.cpp
@@ -187,7 +187,12 @@ void VBoxUpdateData::decode()
if (parser.size() > 1)
{
QDate date = QDate::fromString(parser[1], Qt::ISODate);
- m_date = date.isValid() ? date : QDate::currentDate();
+ if (date.isValid()) {
+ m_date = date;
+ } else {
+ m_periodIndex = PeriodNever;
+ }
+
}
/* Parse 'branch' value: */
--
1.7.1
VirtualBox-OSE-4.1.2-testmangle.patch:
Makefile.kmk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE VirtualBox-OSE-4.1.2-testmangle.patch ---
Disable a failing check.
diff -urp VirtualBox-4.1.2_OSE/src/VBox/Runtime/Makefile.kmk VirtualBox-4.1.2_OSE.fixed/src/VBox/Runtime/Makefile.kmk
--- VirtualBox-4.1.2_OSE/src/VBox/Runtime/Makefile.kmk 2011-08-15 14:28:32.000000000 +0200
+++ VirtualBox-4.1.2_OSE.fixed/src/VBox/Runtime/Makefile.kmk 2011-09-20 21:49:21.961684047 +0200
@@ -2268,7 +2268,7 @@ test-doxygen::
#
# Test mangling.
#
-if1of ($(LIBRARIES),RuntimeR3 RuntimeR0 RuntimeR0Drv RuntimeRC)
+if1of (wololo,RuntimeR3 RuntimeR0 RuntimeR0Drv RuntimeRC)
test-mangling:: $(IPRT_OUT_DIR)/mangling.run
OTHERS += $(IPRT_OUT_DIR)/mangling.run
CLEANS += $(IPRT_OUT_DIR)/mangling.run
VirtualBox-OSE-4.1.2-usblib.patch:
Makefile.kmk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.2-usblib.patch ---
>From 62776a195748d36f311bbbc3d7542e17a7cb4a86 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon, 10 Jan 2011 15:39:07 +0100
Subject: [PATCH 3/3] Fix path to USBLib
kmk: *** No rule to make target `out/linux.x86/release/lib/USBLib.a',
needed by `out/linux.x86/release/obj/tstHostHardwareLinux/tstHostHardwareLinux'.
Stop.
---
src/VBox/Main/testcase/Makefile.kmk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/VBox/Main/testcase/Makefile.kmk b/src/VBox/Main/testcase/Makefile.kmk
index c6acdd1..1e593d6 100644
--- a/src/VBox/Main/testcase/Makefile.kmk
+++ b/src/VBox/Main/testcase/Makefile.kmk
@@ -183,7 +183,7 @@ tstUSBProxyLinux_DEFS = \
tstUSBProxyLinux_DEPS = \
$(VBOX_PATH_SDK)/bindings/xpcom/include/VirtualBox_XPCOM.h
tstUSBProxyLinux_LIBS += \
- $(PATH_OUT)/lib/USBLib.a
+ $(PATH_OUT)/obj/USBLib/USBLib.o
# generate rules.
--
1.7.1
VirtualBox-OSE-4.1.2-vboxpci.patch:
Makefile.kmk | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE VirtualBox-OSE-4.1.2-vboxpci.patch ---
>From d7f04987c6e52962a8c740d4d642b2bb1f33a41b Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Tue, 20 Sep 2011 09:52:11 +0200
Subject: [PATCH 1/2] Fix a vboxpci compilation failure with vboxdrv disabled
Simply disable the compilation test.
---
src/VBox/HostDrivers/VBoxPci/Makefile.kmk | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/src/VBox/HostDrivers/VBoxPci/Makefile.kmk b/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
index e13ac97..9091abf 100644
--- a/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
+++ b/src/VBox/HostDrivers/VBoxPci/Makefile.kmk
@@ -18,6 +18,7 @@
SUB_DEPTH = ../../../..
include $(KBUILD_PATH)/subheader.kmk
if1of ($(KBUILD_TARGET), linux)
+ifdef VBOX_WITH_VBOXDRV
#
# The driver.
@@ -41,6 +42,7 @@ if1of ($(KBUILD_TARGET), linux)
VBoxPci_LIBS += \
$(PATH_STAGE_LIB)/SUPR0IdcClient$(VBOX_SUFF_LIB)
+endif
#
# Install the sources.
--
1.7.1
--- NEW FILE vboxweb-service ---
#! /bin/bash
#
# vboxweb-service: VirtualBox OSE Web Service init script.
#
# Author: Lubomir Rintel <lkundrak(a)v3.sk>
#
# chkconfig: - 80 30
# description: VirtualBox OSE Web Services
# processname: vboxweb
# pidfile: /var/run/vboxweb-service.pid
#
### BEGIN INIT INFO
# Provides: vboxweb-service
# Required-Start: network
# Required-Stop:
# Default-Start:
# Default-Stop: 0 1 2 6
# Short-Description: VirtualBox OSE Web Service
# Description: VirtualBox OSE Web Services API
### END INIT INFO
SERVICE=vboxweb-service
PROCESS=vboxwebsrv
DAEMON=/usr/bin/$PROCESS
PIDFILE=/var/run/$SERVICE.pid
# Source function library.
. /etc/init.d/functions
# Source networking configuration.
. /etc/sysconfig/network
# Source service configuration.
[ -f /etc/sysconfig/$SERVICE ] && . /etc/sysconfig/$SERVICE
# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0
[ -x $DAEMON ] || exit 1
start ()
{
echo -n $"Starting $SERVICE: "
daemon $DAEMON --pidfile $PIDFILE --background $VBOXWEB_OPTS >/dev/null 2>&1
# We suppressed nonessential output, so we need to reprint status msg
RETVAL=$?
if [ $RETVAL = 0 ]
then
success
touch /var/lock/subsys/$SERVICE
else
failure
fi
echo
return $RETVAL
}
stop ()
{
echo -n $"Stopping $SERVICE:"
killproc $PROCESS
RETVAL=$?
echo
if [ $RETVAL -eq 0 ]
then
rm -f /var/lock/subsys/$SERVICE
rm -f $PIDFILE
fi
return $RETVAL
}
restart ()
{
stop && start
}
RETVAL=0
case "$1" in
start)
start
RETVAL=$?
;;
stop)
stop
RETVAL=$?
;;
restart)
restart
RETVAL=$?
;;
reload)
echo "$0 does not support configuration reloading, you have to restart it."
RETVAL=1
;;
status)
status $PROCESS
RETVAL=$?
;;
*)
echo $"Usage: $0 {start|stop|restart|reload|status}"
RETVAL=1
esac
exit $RETVAL
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 4 Apr 2011 06:59:28 -0000 1.28
+++ .cvsignore 27 Nov 2011 22:03:30 -0000 1.29
@@ -1 +1 @@
-VirtualBox-4.0.4.tar.bz2
+VirtualBox-4.1.2.tar.bz2
Index: VirtualBox-OSE-90-vboxdrv.rules
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE-90-vboxdrv.rules,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-OSE-90-vboxdrv.rules 22 Aug 2009 03:43:09 -0000 1.5
+++ VirtualBox-OSE-90-vboxdrv.rules 27 Nov 2011 22:03:30 -0000 1.6
@@ -1,2 +1,3 @@
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxdrv", OWNER="root", MODE="0666"
-ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxnetctl", OWNER="root", MODE="0666"
+ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxdrv", OWNER="root", MODE="0600"
+ACTION=="add", DEVPATH=="/devices/virtual/misc/vboxnetctl", OWNER="root", MODE="0600"
+ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", ATTR{bDeviceClass}!="09", GROUP="vboxusers", MODE="660", SYMLINK+="vboxusb/$env{BUSNUM}/$env{DEVNUM}"
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- VirtualBox-OSE.spec 4 Apr 2011 06:59:28 -0000 1.69
+++ VirtualBox-OSE.spec 27 Nov 2011 22:03:30 -0000 1.70
@@ -14,7 +14,7 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox-OSE
-Version: 4.0.4
+Version: 4.1.2
Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
@@ -28,26 +28,26 @@
Source7: VirtualBox-OSE-guest.modules
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE-00-vboxvideo.conf
-Patch1: VirtualBox-OSE-3.2.0-noupdate.patch
+Source10: vboxweb-service
+Patch1: VirtualBox-OSE-4.1.2-noupdate.patch
Patch2: VirtualBox-OSE-4.0.2-strings.patch
-Patch3: VirtualBox-OSE-4.0.2-libcxx.patch
+Patch3: VirtualBox-OSE-4.1.2-libcxx.patch
Patch5: VirtualBox-OSE-4.0.2-xorg17.patch
Patch9: VirtualBox-OSE-3.2.4-optflags.patch
Patch10: VirtualBox-OSE-4.0.0-32bit.patch
Patch11: VirtualBox-OSE-3.2.0-visibility.patch
Patch12: VirtualBox-OSE-3.2.10-noansi.patch
-Patch14: VirtualBox-OSE-3.2.6-vboxkeyboard.patch
Patch15: VirtualBox-OSE-4.0.0-makeself.patch
-Patch16: VirtualBox-OSE-4.0.0-usblib.patch
+Patch16: VirtualBox-OSE-4.1.2-usblib.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
-Patch19: VirtualBox-OSE-4.0.2-gcc46.patch
+Patch19: VirtualBox-OSE-4.1.2-vboxpci.patch
+Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: kBuild >= 0.1.5-1
+BuildRequires: kBuild >= 0.1.98
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
@@ -84,6 +84,9 @@
ExclusiveArch: i386 x86_64
%endif
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
+
Requires: %{name}-kmod = %{version}%{?prereltag}
Provides: %{name}-kmod-common = %{version}%{?prereltag}
Conflicts: %{name}-guest <= %{version}-%{release}
@@ -124,9 +127,9 @@
Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
Conflicts: %{name} <= %{version}-%{release}
%if "%(xserver-sdk-abi-requires 2>/dev/null)"
-Requires: %(xserver-sdk-abi-requires ansic)
-Requires: %(xserver-sdk-abi-requires videodrv)
-Requires: %(xserver-sdk-abi-requires xinput)
+Requires: %(xserver-sdk-abi-requires ansic)
+Requires: %(xserver-sdk-abi-requires videodrv)
+Requires: %(xserver-sdk-abi-requires xinput)
%endif
@@ -157,12 +160,12 @@
%patch10 -p1 -b .32bit
%patch11 -p1 -b .visibility
%patch12 -p1 -b .noansi
-%patch14 -p1 -b .vboxkeyboard
%patch15 -p1 -b .makeself
%patch16 -p1 -b .usblib
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
-%patch19 -p1 -b .gcc46
+%patch19 -p1 -b .vboxpci
+%patch20 -p1 -b .testmangle
# Remove prebuilt binary tools
rm -rf kBuild
@@ -181,16 +184,14 @@
# 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 %{_smp_mflags} \
- KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_INS="$PWD/obj" \
+ KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \
VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
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}" VBOX_GCC_WERR="" \
- VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
- VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java
+ VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+ VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java
%install
@@ -206,9 +207,12 @@
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls
+install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/ExtensionPacks
install -d $RPM_BUILD_ROOT%{_libdir}/dri
-install -d $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk
+install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
+install -d $RPM_BUILD_ROOT%{_datadir}/icons
install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-kmod-%{version}
install -d $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
@@ -216,12 +220,14 @@
install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
+ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
+ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
+ln -sf VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/VBoxTunctl \
- obj/bin/VBoxBFE
# Components
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
@@ -242,7 +248,6 @@
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
- obj/bin/EfiThunk \
obj/bin/VBoxHeadless \
obj/bin/VBoxSDL \
obj/bin/VBoxNetDHCP \
@@ -255,22 +260,43 @@
obj/bin/vboxshell.py \
obj/bin/VBoxTestOGL \
obj/bin/vboxwebsrv \
- obj/bin/webtest
+ obj/bin/VBoxBalloonCtrl \
+ obj/bin/webtest \
+ obj/bin/VBoxBFE
+
+# Lowercase aliases
+for F in VBoxBalloonCtrl VBoxHeadless VBoxManage VBoxSDL VirtualBox VBoxBFE
+do
+ ln $RPM_BUILD_ROOT%{_bindir}/$F \
+ $RPM_BUILD_ROOT%{_bindir}/$(echo $F |awk '{print tolower($0)}')
+done
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/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
-ln -sf ../../../../../../..%{python_sitelib}/virtualbox/xpcom \
- $RPM_BUILD_ROOT%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
+pushd obj/bin/sdk/installer
+VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
+ python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
+popd
+cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
+rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer
-# Icon
+# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
+ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
+for S in obj/bin/icons/*
+do
+ SIZE=$(basename $S)
+ install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
+ install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
+ [ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
+done
+install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
# Guest X.Org drivers
# With the xorg17 patch, the _17 driver builds against what's
@@ -342,55 +368,42 @@
--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
--vendor='' obj/bin/virtualbox.desktop
-%check
-exit 0
-
-# Dear contributor,
-#
-# If you forget a file when updating to a later version, it's
-# not you fault; as you can see, install section is far from
-# ideal. This section is meant to make it easier for you to spot
-# files you've forgotten to include. Feel free to blacklist
-# uninteresting files here.
-#
-# Not sure if a file is "uninteresting"? See if closed version
-# contains it? No? Remove it. Application doesn't run without
-# it? Bring it back.
-
-set +o posix
-diff -u <((find obj/bin/additions/* -maxdepth 0 -type f \
- -not -name 'autorun.sh' \
- -not -name '*_drv*' \
- -not -name 'pam_vbox.so' \
- -exec basename '{}' \;
- find obj/bin/* -maxdepth 0 -type f \
- -not -name 'tst*' \
- -not -name 'SUP*' \
- -not -name 'VBox.sh' \
- -not -name 'xpidl' \
- -not -name 'scm' \
- -not -name 'vboxkeyboard.tar.*' \
- -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 'UserManual.pdf' \
- -not -name VBox -exec basename '{}' \; |sort)
-set -o posix
-
%clean
rm -rf $RPM_BUILD_ROOT
-%pre devel
-# This changed to a symlink from directory, which would cause
-# the new package's CPIO payload to fail to unpack unless removed
-PYXP=%{_datadir}/virtualbox/sdk/bindings/xpcom/python/xpcom
-[ -d "$PYXP" ] && rm -rf "$PYXP"
+%post
+# Group for USB devices
+getent group vboxusers >/dev/null || groupadd -r vboxusers
+
+# Desktop databases
+/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+/usr/bin/update-desktop-database &>/dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
+
+# Web service
+/sbin/chkconfig --add vboxweb-service >/dev/null 2>&1 || :
+
+# Assign USB devices
+if /sbin/udevadm control --reload-rules >/dev/null 2>&1
+then
+ /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
+ /sbin/udevadm settle >/dev/null 2>&1 || :
+fi
+
+
+%preun
+[ $1 = 0 ] && /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+
+
+%postun
+/usr/bin/update-desktop-database &>/dev/null || :
+/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
+
+
+%posttrans
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# Guest additions install the OGL libraries
@@ -401,12 +414,20 @@
%files
%defattr(-,root,root,-)
%{_bindir}/VBox
+%{_bindir}/vboxballoonctrl
+%{_bindir}/VBoxBalloonCtrl
+%{_bindir}/vboxbfe
%{_bindir}/VBoxBFE
+%{_bindir}/vboxheadless
%{_bindir}/VBoxHeadless
+%{_bindir}/vboxmanage
%{_bindir}/VBoxManage
+%{_bindir}/vboxsdl
%{_bindir}/VBoxSDL
%{_bindir}/VBoxTunctl
+%{_bindir}/virtualbox
%{_bindir}/VirtualBox
+%{_bindir}/vboxwebsrv
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
%{_libdir}/virtualbox/*.[^p]*
@@ -417,15 +438,18 @@
%{_libdir}/virtualbox/VBoxSVC
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
+%{_libdir}/virtualbox/VBoxBalloonCtrl
%{_libdir}/virtualbox/vboxwebsrv
%{_libdir}/virtualbox/webtest
-%{_libdir}/virtualbox/EfiThunk
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
+%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
%attr(4755,root,root) %{_libdir}/virtualbox/VirtualBox
%{_datadir}/pixmaps/*
+%{_datadir}/icons/*
+%{_datadir}/mime/*
%{_datadir}/applications/*.desktop
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
@@ -436,12 +460,13 @@
%files devel
%defattr(0644,root,root,0755)
-%{_datadir}/virtualbox
+%{_libdir}/virtualbox/sdk
%files -n python-%{name}
%defattr(0644,root,root,0755)
%{python_sitelib}/virtualbox
+%{python_sitelib}/vboxapi*
%files guest
@@ -470,6 +495,15 @@
%changelog
+* Sun Nov 27 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.2-1
+- fix bug #1877, the fix is update VirtualBox-OSE to 4.1.x
+- small fix for bug #1979.
+- from 4.1.2.f16 Lubomir Rintel <lkundrak(a)v3.sk>
+ - New release Lubomir
+ - Assign USB devices to vboxusers
+ - Add a web service
+ - Install MIME types for disk images
+
* Sun Apr 03 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.4-1
- New release
- Add requires for particular server ABIs
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources 4 Apr 2011 06:59:28 -0000 1.28
+++ sources 27 Nov 2011 22:03:30 -0000 1.29
@@ -1 +1 @@
-b4770ca14d1a8cbad9b3eb0e0028ff4b VirtualBox-4.0.4.tar.bz2
+945d2c94c15a4f47280be4b01b67e244 VirtualBox-4.1.2.tar.bz2
--- VirtualBox-OSE-3.2.0-noupdate.patch DELETED ---
--- VirtualBox-OSE-3.2.6-vboxkeyboard.patch DELETED ---
--- VirtualBox-OSE-4.0.0-usblib.patch DELETED ---
--- VirtualBox-OSE-4.0.2-gcc46.patch DELETED ---
--- VirtualBox-OSE-4.0.2-libcxx.patch DELETED ---
13 years
rpms/minitube/F-15 minitube.spec,1.13,1.14
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9717
Modified Files:
minitube.spec
Log Message:
* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-3
- clean spec file
- make translations work
- special thanks to killefiz @ #fedora-kde
- remove uneccesary patches
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-15/minitube.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- minitube.spec 29 Oct 2011 16:22:28 -0000 1.13
+++ minitube.spec 27 Nov 2011 19:37:45 -0000 1.14
@@ -1,6 +1,6 @@
Name: minitube
Version: 1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -34,7 +34,6 @@
Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-Patch1: minitube-1.4.1-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -43,6 +42,7 @@
BuildRequires: desktop-file-utils
BuildRequires: phonon-devel
BuildRequires: qtsingleapplication-devel
+BuildRequires: gettext
Requires: hicolor-icon-theme
# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
@@ -71,12 +71,13 @@
%patch0 -p 1
-%patch1 -p1 -b .orig
-
%build
+
%{_qt4_qmake} PREFIX=%{_prefix}
make %{?_smp_mflags}
+
+
%install
rm -rf %{buildroot}
make install INSTALL_ROOT=%{buildroot}
@@ -86,7 +87,13 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name} --all-name --with-qt
+# There is a bug in find-lang.sh (see BZ #729336)
+# heavily borrowed from /usr/lib/rpm/find-lang.sh
+find %{buildroot} -type f -o -type l|sort|sed '
+s:'"%{buildroot}"'::
+s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
+s:^\([^%].*\)::
+/^$/d' > %{name}.lang
%clean
rm -rf %{buildroot}
@@ -108,19 +115,17 @@
%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO INSTALL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/locale
+
%changelog
+* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-3
+- clean spec file
+- make translations work
+- special thanks to killefiz @ #fedora-kde
+- remove uneccesary patches
+
* Sat Oct 29 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-2
- fixed source url
13 years
rpms/minitube/F-16 minitube.spec,1.12,1.13
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9511
Modified Files:
minitube.spec
Log Message:
* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-3
- clean spec file
- make translations work
- special thanks to killefiz @ #fedora-kde
- remove uneccesary patches
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/F-16/minitube.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- minitube.spec 29 Oct 2011 15:48:36 -0000 1.12
+++ minitube.spec 27 Nov 2011 19:35:56 -0000 1.13
@@ -1,6 +1,6 @@
Name: minitube
Version: 1.6
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -31,10 +31,9 @@
License: GPLv3 and GPLv3+
URL: http://flavio.tordini.org/minitube
-Source0: http://flavio.tordini.org/files/%{name}/%{name}-%{version}.tar.gz
+Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-Patch1: minitube-1.4.1-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -43,6 +42,7 @@
BuildRequires: desktop-file-utils
BuildRequires: phonon-devel
BuildRequires: qtsingleapplication-devel
+BuildRequires: gettext
Requires: hicolor-icon-theme
# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
@@ -71,12 +71,13 @@
%patch0 -p 1
-%patch1 -p1 -b .orig
-
%build
+
%{_qt4_qmake} PREFIX=%{_prefix}
make %{?_smp_mflags}
+
+
%install
rm -rf %{buildroot}
make install INSTALL_ROOT=%{buildroot}
@@ -86,7 +87,13 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name} --all-name --with-qt
+# There is a bug in find-lang.sh (see BZ #729336)
+# heavily borrowed from /usr/lib/rpm/find-lang.sh
+find %{buildroot} -type f -o -type l|sort|sed '
+s:'"%{buildroot}"'::
+s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
+s:^\([^%].*\)::
+/^$/d' > %{name}.lang
%clean
rm -rf %{buildroot}
@@ -108,19 +115,20 @@
%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO INSTALL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/locale
+
%changelog
+* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-3
+- clean spec file
+- make translations work
+- special thanks to killefiz @ #fedora-kde
+- remove uneccesary patches
+
+* Sat Oct 29 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-2
+- fixed source url
+
* Sat Oct 29 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-1
- 1.6
13 years
rpms/minitube/devel minitube.spec,1.13,1.14
by Magnus Tuominen
Author: magnu5
Update of /cvs/free/rpms/minitube/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8845
Modified Files:
minitube.spec
Log Message:
* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-3
- clean spec file
- make translations work
- special thanks to killefiz @ #fedora-kde
- remove uneccesary patches
Index: minitube.spec
===================================================================
RCS file: /cvs/free/rpms/minitube/devel/minitube.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- minitube.spec 29 Oct 2011 16:01:27 -0000 1.13
+++ minitube.spec 27 Nov 2011 19:33:34 -0000 1.14
@@ -1,6 +1,6 @@
Name: minitube
Version: 1.6
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: A YouTube desktop client
Group: Applications/Multimedia
@@ -34,7 +34,6 @@
Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz
# fixes requirement on bundled qtsingleapplication
Patch0: minitube-qtsingleapp.patch
-Patch1: minitube-1.4.1-lang.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%{?_qt4_version:Requires: qt4 >= %{_qt4_version}}
@@ -43,6 +42,7 @@
BuildRequires: desktop-file-utils
BuildRequires: phonon-devel
BuildRequires: qtsingleapplication-devel
+BuildRequires: gettext
Requires: hicolor-icon-theme
# KDE 4.6.1 in fedora 15 defaults to phonon-backend-gstreamer
@@ -71,12 +71,13 @@
%patch0 -p 1
-%patch1 -p1 -b .orig
-
%build
+
%{_qt4_qmake} PREFIX=%{_prefix}
make %{?_smp_mflags}
+
+
%install
rm -rf %{buildroot}
make install INSTALL_ROOT=%{buildroot}
@@ -86,7 +87,13 @@
--delete-original \
%{buildroot}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name} --all-name --with-qt
+# There is a bug in find-lang.sh (see BZ #729336)
+# heavily borrowed from /usr/lib/rpm/find-lang.sh
+find %{buildroot} -type f -o -type l|sort|sed '
+s:'"%{buildroot}"'::
+s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3:
+s:^\([^%].*\)::
+/^$/d' > %{name}.lang
%clean
rm -rf %{buildroot}
@@ -108,19 +115,17 @@
%doc AUTHORS COPYING LICENSE.LGPL CHANGES TODO INSTALL
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/512x512/apps/%{name}.png
-%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
-%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
-%{_datadir}/icons/hicolor/64x64/apps/%{name}.png
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
-%{_datadir}/icons/hicolor/22x22/apps/%{name}.png
-%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
+%{_datadir}/icons/hicolor/*/apps/%{name}.png
%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
-%dir %{_datadir}/%{name}
-%dir %{_datadir}/%{name}/locale
+
%changelog
+* Sun Nov 27 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-3
+- clean spec file
+- make translations work
+- special thanks to killefiz @ #fedora-kde
+- remove uneccesary patches
+
* Sat Oct 29 2011 Magnus Tuominen <magnus.tuominen(a)gmail.com> - 1.6-2
- fixed source url
13 years
rpms/mame/F-15 .cvsignore, 1.41, 1.42 mame.spec, 1.49, 1.50 sources, 1.41, 1.42
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25436
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Sun Nov 27 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u1-1
- Updated to 0.144u1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 15 Nov 2011 00:28:11 -0000 1.41
+++ .cvsignore 27 Nov 2011 17:43:47 -0000 1.42
@@ -1 +1,2 @@
mame0144s.exe
+0144u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/mame.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mame.spec 15 Nov 2011 00:28:11 -0000 1.49
+++ mame.spec 27 Nov 2011 17:43:47 -0000 1.50
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 144
-#global sourceupdate 9
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +23,7 @@
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -257,6 +257,9 @@
%changelog
+* Sun Nov 27 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u1-1
+- Updated to 0.144u1
+
* Tue Nov 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144-1
- Updated to 0.144
- Fixed whatsnew.txt encoding (cp1252 → utf-8)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 15 Nov 2011 00:28:11 -0000 1.41
+++ sources 27 Nov 2011 17:43:47 -0000 1.42
@@ -1 +1,2 @@
2b47706f55d3263f8a7ab1a480ad1dcb mame0144s.exe
+f01001d40417f8f0d3963dae01b04200 0144u1_diff.zip
13 years
rpms/mame/F-16 .cvsignore, 1.41, 1.42 mame.spec, 1.49, 1.50 sources, 1.41, 1.42
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25322
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Sun Nov 27 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u1-1
- Updated to 0.144u1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 15 Nov 2011 00:27:55 -0000 1.41
+++ .cvsignore 27 Nov 2011 17:43:33 -0000 1.42
@@ -1 +1,2 @@
mame0144s.exe
+0144u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/mame.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mame.spec 15 Nov 2011 00:27:55 -0000 1.49
+++ mame.spec 27 Nov 2011 17:43:33 -0000 1.50
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 144
-#global sourceupdate 9
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +23,7 @@
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -257,6 +257,9 @@
%changelog
+* Sun Nov 27 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u1-1
+- Updated to 0.144u1
+
* Tue Nov 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144-1
- Updated to 0.144
- Fixed whatsnew.txt encoding (cp1252 → utf-8)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-16/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 15 Nov 2011 00:27:55 -0000 1.41
+++ sources 27 Nov 2011 17:43:33 -0000 1.42
@@ -1 +1,2 @@
2b47706f55d3263f8a7ab1a480ad1dcb mame0144s.exe
+f01001d40417f8f0d3963dae01b04200 0144u1_diff.zip
13 years
rpms/mame/devel .cvsignore, 1.41, 1.42 mame.spec, 1.49, 1.50 sources, 1.41, 1.42
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25204
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Sun Nov 27 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u1-1
- Updated to 0.144u1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 15 Nov 2011 00:27:53 -0000 1.41
+++ .cvsignore 27 Nov 2011 17:43:16 -0000 1.42
@@ -1 +1,2 @@
mame0144s.exe
+0144u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- mame.spec 15 Nov 2011 00:27:53 -0000 1.49
+++ mame.spec 27 Nov 2011 17:43:16 -0000 1.50
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 144
-#global sourceupdate 9
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +23,7 @@
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -257,6 +257,9 @@
%changelog
+* Sun Nov 27 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144u1-1
+- Updated to 0.144u1
+
* Tue Nov 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.144-1
- Updated to 0.144
- Fixed whatsnew.txt encoding (cp1252 → utf-8)
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 15 Nov 2011 00:27:53 -0000 1.41
+++ sources 27 Nov 2011 17:43:16 -0000 1.42
@@ -1 +1,2 @@
2b47706f55d3263f8a7ab1a480ad1dcb mame0144s.exe
+f01001d40417f8f0d3963dae01b04200 0144u1_diff.zip
13 years
rpms/devede/F-15 .cvsignore, 1.19, 1.20 devede.spec, 1.25, 1.26 sources, 1.19, 1.20 devede-3.18.0-it.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5093
Modified Files:
.cvsignore devede.spec sources
Removed Files:
devede-3.18.0-it.patch
Log Message:
* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
- Updated to version 3.19.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/F-15/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 26 Nov 2011 15:41:47 -0000 1.19
+++ .cvsignore 27 Nov 2011 14:39:53 -0000 1.20
@@ -1 +1 @@
-devede-3.18.0.tar.bz2
+devede-3.19.0.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/F-15/devede.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- devede.spec 26 Nov 2011 15:41:47 -0000 1.25
+++ devede.spec 27 Nov 2011 14:39:53 -0000 1.26
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.18.0
+Version: 3.19.0
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -9,8 +9,6 @@
Source0: http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
# Enable AC3_fix by default
Patch0: %{name}-3.18.0-ac3.patch
-# Fix a format error in the Italian translation
-Patch1: %{name}-3.18.0-it.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,10 +41,6 @@
%prep
%setup -q -n %{name}
%patch0 -p1
-%patch1 -p1
-pushd po
-./update_mo_files
-popd
# Fix module directory
sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
@@ -121,6 +115,9 @@
%changelog
+* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
+- Updated to version 3.19.0
+
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.18.0-1
- Updated to version 3.18.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/F-15/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 26 Nov 2011 15:41:48 -0000 1.19
+++ sources 27 Nov 2011 14:39:53 -0000 1.20
@@ -1 +1 @@
-e4887ddccc4e9468d1ba1c951caf3201 devede-3.18.0.tar.bz2
+bdcf76180ca3babd108debe7f9032d0e devede-3.19.0.tar.bz2
--- devede-3.18.0-it.patch DELETED ---
13 years
rpms/devede/F-16 .cvsignore, 1.19, 1.20 devede.spec, 1.25, 1.26 sources, 1.19, 1.20 devede-3.18.0-it.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4934
Modified Files:
.cvsignore devede.spec sources
Removed Files:
devede-3.18.0-it.patch
Log Message:
* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
- Updated to version 3.19.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/F-16/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 26 Nov 2011 15:41:06 -0000 1.19
+++ .cvsignore 27 Nov 2011 14:39:23 -0000 1.20
@@ -1 +1 @@
-devede-3.18.0.tar.bz2
+devede-3.19.0.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/F-16/devede.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- devede.spec 26 Nov 2011 15:41:06 -0000 1.25
+++ devede.spec 27 Nov 2011 14:39:24 -0000 1.26
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.18.0
+Version: 3.19.0
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -9,8 +9,6 @@
Source0: http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
# Enable AC3_fix by default
Patch0: %{name}-3.18.0-ac3.patch
-# Fix a format error in the Italian translation
-Patch1: %{name}-3.18.0-it.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,10 +41,6 @@
%prep
%setup -q -n %{name}
%patch0 -p1
-%patch1 -p1
-pushd po
-./update_mo_files
-popd
# Fix module directory
sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
@@ -121,6 +115,9 @@
%changelog
+* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
+- Updated to version 3.19.0
+
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.18.0-1
- Updated to version 3.18.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/F-16/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 26 Nov 2011 15:41:06 -0000 1.19
+++ sources 27 Nov 2011 14:39:24 -0000 1.20
@@ -1 +1 @@
-e4887ddccc4e9468d1ba1c951caf3201 devede-3.18.0.tar.bz2
+bdcf76180ca3babd108debe7f9032d0e devede-3.19.0.tar.bz2
--- devede-3.18.0-it.patch DELETED ---
13 years
rpms/devede/devel .cvsignore, 1.19, 1.20 devede.spec, 1.25, 1.26 sources, 1.19, 1.20 devede-3.18.0-it.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4762
Modified Files:
.cvsignore devede.spec sources
Removed Files:
devede-3.18.0-it.patch
Log Message:
* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
- Updated to version 3.19.0
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/devel/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore 26 Nov 2011 15:37:59 -0000 1.19
+++ .cvsignore 27 Nov 2011 14:38:46 -0000 1.20
@@ -1 +1 @@
-devede-3.18.0.tar.bz2
+devede-3.19.0.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/devel/devede.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- devede.spec 26 Nov 2011 15:38:00 -0000 1.25
+++ devede.spec 27 Nov 2011 14:38:46 -0000 1.26
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.18.0
+Version: 3.19.0
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -9,8 +9,6 @@
Source0: http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
# Enable AC3_fix by default
Patch0: %{name}-3.18.0-ac3.patch
-# Fix a format error in the Italian translation
-Patch1: %{name}-3.18.0-it.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -43,10 +41,6 @@
%prep
%setup -q -n %{name}
%patch0 -p1
-%patch1 -p1
-pushd po
-./update_mo_files
-popd
# Fix module directory
sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
@@ -121,6 +115,9 @@
%changelog
+* Sun Nov 27 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.19.0-1
+- Updated to version 3.19.0
+
* Sat Nov 26 2011 Andrea Musuruane <musuruan(a)gmail.com> 3.18.0-1
- Updated to version 3.18.0
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 26 Nov 2011 15:38:00 -0000 1.19
+++ sources 27 Nov 2011 14:38:46 -0000 1.20
@@ -1 +1 @@
-e4887ddccc4e9468d1ba1c951caf3201 devede-3.18.0.tar.bz2
+bdcf76180ca3babd108debe7f9032d0e devede-3.19.0.tar.bz2
--- devede-3.18.0-it.patch DELETED ---
13 years