rpms/cairo-dock/F-20 cairo-dock-plugins-3.4.0-vala-append-soname.patch, NONE, 1.1 cairo-dock.spec, 1.76, 1.77
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1750
Modified Files:
cairo-dock.spec
Added Files:
cairo-dock-plugins-3.4.0-vala-append-soname.patch
Log Message:
* Mon Dec 29 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-7
- Build unstable plug-ins (except for KDE experimental)
(not installed by default option)
cairo-dock-plugins-3.4.0-vala-append-soname.patch:
CMakeLists.txt | 2 ++
Dbus/interfaces/vala/src/CMakeLists.txt | 10 ++++++++++
2 files changed, 12 insertions(+)
--- NEW FILE cairo-dock-plugins-3.4.0-vala-append-soname.patch ---
>From 2326408fb3ea63b78f0b0b5b13dcfa2070018e10 Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matttbe(a)gmail.com>
Date: Mon, 29 Dec 2014 01:39:23 +0100
Subject: [PATCH] DBus: Vala: added soversion
A version is needed for Vala interface's soname to track ABI changes
---
CMakeLists.txt | 2 ++
Dbus/interfaces/vala/src/CMakeLists.txt | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdd83a5..82e81c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -596,6 +596,8 @@ if (enable-vala-interface)
set (with_valac no)
find_program (VALAC_EXE valac)
message (STATUS " Path to valac: ${VALAC_EXE}")
+ set (VERSION_VALA "1.0.0")
+ message (STATUS " Cairo-Dock Vala interface's ABI version: ${VERSION_VALA}")
enable_if_not_defined (enable-vala-support)
if (NOT enable-vala-support)
diff --git a/Dbus/interfaces/vala/src/CMakeLists.txt b/Dbus/interfaces/vala/src/CMakeLists.txt
index d2dc97e..5b86d61 100644
--- a/Dbus/interfaces/vala/src/CMakeLists.txt
+++ b/Dbus/interfaces/vala/src/CMakeLists.txt
@@ -7,6 +7,16 @@ endif()
# now, compile it as any normal C lib.
add_library (${CDAPPLET} SHARED ${VALA_SRC_DIR}/${CDAPPLET}.c)
+STRING (REGEX REPLACE "\\..*" "" SOVERSION_VALA "${VERSION_VALA}")
+set_target_properties (${CDAPPLET} PROPERTIES
+ # create *nix style library versions + symbolic links
+ VERSION ${VERSION_VALA}
+ SOVERSION ${SOVERSION_VALA}
+ # allow creating static and shared libs without conflicts
+ #CLEAN_DIRECT_OUTPUT 1
+ # avoid conflicts between library and binary target names
+ #OUTPUT_NAME ${PROJECT_NAME}
+)
add_definitions (-fPIC -Wno-all)
pkg_check_modules ("CDAPPLET_DEPS" "gobject-2.0" "gio-2.0")
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-20/cairo-dock.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- cairo-dock.spec 19 Dec 2014 15:08:23 -0000 1.76
+++ cairo-dock.spec 29 Dec 2014 08:16:00 -0000 1.77
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 5
+%global fedora_main_rel 7
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -44,9 +44,8 @@
%global build_ruby 1
%global ruby_vendorlib %(ruby -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
-# FIXME
-# I don't know well about vala !!
-%global build_vala 0
+%global build_vala 1
+%global build_unstable 1
# For debugging
%global skip_main_build 0
@@ -66,9 +65,14 @@
Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}%{?betaver:-...
%endif
# Specify gem name to surely use ruby-dbus
+# Applied as 006353cc067e789e50d85790fbdb6c25e1398a63
Patch0: cairo-dock-plugins-3.4.0-ruby-specify-gemname.patch
# Ruby initialization fix
+# Applied as b71aff98db0fe9d4a22ed1fb9c457da0c3023846
Patch1: cairo-dock-plugins-3.4.0-ruby-initialization.patch
+# Append soname for Vala interface
+# Upstream: 2326408fb3ea63b78f0b0b5b13dcfa2070018e10
+Patch2: cairo-dock-plugins-3.4.0-vala-append-soname.patch
BuildRequires: cmake
@@ -220,6 +224,17 @@
This package contains plug-ins files for %{name} related
to webkit.
+%package plug-ins-unstable
+Summary: Unstable plug-ins not installed by default
+Version: %{rpmver_p}
+Release: %{rpmrel}
+Group: User Interface/Desktops
+Requires: %{name}-core%{?_isa} = %{rpmver_c}-%{rpmrel}
+
+%description plug-ins-unstable
+This package contains unstable and experimental
+plug-ins not installed by default.
+
%package python
Summary: Python binding for %{name}
Version: %{rpmver_p}
@@ -268,6 +283,17 @@
%description vala
This package contains Vala binding files for %{name}
+%package vala-devel
+Summary: Development files for Vala binding for %{name}
+Version: %{rpmver_p}
+Release: %{rpmrel}
+Group: Development/Libraries
+Requires: %{name}-vala%{?_isa} = %{rpmver_p}-%{rpmrel}
+
+%description vala-devel
+This package contains development files for Vala
+binding for %{name}.
+
%package devel
Summary: Development files for %{name}
Version: %{rpmver_c}
@@ -328,6 +354,7 @@
# Patch
%patch0 -p1 -b .gem
%patch1 -p1 -b .rubyinit
+%patch2 -p1 -b .valasoname
## permission
for dir in */
@@ -357,11 +384,6 @@
-e '\@set.*RUBY_LIB_DIR.*CMAKE_INSTALL_PREFIX.*RUBY_LIB_DIR_INSTALL(a)d' \
CMakeLists.txt
# Python
-# Vala
-## FIXME
-sed -i.vala \
- -e '/with_vala /s|yes|no|' \
- CMakeLists.txt
popd # from opt/cairo-dock/trunk/cairo-dock
@@ -433,6 +455,13 @@
rm -f CMakeCache.txt
%cmake \
+%if 0%{?build_unstable} >= 1
+ -Denable-disks=TRUE \
+ -Denable-doncky=TRUE \
+ -Denable-global-menu=TRUE \
+ -Denable-network-monitor=TRUE \
+ -Denable-scooby-do=TRUE \
+%endif
.
## Parallel make fails some times, but it is gerenally fast
@@ -543,6 +572,10 @@
%post core -p /sbin/ldconfig
%postun core -p /sbin/ldconfig
+%if %{build_vala} >= 0
+%post vala -p /sbin/ldconfig
+%postun vala -p /sbin/ldconfig
+%endif
%files
@@ -595,6 +628,35 @@
%endif
%exclude %{_libdir}/%{name}/*kde*
%exclude %{_datadir}/%{name}/plug-ins/*kde*
+%if 0%{?build_unstable} >= 1
+%exclude %{_libdir}/%{name}/appmenu-registrar
+%exclude %{_libdir}/%{name}/libcd-Global-Menu.so
+%exclude %{_libdir}/%{name}/libcd-disks.so
+%exclude %{_libdir}/%{name}/libcd-doncky.so
+%exclude %{_libdir}/%{name}/libcd-network-monitor.so
+%exclude %{_libdir}/%{name}/libcd-scooby-do.so
+%exclude %{_datadir}/%{name}/plug-ins/Disks/
+%exclude %{_datadir}/%{name}/plug-ins/Doncky/
+%exclude %{_datadir}/%{name}/plug-ins/Global-Menu/
+%exclude %{_datadir}/%{name}/plug-ins/Network-Monitor/
+%exclude %{_datadir}/%{name}/plug-ins/Scooby-Do/
+%endif
+
+%if 0%{?build_unstable} >= 1
+%files plug-ins-unstable
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/appmenu-registrar
+%{_libdir}/%{name}/libcd-Global-Menu.so
+%{_libdir}/%{name}/libcd-disks.so
+%{_libdir}/%{name}/libcd-doncky.so
+%{_libdir}/%{name}/libcd-network-monitor.so
+%{_libdir}/%{name}/libcd-scooby-do.so
+%{_datadir}/%{name}/plug-ins/Disks/
+%{_datadir}/%{name}/plug-ins/Doncky/
+%{_datadir}/%{name}/plug-ins/Global-Menu/
+%{_datadir}/%{name}/plug-ins/Network-Monitor/
+%{_datadir}/%{name}/plug-ins/Scooby-Do/
+%endif
%if %{build_xfce} > 0
%files plug-ins-xfce
@@ -640,13 +702,31 @@
%{ruby_vendorlib}/CDApplet.rb
%endif
+%if %{build_vala} > 0
+%files vala
+%{_libdir}/libCDApplet.so.1*
+%{_datadir}/vala/vapi/CDApplet.*
+
+%files vala-devel
+%{_libdir}/libCDApplet.so
+%{_libdir}/pkgconfig/CDApplet.pc
+%endif
+
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/libgldi.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/gldi.pc
%changelog
+* Mon Dec 29 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-7
+- Build unstable plug-ins (except for KDE experimental)
+ (not installed by default option)
+
+* Mon Dec 29 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-6
+- Enable vala interface
+
* Sat Dec 20 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-5
- Make plug-ins depending on python(2), due to cairo-dock-launcher-API-daemon
dependency (bug 3470)
9 years, 3 months
rpms/cairo-dock/devel cairo-dock.spec,1.81,1.82
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1565
Modified Files:
cairo-dock.spec
Log Message:
* Mon Dec 29 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-7
- Build unstable plug-ins (except for KDE experimental)
(not installed by default option)
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -r1.81 -r1.82
--- cairo-dock.spec 29 Dec 2014 06:34:15 -0000 1.81
+++ cairo-dock.spec 29 Dec 2014 08:12:48 -0000 1.82
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 6
+%global fedora_main_rel 7
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -45,6 +45,7 @@
%global build_ruby 1
%global ruby_vendorlib %(ruby -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
%global build_vala 1
+%global build_unstable 1
# For debugging
%global skip_main_build 0
@@ -223,6 +224,17 @@
This package contains plug-ins files for %{name} related
to webkit.
+%package plug-ins-unstable
+Summary: Unstable plug-ins not installed by default
+Version: %{rpmver_p}
+Release: %{rpmrel}
+Group: User Interface/Desktops
+Requires: %{name}-core%{?_isa} = %{rpmver_c}-%{rpmrel}
+
+%description plug-ins-unstable
+This package contains unstable and experimental
+plug-ins not installed by default.
+
%package python
Summary: Python binding for %{name}
Version: %{rpmver_p}
@@ -443,6 +455,13 @@
rm -f CMakeCache.txt
%cmake \
+%if 0%{?build_unstable} >= 1
+ -Denable-disks=TRUE \
+ -Denable-doncky=TRUE \
+ -Denable-global-menu=TRUE \
+ -Denable-network-monitor=TRUE \
+ -Denable-scooby-do=TRUE \
+%endif
.
## Parallel make fails some times, but it is gerenally fast
@@ -609,6 +628,35 @@
%endif
%exclude %{_libdir}/%{name}/*kde*
%exclude %{_datadir}/%{name}/plug-ins/*kde*
+%if 0%{?build_unstable} >= 1
+%exclude %{_libdir}/%{name}/appmenu-registrar
+%exclude %{_libdir}/%{name}/libcd-Global-Menu.so
+%exclude %{_libdir}/%{name}/libcd-disks.so
+%exclude %{_libdir}/%{name}/libcd-doncky.so
+%exclude %{_libdir}/%{name}/libcd-network-monitor.so
+%exclude %{_libdir}/%{name}/libcd-scooby-do.so
+%exclude %{_datadir}/%{name}/plug-ins/Disks/
+%exclude %{_datadir}/%{name}/plug-ins/Doncky/
+%exclude %{_datadir}/%{name}/plug-ins/Global-Menu/
+%exclude %{_datadir}/%{name}/plug-ins/Network-Monitor/
+%exclude %{_datadir}/%{name}/plug-ins/Scooby-Do/
+%endif
+
+%if 0%{?build_unstable} >= 1
+%files plug-ins-unstable
+%defattr(-,root,root,-)
+%{_libdir}/%{name}/appmenu-registrar
+%{_libdir}/%{name}/libcd-Global-Menu.so
+%{_libdir}/%{name}/libcd-disks.so
+%{_libdir}/%{name}/libcd-doncky.so
+%{_libdir}/%{name}/libcd-network-monitor.so
+%{_libdir}/%{name}/libcd-scooby-do.so
+%{_datadir}/%{name}/plug-ins/Disks/
+%{_datadir}/%{name}/plug-ins/Doncky/
+%{_datadir}/%{name}/plug-ins/Global-Menu/
+%{_datadir}/%{name}/plug-ins/Network-Monitor/
+%{_datadir}/%{name}/plug-ins/Scooby-Do/
+%endif
%if %{build_xfce} > 0
%files plug-ins-xfce
@@ -672,6 +720,10 @@
%{_libdir}/pkgconfig/gldi.pc
%changelog
+* Mon Dec 29 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-7
+- Build unstable plug-ins (except for KDE experimental)
+ (not installed by default option)
+
* Mon Dec 29 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-6
- Enable vala interface
9 years, 3 months
rpms/cairo-dock/devel cairo-dock-plugins-3.4.0-vala-append-soname.patch, NONE, 1.1 cairo-dock.spec, 1.80, 1.81
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv730
Modified Files:
cairo-dock.spec
Added Files:
cairo-dock-plugins-3.4.0-vala-append-soname.patch
Log Message:
* Mon Dec 29 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-6
- Enable vala interface
cairo-dock-plugins-3.4.0-vala-append-soname.patch:
CMakeLists.txt | 2 ++
Dbus/interfaces/vala/src/CMakeLists.txt | 10 ++++++++++
2 files changed, 12 insertions(+)
--- NEW FILE cairo-dock-plugins-3.4.0-vala-append-soname.patch ---
>From 2326408fb3ea63b78f0b0b5b13dcfa2070018e10 Mon Sep 17 00:00:00 2001
From: Matthieu Baerts <matttbe(a)gmail.com>
Date: Mon, 29 Dec 2014 01:39:23 +0100
Subject: [PATCH] DBus: Vala: added soversion
A version is needed for Vala interface's soname to track ABI changes
---
CMakeLists.txt | 2 ++
Dbus/interfaces/vala/src/CMakeLists.txt | 10 ++++++++++
2 files changed, 12 insertions(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fdd83a5..82e81c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -596,6 +596,8 @@ if (enable-vala-interface)
set (with_valac no)
find_program (VALAC_EXE valac)
message (STATUS " Path to valac: ${VALAC_EXE}")
+ set (VERSION_VALA "1.0.0")
+ message (STATUS " Cairo-Dock Vala interface's ABI version: ${VERSION_VALA}")
enable_if_not_defined (enable-vala-support)
if (NOT enable-vala-support)
diff --git a/Dbus/interfaces/vala/src/CMakeLists.txt b/Dbus/interfaces/vala/src/CMakeLists.txt
index d2dc97e..5b86d61 100644
--- a/Dbus/interfaces/vala/src/CMakeLists.txt
+++ b/Dbus/interfaces/vala/src/CMakeLists.txt
@@ -7,6 +7,16 @@ endif()
# now, compile it as any normal C lib.
add_library (${CDAPPLET} SHARED ${VALA_SRC_DIR}/${CDAPPLET}.c)
+STRING (REGEX REPLACE "\\..*" "" SOVERSION_VALA "${VERSION_VALA}")
+set_target_properties (${CDAPPLET} PROPERTIES
+ # create *nix style library versions + symbolic links
+ VERSION ${VERSION_VALA}
+ SOVERSION ${SOVERSION_VALA}
+ # allow creating static and shared libs without conflicts
+ #CLEAN_DIRECT_OUTPUT 1
+ # avoid conflicts between library and binary target names
+ #OUTPUT_NAME ${PROJECT_NAME}
+)
add_definitions (-fPIC -Wno-all)
pkg_check_modules ("CDAPPLET_DEPS" "gobject-2.0" "gio-2.0")
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- cairo-dock.spec 19 Dec 2014 15:07:08 -0000 1.80
+++ cairo-dock.spec 29 Dec 2014 06:34:15 -0000 1.81
@@ -29,7 +29,7 @@
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 5
+%global fedora_main_rel 6
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -44,9 +44,7 @@
%global build_ruby 1
%global ruby_vendorlib %(ruby -rrbconfig -e "puts Config::CONFIG['vendorlibdir']")
-# FIXME
-# I don't know well about vala !!
-%global build_vala 0
+%global build_vala 1
# For debugging
%global skip_main_build 0
@@ -66,9 +64,14 @@
Source2: http://launchpad.net/cairo-dock-plug-ins/%{urlver}/%{mainver}%{?betaver:-...
%endif
# Specify gem name to surely use ruby-dbus
+# Applied as 006353cc067e789e50d85790fbdb6c25e1398a63
Patch0: cairo-dock-plugins-3.4.0-ruby-specify-gemname.patch
# Ruby initialization fix
+# Applied as b71aff98db0fe9d4a22ed1fb9c457da0c3023846
Patch1: cairo-dock-plugins-3.4.0-ruby-initialization.patch
+# Append soname for Vala interface
+# Upstream: 2326408fb3ea63b78f0b0b5b13dcfa2070018e10
+Patch2: cairo-dock-plugins-3.4.0-vala-append-soname.patch
BuildRequires: cmake
@@ -268,6 +271,17 @@
%description vala
This package contains Vala binding files for %{name}
+%package vala-devel
+Summary: Development files for Vala binding for %{name}
+Version: %{rpmver_p}
+Release: %{rpmrel}
+Group: Development/Libraries
+Requires: %{name}-vala%{?_isa} = %{rpmver_p}-%{rpmrel}
+
+%description vala-devel
+This package contains development files for Vala
+binding for %{name}.
+
%package devel
Summary: Development files for %{name}
Version: %{rpmver_c}
@@ -328,6 +342,7 @@
# Patch
%patch0 -p1 -b .gem
%patch1 -p1 -b .rubyinit
+%patch2 -p1 -b .valasoname
## permission
for dir in */
@@ -357,11 +372,6 @@
-e '\@set.*RUBY_LIB_DIR.*CMAKE_INSTALL_PREFIX.*RUBY_LIB_DIR_INSTALL(a)d' \
CMakeLists.txt
# Python
-# Vala
-## FIXME
-sed -i.vala \
- -e '/with_vala /s|yes|no|' \
- CMakeLists.txt
popd # from opt/cairo-dock/trunk/cairo-dock
@@ -543,6 +553,10 @@
%post core -p /sbin/ldconfig
%postun core -p /sbin/ldconfig
+%if %{build_vala} >= 0
+%post vala -p /sbin/ldconfig
+%postun vala -p /sbin/ldconfig
+%endif
%files
@@ -640,13 +654,27 @@
%{ruby_vendorlib}/CDApplet.rb
%endif
+%if %{build_vala} > 0
+%files vala
+%{_libdir}/libCDApplet.so.1*
+%{_datadir}/vala/vapi/CDApplet.*
+
+%files vala-devel
+%{_libdir}/libCDApplet.so
+%{_libdir}/pkgconfig/CDApplet.pc
+%endif
+
+
%files devel
%defattr(-,root,root,-)
%{_includedir}/%{name}/
%{_libdir}/libgldi.so
-%{_libdir}/pkgconfig/*.pc
+%{_libdir}/pkgconfig/gldi.pc
%changelog
+* Mon Dec 29 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-6
+- Enable vala interface
+
* Sat Dec 20 2014 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 3.4.0-5
- Make plug-ins depending on python(2), due to cairo-dock-launcher-API-daemon
dependency (bug 3470)
9 years, 3 months
rpms/get_iplayer/devel .cvsignore, 1.9, 1.10 get_iplayer.spec, 1.24, 1.25 sources, 1.9, 1.10
by mavit
Author: mavit
Update of /cvs/free/rpms/get_iplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7379
Modified Files:
.cvsignore get_iplayer.spec sources
Log Message:
* Sat Dec 27 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.91-1
- Update to 2.91.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 3 Nov 2014 13:59:59 -0000 1.9
+++ .cvsignore 27 Dec 2014 18:24:54 -0000 1.10
@@ -1 +1 @@
-get_iplayer-2.90.tar.gz
+get_iplayer-2.91.tar.gz
Index: get_iplayer.spec
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/get_iplayer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- get_iplayer.spec 3 Nov 2014 13:59:59 -0000 1.24
+++ get_iplayer.spec 27 Dec 2014 18:24:54 -0000 1.25
@@ -1,5 +1,5 @@
Name: get_iplayer
-Version: 2.90
+Version: 2.91
Release: 1%{?dist}
Summary: Lists, Records and Streams BBC iPlayer TV and Radio programmes
@@ -59,6 +59,9 @@
%changelog
+* Sat Dec 27 2014 Peter Oliver <rpm(a)mavit.org.uk> - 2.91-1
+- Update to 2.91.
+
* Mon Nov 3 2014 David Woodhouse <dwmw2(a)infradead.org> - 2.90-1
- Update to 2.90.
Index: sources
===================================================================
RCS file: /cvs/free/rpms/get_iplayer/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 3 Nov 2014 13:59:59 -0000 1.9
+++ sources 27 Dec 2014 18:24:54 -0000 1.10
@@ -1 +1 @@
-dda5ee63127c91f460fc776176da0b38 get_iplayer-2.90.tar.gz
+8ee62f05a569a6b0dd39de4916acaf10 get_iplayer-2.91.tar.gz
9 years, 3 months
rpms/VirtualBox/F-19 VirtualBox-4.3.20-strings.patch,NONE,1.1
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17030
Added Files:
VirtualBox-4.3.20-strings.patch
Log Message:
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
VirtualBox-4.3.20-strings.patch:
Frontends/VirtualBox/src/main.cpp | 24 +++++++++++++-----------
VMM/VMMR3/VM.cpp | 8 ++++----
2 files changed, 17 insertions(+), 15 deletions(-)
--- NEW FILE VirtualBox-4.3.20-strings.patch ---
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com>
It is possible not have kmods is not always just not loaded kernel.
* Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com>
rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888
by: Naveed Hasan <naveed(a)cs.columbia.edu>
* Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com>
Rebased for 4.1.16 (partial rfbz #1826)
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon, 10 May 2010 12:08:47 -0400
Subject: [PATCH] Replace some strings
With ones that (sometimes) make more sense.
---
--- ./src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2014-12-26 03:15:24.511780506 +0000
+++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2014-12-26 03:35:54.819561727 +0000
@@ -74,13 +74,15 @@ 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. Please reinstall the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. If it is available in your distribution, you should install the "
- "DKMS package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not loaded."
+ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:"
+ " <font color=blue>'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox'</font><br/><br/>"
+ "On *not* stable versions of Fedora you need use akmods (because we don't have pre-built kmods) "
+ "or for custom kernels, you may do instead as root:"
+ " <font color=blue>'yum install akmod-VirtualBox kernel-devel-$(uname -r); akmods'</font>"
+ "If you installed VirtualBox packages and don't had reboot the system, you may need load the "
+ "kernel driver, doing as root:"
+ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -94,18 +97,18 @@ QString g_QStrHintLinuxWrongDriverVersio
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+ " <font color=blue>'rmmod vboxnetadp vboxnetflt vboxdrv; systemctl restart systemd-modules-load.service'</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPMFusion version and the Oracle version of VirtualBox."
);
QString g_QStrHintOtherNoDriver = QApplication::tr(
"Make sure the kernel module has been loaded successfully."
);
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
- "Please try reinstalling VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
--- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2014-12-26 03:15:24.513780527 +0000
+++ ./src/VBox/VMM/VMMR3/VM.cpp 2014-12-26 03:35:54.821561747 +0000
@@ -378,8 +378,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Load the kernel module by executing "
+ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -420,8 +420,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Install the kernel module by executing "
+ "'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
9 years, 3 months
rpms/VirtualBox/F-19 VirtualBox.spec,1.57,1.58
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9003
Modified Files:
VirtualBox.spec
Log Message:
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-19/VirtualBox.spec,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- VirtualBox.spec 25 Dec 2014 02:25:22 -0000 1.57
+++ VirtualBox.spec 26 Dec 2014 05:27:23 -0000 1.58
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.3.20
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -42,7 +42,7 @@
Source10: vboxweb.service
Source11: vboxservice.service
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
-Patch2: VirtualBox-4.1.18-strings.patch
+Patch2: VirtualBox-4.3.20-strings.patch
Patch3: VirtualBox-4.3.0-libcxx.patch
Patch4: VirtualBox-4.3.0-testmangle.patch
Patch10: VirtualBox-4.3.0-32bit.patch
@@ -178,10 +178,13 @@
%description guest
-This is the same that Guest Additions, therefore should only be installed on a guest system.
-Tools that utilize kernel modules for supporting integration
-with the Host, including file sharing and tracking of mouse pointer
-movement and X.org X11 video and mouse driver.
+Important note: VirtualBox-guest can't be installed on Host (master) system because
+contains X11 and OpenGL drives that will mess up with your X11 configurations.
+This subpackage replace Oracle Linux Guest Addition but just for Fedora,
+therefore should be installed only when we have one Fedora as a guest system.
+Tools that use kernel modules for supporting integration
+with the Host, including file sharing, clipboard sharing,
+X.org X11 video and mouse driver, USB and webcam proxy and Seamless mode.
%package kmodsrc
@@ -616,6 +619,10 @@
%changelog
+* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
+- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
+- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
+
* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
9 years, 3 months
rpms/VirtualBox/F-20 VirtualBox.spec,1.65,1.66
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8964
Modified Files:
VirtualBox.spec
Log Message:
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/F-20/VirtualBox.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- VirtualBox.spec 22 Dec 2014 01:44:03 -0000 1.65
+++ VirtualBox.spec 26 Dec 2014 05:26:38 -0000 1.66
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.3.20
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -42,7 +42,7 @@
Source10: vboxweb.service
Source11: vboxservice.service
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
-Patch2: VirtualBox-4.1.18-strings.patch
+Patch2: VirtualBox-4.3.20-strings.patch
Patch3: VirtualBox-4.3.0-libcxx.patch
Patch4: VirtualBox-4.3.0-testmangle.patch
Patch10: VirtualBox-4.3.0-32bit.patch
@@ -178,10 +178,13 @@
%description guest
-This is the same that Guest Additions, therefore should only be installed on a guest system.
-Tools that utilize kernel modules for supporting integration
-with the Host, including file sharing and tracking of mouse pointer
-movement and X.org X11 video and mouse driver.
+Important note: VirtualBox-guest can't be installed on Host (master) system because
+contains X11 and OpenGL drives that will mess up with your X11 configurations.
+This subpackage replace Oracle Linux Guest Addition but just for Fedora,
+therefore should be installed only when we have one Fedora as a guest system.
+Tools that use kernel modules for supporting integration
+with the Host, including file sharing, clipboard sharing,
+X.org X11 video and mouse driver, USB and webcam proxy and Seamless mode.
%package kmodsrc
@@ -616,6 +619,10 @@
%changelog
+* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
+- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
+- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
+
* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
9 years, 3 months
rpms/VirtualBox/F-20 VirtualBox-4.3.20-strings.patch,NONE,1.1
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8892
Added Files:
VirtualBox-4.3.20-strings.patch
Log Message:
* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
- s/$RPM_BUILD_ROOT/%{buildroot}/g
- Added %{_prefix} to /lib/udev/ .
- Moved pam_vbox.so from %{_lib}/security/ to %{_libdir}/security/ .
VirtualBox-4.3.20-strings.patch:
Frontends/VirtualBox/src/main.cpp | 24 +++++++++++++-----------
VMM/VMMR3/VM.cpp | 8 ++++----
2 files changed, 17 insertions(+), 15 deletions(-)
--- NEW FILE VirtualBox-4.3.20-strings.patch ---
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com>
It is possible not have kmods is not always just not loaded kernel.
* Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com>
rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888
by: Naveed Hasan <naveed(a)cs.columbia.edu>
* Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com>
Rebased for 4.1.16 (partial rfbz #1826)
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon, 10 May 2010 12:08:47 -0400
Subject: [PATCH] Replace some strings
With ones that (sometimes) make more sense.
---
--- ./src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2014-12-26 03:15:24.511780506 +0000
+++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2014-12-26 03:35:54.819561727 +0000
@@ -74,13 +74,15 @@ 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. Please reinstall the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. If it is available in your distribution, you should install the "
- "DKMS package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not loaded."
+ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:"
+ " <font color=blue>'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox'</font><br/><br/>"
+ "On *not* stable versions of Fedora you need use akmods (because we don't have pre-built kmods) "
+ "or for custom kernels, you may do instead as root:"
+ " <font color=blue>'yum install akmod-VirtualBox kernel-devel-$(uname -r); akmods'</font>"
+ "If you installed VirtualBox packages and don't had reboot the system, you may need load the "
+ "kernel driver, doing as root:"
+ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -94,18 +97,18 @@ QString g_QStrHintLinuxWrongDriverVersio
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+ " <font color=blue>'rmmod vboxnetadp vboxnetflt vboxdrv; systemctl restart systemd-modules-load.service'</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPMFusion version and the Oracle version of VirtualBox."
);
QString g_QStrHintOtherNoDriver = QApplication::tr(
"Make sure the kernel module has been loaded successfully."
);
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
- "Please try reinstalling VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
--- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2014-12-26 03:15:24.513780527 +0000
+++ ./src/VBox/VMM/VMMR3/VM.cpp 2014-12-26 03:35:54.821561747 +0000
@@ -378,8 +378,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Load the kernel module by executing "
+ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -420,8 +420,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Install the kernel module by executing "
+ "'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
9 years, 3 months
rpms/VirtualBox/devel VirtualBox-4.3.20-strings.patch, NONE, 1.1 VirtualBox-4.1.18-strings.patch, 1.2, 1.3 VirtualBox.spec, 1.69, 1.70
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8194
Modified Files:
VirtualBox-4.1.18-strings.patch VirtualBox.spec
Added Files:
VirtualBox-4.3.20-strings.patch
Log Message:
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
VirtualBox-4.3.20-strings.patch:
Frontends/VirtualBox/src/main.cpp | 24 +++++++++++++-----------
VMM/VMMR3/VM.cpp | 8 ++++----
2 files changed, 17 insertions(+), 15 deletions(-)
--- NEW FILE VirtualBox-4.3.20-strings.patch ---
* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com>
It is possible not have kmods is not always just not loaded kernel.
* Mon Jul 09 2012 Sérgio Basto <sergio(a)serjux.com>
rfbz #1826, last review of https://bugzilla.rpmfusion.org/attachment.cgi?id=888
by: Naveed Hasan <naveed(a)cs.columbia.edu>
* Sat Jun 16 2012 Sérgio Basto <sergio(a)serjux.com>
Rebased for 4.1.16 (partial rfbz #1826)
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon, 10 May 2010 12:08:47 -0400
Subject: [PATCH] Replace some strings
With ones that (sometimes) make more sense.
---
--- ./src/VBox/Frontends/VirtualBox/src/main.cpp.orig 2014-12-26 03:15:24.511780506 +0000
+++ ./src/VBox/Frontends/VirtualBox/src/main.cpp 2014-12-26 03:35:54.819561727 +0000
@@ -74,13 +74,15 @@ 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. Please reinstall the kernel "
- "module by executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
- "as root. If it is available in your distribution, you should install the "
- "DKMS package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not loaded."
+ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:"
+ " <font color=blue>'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox'</font><br/><br/>"
+ "On *not* stable versions of Fedora you need use akmods (because we don't have pre-built kmods) "
+ "or for custom kernels, you may do instead as root:"
+ " <font color=blue>'yum install akmod-VirtualBox kernel-devel-$(uname -r); akmods'</font>"
+ "If you installed VirtualBox packages and don't had reboot the system, you may need load the "
+ "kernel driver, doing as root:"
+ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
@@ -94,18 +97,18 @@ QString g_QStrHintLinuxWrongDriverVersio
"The VirtualBox kernel modules do not match this version of "
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
+ " <font color=blue>'rmmod vboxnetadp vboxnetflt vboxdrv; systemctl restart systemd-modules-load.service'</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPMFusion version and the Oracle version of VirtualBox."
);
QString g_QStrHintOtherNoDriver = QApplication::tr(
"Make sure the kernel module has been loaded successfully."
);
-/* I hope this isn't (C), (TM) or (R) Microsoft support ;-) */
+/* We're going to try to give a helping hand */
QString g_QStrHintReinstall = QApplication::tr(
- "Please try reinstalling VirtualBox."
+ "Please report the problem to the RPM Fusion Bugzilla."
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
--- ./src/VBox/VMM/VMMR3/VM.cpp.orig 2014-12-26 03:15:24.513780527 +0000
+++ ./src/VBox/VMM/VMMR3/VM.cpp 2014-12-26 03:35:54.821561747 +0000
@@ -378,8 +378,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "Load the kernel module by executing "
+ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
#endif
@@ -420,8 +420,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not installed. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
+ "reason. Install the kernel module by executing "
+ "'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
VirtualBox-4.1.18-strings.patch:
Frontends/VirtualBox/src/main.cpp | 25 ++++++++++++++-----------
Installer/linux/VBox.sh | 13 ++++++++-----
VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 26 insertions(+), 20 deletions(-)
Index: VirtualBox-4.1.18-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.1.18-strings.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.1.18-strings.patch 29 Jun 2013 04:58:46 -0000 1.2
+++ VirtualBox-4.1.18-strings.patch 26 Dec 2014 05:06:30 -0000 1.3
@@ -21,7 +21,7 @@
diff -Nurp VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp
--- VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-20 14:16:20.000000000 +0100
+++ VirtualBox-4.1.18.new2/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-07-09 04:57:00.690645723 +0100
-@@ -72,13 +72,13 @@ QString g_QStrHintLinuxNoMemory = QAppli
+@@ -72,13 +72,16 @@ QString g_QStrHintLinuxNoMemory = QAppli
);
QString g_QStrHintLinuxNoDriver = QApplication::tr(
@@ -32,12 +32,15 @@
- "as root. If it is available in your distribution, you should install the "
- "DKMS package first. This package keeps track of Linux kernel changes and "
- "recompiles the vboxdrv kernel module if necessary."
-+ "The VirtualBox Linux kernel driver (vboxdrv) is probably not "
-+ "loaded.<br/><br/>"
-+ "If you installed or VirtualBox package recently you need to restart "
-+ "the computer for the driver to load.<br/><br/>"
-+ "Alternatively, you may attempt to load the driver by issuing the "
-+ "following command with system administrator (root) privileges:<br/><br/>"
++ "The VirtualBox Linux kernel driver (vboxdrv) is probably not loaded."
++ "You may not have kernel driver installed for kernel that is runnig, if so you may do as root:"
++ " <font color=blue>'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox'</font><br/><br/>"
++ "On *not* stable versions of Fedora you need use akmods (because we don't have pre-built kmods) "
++ "or for custom kernels, you may do instead as root:"
++ " <font color=blue>'yum install akmod-VirtualBox kernel-devel-$(uname -r)'</font>"
++ " <font color=blue>'akmods'</font><br/><br/>"
++ "If you installed VirtualBox packages and don't had reboot the system, you may need load the "
++ "kernel driver, doing as root:"
+ " <font color=blue>'systemctl restart systemd-modules-load.service'</font><br/><br/>"
);
@@ -47,7 +50,7 @@
"VirtualBox. The installation of VirtualBox was apparently not "
"successful. Executing<br/><br/>"
- " <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
-+ " <font color=blue>'systemctl restart systemd-modules-load.service '</font> as root<br/><br/>"
++ " <font color=blue>'systemctl restart systemd-modules-load.service'</font> as root<br/><br/>"
"may correct this. Make sure that you do not mix the "
- "OSE version and the PUEL version of VirtualBox."
+ "RPM Fusion version and the Oracle version of VirtualBox."
@@ -105,7 +108,7 @@
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
-+ "Reboot the computer or load the kernel module by executing "
++ "Load the kernel module by executing "
+ "'systemctl restart systemd-modules-load.service' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
@@ -116,8 +119,8 @@
"was either not loaded or /dev/vboxdrv was not created for some "
- "reason. Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
-+ "reason. Load the kernel module by executing "
-+ "'systemctl restart systemd-modules-load.service' as root");
++ "reason. Install the kernel module by executing "
++ "'yum install kmod-VirtualBox-$(uname -r) kmod-VirtualBox' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- VirtualBox.spec 21 Dec 2014 19:19:11 -0000 1.69
+++ VirtualBox.spec 26 Dec 2014 05:06:30 -0000 1.70
@@ -27,7 +27,7 @@
Name: VirtualBox
Version: 4.3.20
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -42,7 +42,7 @@
Source10: vboxweb.service
Source11: vboxservice.service
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
-Patch2: VirtualBox-4.1.18-strings.patch
+Patch2: VirtualBox-4.3.20-strings.patch
Patch3: VirtualBox-4.3.0-libcxx.patch
Patch4: VirtualBox-4.3.0-testmangle.patch
Patch10: VirtualBox-4.3.0-32bit.patch
@@ -178,10 +178,13 @@
%description guest
-This is the same that Guest Additions, therefore should only be installed on a guest system.
-Tools that utilize kernel modules for supporting integration
-with the Host, including file sharing and tracking of mouse pointer
-movement and X.org X11 video and mouse driver.
+Important note: VirtualBox-guest can't be installed on Host (master) system because
+contains X11 and OpenGL drives that will mess up with your X11 configurations.
+This subpackage replace Oracle Linux Guest Addition but just for Fedora,
+therefore should be installed only when we have one Fedora as a guest system.
+Tools that use kernel modules for supporting integration
+with the Host, including file sharing, clipboard sharing,
+X.org X11 video and mouse driver, USB and webcam proxy and Seamless mode.
%package kmodsrc
@@ -616,6 +619,10 @@
%changelog
+* Fri Dec 26 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-3
+- Improved strings.patch asking to install kmods VirtualBox and also intructions for devel versions.
+- Improved description of VirtualBox-guest, alerting to not install on Host, one conclusion on rfbz #3425 .
+
* Sun Dec 21 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-2
- Moved files from /etc/modules-load.d/ to /usr/lib/modules-load.d/, fix rfbz #3469 .
- Also moved files from /etc/udev/rules.d/ to /usr/lib/udev/rules.d/ and removed %config directive .
9 years, 3 months
rpms/VirtualBox-kmod/F-19 VirtualBox-kmod.spec,1.93,1.94
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-kmod/F-19
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv31751
Modified Files:
VirtualBox-kmod.spec
Log Message:
* Thu Dec 25 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-1
- Update to 4.3.20 and build akmods.
Index: VirtualBox-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-kmod/F-19/VirtualBox-kmod.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- VirtualBox-kmod.spec 18 Dec 2014 19:34:00 -0000 1.93
+++ VirtualBox-kmod.spec 25 Dec 2014 04:49:47 -0000 1.94
@@ -3,7 +3,7 @@
# "buildforkernels newest" macro for just that build; immediately after
# queuing that build enable the macro again for subsequent builds; that way
# a new akmod package will only get build when a new one is actually needed
-%global buildforkernels newest
+#global buildforkernels newest
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
@@ -19,8 +19,8 @@
%bcond_with hardening
Name: VirtualBox-kmod
-Version: 4.3.16
-Release: 1%{?prerel:.%{prerel}}%{?dist}.9
+Version: 4.3.20
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: Kernel module for VirtualBox
Group: System Environment/Kernel
@@ -98,6 +98,9 @@
%changelog
+* Thu Dec 25 2014 Sérgio Basto <sergio(a)serjux.com> - 4.3.20-1
+- Update to 4.3.20 and build akmods.
+
* Thu Dec 18 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 4.3.16-1.9
- Rebuilt for kernel
9 years, 3 months