rpms/VirtualBox-OSE/F-15 VirtualBox-OSE-4.1.10-mesa.patch, NONE, 1.1 VirtualBox-OSE.spec, 1.77, 1.78
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv27593
Modified Files:
VirtualBox-OSE.spec
Added Files:
VirtualBox-OSE-4.1.10-mesa.patch
Log Message:
* Sun May 06 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-4
- Bump a version to make a new tag.
and
add VirtualBox-OSE-4.1.10-mesa.patch
VirtualBox-OSE-4.1.10-mesa.patch:
Config.kmk | 10 -
VirtualBox-4.1.10/src/VBox/Additions/common/crOpenGL/fakedri_drv.c | 59 +++++++++-
VirtualBox-4.1.10/src/VBox/Additions/common/crOpenGL/fakedri_drv.h | 21 ++-
3 files changed, 69 insertions(+), 21 deletions(-)
--- NEW FILE VirtualBox-OSE-4.1.10-mesa.patch ---
--- VirtualBox-4.1.10.orig/Config.kmk 2012-03-13 13:14:01.000000000 +0000
+++ VirtualBox-4.1.10/Config.kmk 2012-03-27 23:55:28.070630137 +0100
@@ -2003,15 +2003,7 @@ ifdef VBOX_WITH_CROGL
endif
if1of ($(KBUILD_TARGET), freebsd linux solaris)
- # VBOX_PATH_MESA_SOURCE = $(PATH_ROOT)/src/libs/mesa-7.2
- VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2
- VBOX_MESA_INCS = \
- $(VBOX_PATH_MESA_SOURCE) \
- $(VBOX_PATH_MESA_SOURCE)/include \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \
- $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common
+ VBOX_MESA_INCS = /usr/include/GL /usr/include/xorg /usr/include/pixman-1
endif
VBOX_DARWIN_OPENGL_INST = obj/VBoxOGL/GL/
diff -x x11include -Nurp VirtualBox-4.1.10.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.10/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
--- VirtualBox-4.1.10.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2012-03-13 13:14:21.000000000 +0000
+++ VirtualBox-4.1.10/src/VBox/Additions/common/crOpenGL/fakedri_drv.c 2012-03-30 04:12:46.110584648 +0100
@@ -17,7 +17,15 @@
*/
#define _GNU_SOURCE 1
+#define HAVE_STRNDUP 1
+#include <dlfcn.h>
+#include <elf.h>
+#include <unistd.h>
+#include <xf86.h>
+#include <xf86drm.h>
+#include <GL/gl.h>
+#include <GL/glext.h>
#include "cr_error.h"
#include "cr_gl.h"
#include "cr_mem.h"
@@ -26,10 +34,6 @@
#include "dri_glx.h"
#include "iprt/mem.h"
#include "iprt/err.h"
-#include <dlfcn.h>
-#include <elf.h>
-#include <unistd.h>
-#include "xf86.h"
#define VBOX_NO_MESA_PATCH_REPORTS
@@ -104,8 +108,53 @@ static const __DRIswrastExtension *gpSwD
extern const __DRIextension * __driDriverExtensions[];
+//copy from /usr/share/xorg-x11-server-source/glx/dispatch.h
+#define SET_by_offset(disp, offset, fn) \
+ do { \
+ if ( (offset) < 0 ) { \
+ /* fprintf( stderr, "[%s:%u] SET_by_offset(%p, %d, %s)!\n", */ \
+ /* __func__, __LINE__, disp, offset, # fn); */ \
+ /* abort(); */ \
+ } \
+ else { \
+ ( (_glapi_proc *) (disp) )[offset] = (_glapi_proc) fn; \
+ } \
+ } while(0)
+
+// copy from glx/glapi.c
+
+/**
+ * Search the table of static entrypoint functions for the named function
+ * and return the corresponding glprocs_table_t entry.
+ */
+static const glprocs_table_t * find_entry( const char * n )
+{
+ GLuint i;
+ for (i = 0; static_functions[i].Name_offset >= 0; i++) {
+ const char *testName = gl_string_table + static_functions[i].Name_offset;
+ if (strcmp(testName, n) == 0) {
+ return &static_functions[i];
+ }
+ }
+ return NULL;
+}
+
+/**
+ * Return dispatch table offset of the named static (built-in) function.
+ * Return -1 if function not found.
+ */
+static GLint
+get_static_proc_offset(const char *funcName)
+{
+ const glprocs_table_t * const f = find_entry( funcName );
+ if (f) {
+ return f->Offset;
+ }
+ return -1;
+}
+
#define VBOX_SET_MESA_FUNC(table, name, func) \
- if (_glapi_get_proc_offset(name)>=0) SET_by_offset(table, _glapi_get_proc_offset(name), func); \
+ if (get_static_proc_offset(name)>=0) SET_by_offset(table, get_static_proc_offset(name), func); \
else crWarning("%s not found in mesa table", name)
#define GLAPI_ENTRY(Func) VBOX_SET_MESA_FUNC(vbox_glapi_table, "gl"#Func, cr_gl##Func);
diff -x x11include -Nurp VirtualBox-4.1.10.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.h VirtualBox-4.1.10/src/VBox/Additions/common/crOpenGL/fakedri_drv.h
--- VirtualBox-4.1.10.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-13 13:14:21.000000000 +0000
+++ VirtualBox-4.1.10/src/VBox/Additions/common/crOpenGL/fakedri_drv.h 2012-03-27 23:14:15.058370962 +0100
@@ -20,13 +20,20 @@
#ifndef ___CROPENGL_FAKEDRIDRV_H
#define ___CROPENGL_FAKEDRIDRV_H
-#include "src/mesa/main/mtypes.h"
-#include "src/mesa/main/dd.h"
-#include "src/mesa/glapi/dispatch.h"
-#include "src/mesa/glapi/glapi.h"
-#include "src/mesa/glapi/glapitable.h"
-#include "src/mesa/glapi/glapioffsets.h"
-#include "src/mesa/drivers/dri/common/dri_util.h"
+//#include "/usr/share/xorg-x11-server-source/glx/glapi.h"
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
+extern GLuint
+_glapi_get_dispatch_table_size(void);
+
+extern struct _glapi_table *
+_glapi_get_dispatch(void);
+
+extern void
+_glapi_set_dispatch(struct _glapi_table *dispatch);
+
+//#include "/usr/share/xorg-x11-server-source/glx/glapioffsets.h"
+#include "/usr/share/xorg-x11-server-source/glx/glprocs.h"
#include "GL/internal/dri_interface.h"
#include "glx_proto.h"
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- VirtualBox-OSE.spec 6 May 2012 22:06:39 -0000 1.77
+++ VirtualBox-OSE.spec 6 May 2012 23:08:19 -0000 1.78
@@ -17,7 +17,7 @@
Name: VirtualBox-OSE
Version: 4.1.14
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -530,6 +530,9 @@
%changelog
+* Sun May 06 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-4
+- Bump a version to make a new tag.
+
* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
- Review spec with fedora-review
- Remove requirement for hal for F15
12 years, 2 months
rpms/VirtualBox-OSE/F-16 VirtualBox-OSE.spec,1.86,1.87
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26007
Modified Files:
VirtualBox-OSE.spec
Log Message:
Bump a version to make a new tag.
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- VirtualBox-OSE.spec 6 May 2012 21:53:29 -0000 1.86
+++ VirtualBox-OSE.spec 6 May 2012 22:13:08 -0000 1.87
@@ -17,7 +17,7 @@
Name: VirtualBox-OSE
Version: 4.1.14
-Release: 3%{?prerel:.%{prerel}}%{?dist}
+Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -530,6 +530,9 @@
%changelog
+* Sun May 06 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-4
+- Bump a version to make a new tag.
+
* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
- Review spec with fedora-review
- Remove requirement for hal for F15
12 years, 2 months
rpms/VirtualBox-OSE/F-15 vboxservice.service, NONE, 1.1 vboxweb.service, NONE, 1.1 .cvsignore, 1.33, 1.34 VirtualBox-OSE.spec, 1.76, 1.77 sources, 1.33, 1.34
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25705
Modified Files:
.cvsignore VirtualBox-OSE.spec sources
Added Files:
vboxservice.service vboxweb.service
Log Message:
* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
- Review spec with fedora-review
- Remove requirement for hal for F15
- .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644
- don't try start vboxservice.service, because vboxservice.service depends on kmods, maybe start when
modules are loaded.
* Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-2
- Migrating vboxweb-service to a systemd unit file from a SysV initscript
- Add vboxservice.service systemd unit file in guest package, rfbz #2274.
* Thu Apr 26 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-1
- new release
- mesa patch only for F17 or higher
* Fri Apr 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-3
- F17 mesa patch, fix compile fakedri and unbundle part of mesa sources, unbunble mesa source must be tested.
--- NEW FILE vboxservice.service ---
[Unit]
Description=VirtualBox guest services
ConditionVirtualization=oracle
[Service]
ExecStart=/usr/bin/VBoxService -f
[Install]
WantedBy=multi-user.target
--- NEW FILE vboxweb.service ---
[Unit]
Description=VirtualBox OSE Web Service
After=network.target
[Service]
Type=forking
PIDFile=/run/vboxweb.pid
ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background
[Install]
WantedBy=multi-user.target
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 13 Apr 2012 04:54:00 -0000 1.33
+++ .cvsignore 6 May 2012 22:06:39 -0000 1.34
@@ -1 +1 @@
-VirtualBox-4.1.12.tar.bz2
+VirtualBox-4.1.14.tar.bz2
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/VirtualBox-OSE.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- VirtualBox-OSE.spec 13 Apr 2012 04:54:00 -0000 1.76
+++ VirtualBox-OSE.spec 6 May 2012 22:06:39 -0000 1.77
@@ -1,5 +1,7 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global systemd_dir /lib/systemd/system
+
# Standard compiler flags, without:
# -Wall -- VirtualBox-OSE takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
@@ -14,8 +16,8 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox-OSE
-Version: 4.1.12
-Release: 2%{?prerel:.%{prerel}}%{?dist}
+Version: 4.1.14
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -28,7 +30,8 @@
Source7: VirtualBox-OSE-guest.modules
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE-00-vboxvideo.conf
-Source10: vboxweb-service
+Source10: vboxweb.service
+Source11: vboxservice.service
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-OSE-4.1.6-strings.patch
Patch3: VirtualBox-OSE-4.1.2-libcxx.patch
@@ -43,13 +46,11 @@
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
Patch20: VirtualBox-OSE-4.1.2-testmangle.patch
Patch22: VirtualBox-OSE-4.1.12-gsoap.patch
+Patch23: VirtualBox-OSE-4.1.10-mesa.patch
%if 0%{?fedora} < 17
BuildRequires: kBuild >= 0.1.98
%endif
-%if 0%{?fedora} < 16
-BuildRequires: hal-devel
-%endif
BuildRequires: SDL-devel xalan-c-devel
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
@@ -91,6 +92,8 @@
%endif
Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
Requires: %{name}-kmod = %{version}%{?prereltag}
Provides: %{name}-kmod-common = %{version}%{?prereltag}
@@ -125,9 +128,6 @@
Group: System Environment/Base
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}
-%if 0%{?fedora} < 16
-Requires: hal
-%endif
Requires: xorg-x11-server-Xorg
Requires: xorg-x11-xinit
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
@@ -141,6 +141,7 @@
%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.
@@ -175,6 +176,9 @@
%if 0%{?fedora} < 16
%patch22 -p1 -b .gsoap
%endif
+%if 0%{?fedora} > 16
+%patch23 -p1 -b .mesa
+%endif
# Remove prebuilt binary tools
%if 0%{?fedora} < 17
@@ -206,8 +210,6 @@
%install
-rm -rf $RPM_BUILD_ROOT
-
# The directory layout created below attempts to mimic the one of
# the commercially supported version to minimize confusion
@@ -329,19 +331,22 @@
obj/bin/additions/VBoxControl
# Ideally, Xorg should autodetect this, but for some reason it no longer does
-install -m 0755 -D %{SOURCE9} \
+install -m 0644 -D %{SOURCE9} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
-install -m 0755 -D %{SOURCE10} \
- $RPM_BUILD_ROOT%{_initrddir}/vboxweb-service
+install -m 0644 -D %{SOURCE10} \
+ $RPM_BUILD_ROOT%{systemd_dir}/vboxweb.service
+
+install -m 0644 -D %{SOURCE11} \
+ $RPM_BUILD_ROOT%{systemd_dir}/vboxservice.service
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
-install -m 0755 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
+install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
-install -m 0755 -D %{SOURCE8} \
+install -m 0644 -D %{SOURCE8} \
$RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
@@ -389,7 +394,9 @@
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
# Web service
-/sbin/chkconfig --add vboxweb-service >/dev/null 2>&1 || :
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
@@ -402,25 +409,46 @@
%preun
-[ $1 = 0 ] && /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable vboxweb.service > /dev/null 2>&1 || :
+ /bin/systemctl stop vboxweb.service > /dev/null 2>&1 || :
+fi
%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
/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
-%post guest -p /sbin/ldconfig
-%postun guest -p /sbin/ldconfig
+%post guest
+/sbin/ldconfig
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
+
+%preun guest
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable vboxservice.service > /dev/null 2>&1 || :
+ /bin/systemctl stop vboxservice.service > /dev/null 2>&1 || :
+fi
+
+%postun guest
+/sbin/ldconfig
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart vboxservice.service >/dev/null 2>&1 || :
+fi
%files
-%defattr(-,root,root,-)
%{_bindir}/VBox
%{_bindir}/vboxballoonctrl
%{_bindir}/VBoxBalloonCtrl
@@ -466,22 +494,19 @@
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
%doc COPYING
-%attr(755,root,root) %{_initrddir}/vboxweb-service
+%{systemd_dir}/vboxweb.service
%files devel
-%defattr(0644,root,root,0755)
%{_libdir}/virtualbox/sdk
%files -n python-%{name}
-%defattr(0644,root,root,0755)
%{python_sitelib}/virtualbox
%{python_sitelib}/vboxapi*
%files guest
-%defattr(-,root,root,-)
/%{_lib}/security/pam_vbox.so
%{_bindir}/mount.vboxsf
%{_bindir}/VBoxClient
@@ -497,14 +522,32 @@
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
+%{systemd_dir}/vboxservice.service
%files kmodsrc
-%defattr(-,root,root,-)
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
+- Review spec with fedora-review
+- Remove requirement for hal for F15
+- .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644
+- don't try start vboxservice.service, because vboxservice.service depends on kmods, maybe start when
+ modules are loaded.
+
+* Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-2
+- Migrating vboxweb-service to a systemd unit file from a SysV initscript
+- Add vboxservice.service systemd unit file in guest package, rfbz #2274.
+
+* Thu Apr 26 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-1
+- new release
+- mesa patch only for F17 or higher
+
+* Fri Apr 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-3
+- F17 mesa patch, fix compile fakedri and unbundle part of mesa sources, unbunble mesa source must be tested.
+
* Fri Apr 13 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-2
- F15 patch gsoap 2.7 which pkg-config gsoapssl++ --libs don't have -lssl -lcrypto
- F17 kBuild workarround, but still not build in F17,
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-15/sources,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sources 13 Apr 2012 04:54:00 -0000 1.33
+++ sources 6 May 2012 22:06:39 -0000 1.34
@@ -1 +1 @@
-b6613e2b37562dec0fdede9af044edba VirtualBox-4.1.12.tar.bz2
+f8baa04e6d589bc6b1fb4e7079fbe414 VirtualBox-4.1.14.tar.bz2
12 years, 2 months
rpms/VirtualBox-OSE/F-16 vboxservice.service, NONE, 1.1 vboxweb.service, NONE, 1.1 vboxweb-service, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25435
Added Files:
vboxservice.service vboxweb.service
Removed Files:
vboxweb-service
Log Message:
remove vboxweb-service and add vboxservice.service, vboxweb.service
--- NEW FILE vboxservice.service ---
[Unit]
Description=VirtualBox guest services
ConditionVirtualization=oracle
[Service]
ExecStart=/usr/bin/VBoxService -f
[Install]
WantedBy=multi-user.target
--- NEW FILE vboxweb.service ---
[Unit]
Description=VirtualBox OSE Web Service
After=network.target
[Service]
Type=forking
PIDFile=/run/vboxweb.pid
ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid --background
[Install]
WantedBy=multi-user.target
--- vboxweb-service DELETED ---
12 years, 2 months
rpms/VirtualBox-OSE/F-16 VirtualBox-OSE.spec,1.85,1.86
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox-OSE/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24959
Modified Files:
VirtualBox-OSE.spec
Log Message:
* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
- Review spec with fedora-review
- Remove requirement for hal for F15
- .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644
- don't try start vboxservice.service, because vboxservice.service depends on kmods, maybe start when
modules are loaded.
* Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-2
- Migrating vboxweb-service to a systemd unit file from a SysV initscript
- Add vboxservice.service systemd unit file in guest package, rfbz #2274.
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-16/VirtualBox-OSE.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -r1.85 -r1.86
--- VirtualBox-OSE.spec 26 Apr 2012 22:27:19 -0000 1.85
+++ VirtualBox-OSE.spec 6 May 2012 21:53:29 -0000 1.86
@@ -1,5 +1,7 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global systemd_dir /lib/systemd/system
+
# Standard compiler flags, without:
# -Wall -- VirtualBox-OSE takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
@@ -15,7 +17,7 @@
Name: VirtualBox-OSE
Version: 4.1.14
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 3%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -28,7 +30,8 @@
Source7: VirtualBox-OSE-guest.modules
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE-00-vboxvideo.conf
-Source10: vboxweb-service
+Source10: vboxweb.service
+Source11: vboxservice.service
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-OSE-4.1.6-strings.patch
Patch3: VirtualBox-OSE-4.1.2-libcxx.patch
@@ -48,9 +51,6 @@
%if 0%{?fedora} < 17
BuildRequires: kBuild >= 0.1.98
%endif
-%if 0%{?fedora} < 16
-BuildRequires: hal-devel
-%endif
BuildRequires: SDL-devel xalan-c-devel
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
@@ -92,6 +92,8 @@
%endif
Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
Requires: %{name}-kmod = %{version}%{?prereltag}
Provides: %{name}-kmod-common = %{version}%{?prereltag}
@@ -126,9 +128,6 @@
Group: System Environment/Base
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}
-%if 0%{?fedora} < 16
-Requires: hal
-%endif
Requires: xorg-x11-server-Xorg
Requires: xorg-x11-xinit
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
@@ -142,6 +141,7 @@
%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.
@@ -210,8 +210,6 @@
%install
-rm -rf $RPM_BUILD_ROOT
-
# The directory layout created below attempts to mimic the one of
# the commercially supported version to minimize confusion
@@ -333,19 +331,22 @@
obj/bin/additions/VBoxControl
# Ideally, Xorg should autodetect this, but for some reason it no longer does
-install -m 0755 -D %{SOURCE9} \
+install -m 0644 -D %{SOURCE9} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
-install -m 0755 -D %{SOURCE10} \
- $RPM_BUILD_ROOT%{_initrddir}/vboxweb-service
+install -m 0644 -D %{SOURCE10} \
+ $RPM_BUILD_ROOT%{systemd_dir}/vboxweb.service
+
+install -m 0644 -D %{SOURCE11} \
+ $RPM_BUILD_ROOT%{systemd_dir}/vboxservice.service
install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
-install -m 0755 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
+install -m 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
-install -m 0755 -D %{SOURCE8} \
+install -m 0644 -D %{SOURCE8} \
$RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
@@ -393,7 +394,9 @@
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
# Web service
-/sbin/chkconfig --add vboxweb-service >/dev/null 2>&1 || :
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
# Assign USB devices
if /sbin/udevadm control --reload-rules >/dev/null 2>&1
@@ -406,25 +409,46 @@
%preun
-[ $1 = 0 ] && /sbin/chkconfig --del vboxweb-service >/dev/null 2>&1 || :
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable vboxweb.service > /dev/null 2>&1 || :
+ /bin/systemctl stop vboxweb.service > /dev/null 2>&1 || :
+fi
%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+
/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
-%post guest -p /sbin/ldconfig
-%postun guest -p /sbin/ldconfig
+%post guest
+/sbin/ldconfig
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+/bin/systemctl enable vboxservice.service >/dev/null 2>&1 || :
+
+%preun guest
+if [ $1 -eq 0 ] ; then
+ # Package removal, not upgrade
+ /bin/systemctl --no-reload disable vboxservice.service > /dev/null 2>&1 || :
+ /bin/systemctl stop vboxservice.service > /dev/null 2>&1 || :
+fi
+
+%postun guest
+/sbin/ldconfig
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+ # Package upgrade, not uninstall
+ /bin/systemctl try-restart vboxservice.service >/dev/null 2>&1 || :
+fi
%files
-%defattr(-,root,root,-)
%{_bindir}/VBox
%{_bindir}/vboxballoonctrl
%{_bindir}/VBoxBalloonCtrl
@@ -470,22 +494,19 @@
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
%doc COPYING
-%attr(755,root,root) %{_initrddir}/vboxweb-service
+%{systemd_dir}/vboxweb.service
%files devel
-%defattr(0644,root,root,0755)
%{_libdir}/virtualbox/sdk
%files -n python-%{name}
-%defattr(0644,root,root,0755)
%{python_sitelib}/virtualbox
%{python_sitelib}/vboxapi*
%files guest
-%defattr(-,root,root,-)
/%{_lib}/security/pam_vbox.so
%{_bindir}/mount.vboxsf
%{_bindir}/VBoxClient
@@ -501,14 +522,25 @@
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
+%{systemd_dir}/vboxservice.service
%files kmodsrc
-%defattr(-,root,root,-)
%{_datadir}/%{name}-kmod-%{version}
%changelog
+* Tue May 1 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-3
+- Review spec with fedora-review
+- Remove requirement for hal for F15
+- .desktop, .service and xorg.conf.d/vboxvideo.conf are text files, put chmod 644
+- don't try start vboxservice.service, because vboxservice.service depends on kmods, maybe start when
+ modules are loaded.
+
+* Sun Apr 29 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-2
+- Migrating vboxweb-service to a systemd unit file from a SysV initscript
+- Add vboxservice.service systemd unit file in guest package, rfbz #2274.
+
* Thu Apr 26 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-1
- new release
- mesa patch only for F17 or higher
12 years, 2 months
rpms/smplayer/F-15 smplayer-0.8.0-desktop-files.patch, NONE, 1.1 smplayer-0.8.0-system-qtsingleapplication.patch, NONE, 1.1 smplayer-0.8.0-system-quazip.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 smplayer.spec, 1.15, 1.16 sources, 1.12, 1.13 smplayer-0.6.9-desktop-files.patch, 1.3, NONE smplayer-0.7.0-system-quazip.patch, 1.1, NONE smplayer_enqueue_kde3.desktop, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/F-15
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv24187
Modified Files:
.cvsignore smplayer.spec sources
Added Files:
smplayer-0.8.0-desktop-files.patch
smplayer-0.8.0-system-qtsingleapplication.patch
smplayer-0.8.0-system-quazip.patch
Removed Files:
smplayer-0.6.9-desktop-files.patch
smplayer-0.7.0-system-quazip.patch
smplayer_enqueue_kde3.desktop
Log Message:
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-2
- fix smtube translations.
- drop support for Fedora < 9 and EPEL 5, since we need kde4.
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
- New release
- add smtube support
- use system qtsingleapplication
- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386
smplayer-0.8.0-desktop-files.patch:
smplayer.desktop | 2 +-
smplayer_enqueue.desktop | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE smplayer-0.8.0-desktop-files.patch ---
--- smplayer.desktop 2012-03-23 09:57:49.000000000 +0200
+++ smplayer.desktop 2012-04-06 04:39:05.971492030 +0300
@@ -13,7 +13,7 @@
Comment[uk]=Потужний інтерфейс до MPlayer
Comment[eu]=MPlayerrentzako interfaze grafiko handi bat
Comment[zh_CN]=一个优秀的 MPlayer 前端
-Exec=smplayer %U
+Exec=smplayer %f
GenericName=Media Player
GenericName[cs]=Přehrávač multimédií
GenericName[es]=Reproductor multimedia
--- smplayer_enqueue.desktop 2012-03-23 09:57:49.000000000 +0200
+++ smplayer_enqueue.desktop 2012-04-06 04:39:16.295388149 +0300
@@ -1,6 +1,6 @@
[Desktop Entry]
Categories=Qt;KDE;AudioVideo;Player;Video;
-Exec=smplayer -add-to-playlist %U
+Exec=smplayer -add-to-playlist %F
Icon=smplayer
MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
Name=Enqueue in SMPlayer
smplayer-0.8.0-system-qtsingleapplication.patch:
smtube-1.1/src/smtube.pro | 9 +++------
src/smplayer.pro | 10 +---------
2 files changed, 4 insertions(+), 15 deletions(-)
--- NEW FILE smplayer-0.8.0-system-qtsingleapplication.patch ---
--- smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-03-27 00:46:29.000000000 +0300
+++ smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-04-06 04:46:13.911416527 +0300
@@ -5,10 +5,11 @@
TEMPLATE = app
QT += network xml
TARGET =
-DEPENDPATH += . qtsingleapplication
-INCLUDEPATH += . qtsingleapplication
+DEPENDPATH += .
+INCLUDEPATH += .
CONFIG += qt warn_on release
+CONFIG += qtsingleapplication
RESOURCES = icons.qrc
@@ -61,10 +62,6 @@
translations/smtube_eu.ts \
translations/smtube_pt.ts
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-HEADERS += qtsingleapplication.h qtlocalpeer.h
-
unix {
UI_DIR = .ui
MOC_DIR = .moc
--- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300
+++ smplayer-0.8.0/src/smplayer.pro 2012-04-06 04:44:47.313246489 +0300
@@ -3,6 +3,7 @@
CONFIG += qt warn_on
CONFIG += release
+CONFIG += qtsingleapplication
#CONFIG += debug
QT += network xml
@@ -235,15 +236,6 @@
about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \
toolbareditor.ui
-# qtsingleapplication
-contains( DEFINES, SINGLE_INSTANCE ) {
- INCLUDEPATH += qtsingleapplication
- DEPENDPATH += qtsingleapplication
-
- SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
- HEADERS += qtsingleapplication.h qtlocalpeer.h
-}
-
# Find subtitles dialog
contains( DEFINES, FIND_SUBTITLES ) {
DEFINES += DOWNLOAD_SUBS
smplayer-0.8.0-system-quazip.patch:
findsubtitles/findsubtitles.pro | 20 ++------------------
smplayer.pro | 22 ++++------------------
2 files changed, 6 insertions(+), 36 deletions(-)
--- NEW FILE smplayer-0.8.0-system-quazip.patch ---
--- smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-03-31 15:46:16.000000000 +0300
+++ smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-04-27 21:58:55.535383047 +0300
@@ -34,30 +34,14 @@
DEFINES += NO_SMPLAYER_SUPPORT DOWNLOAD_SUBS
contains( DEFINES, DOWNLOAD_SUBS ) {
- INCLUDEPATH += filedownloader quazip
- DEPENDPATH += filedownloader quazip
+ INCLUDEPATH += filedownloader
+ DEPENDPATH += filedownloader
HEADERS += filedownloader.h subchooserdialog.h
SOURCES += filedownloader.cpp subchooserdialog.cpp
FORMS += subchooserdialog.ui
- HEADERS += crypt.h \
- ioapi.h \
- quazip.h \
- quazipfile.h \
- quazipfileinfo.h \
- quazipnewinfo.h \
- unzip.h \
- zip.h
-
- SOURCES += ioapi.c \
- quazip.cpp \
- quazipfile.cpp \
- quazipnewinfo.cpp \
- unzip.c \
- zip.c
-
LIBS += -lz
win32 {
--- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300
+++ smplayer-0.8.0/src/smplayer.pro 2012-04-27 22:03:15.636757443 +0300
@@ -258,31 +258,17 @@
# Download subtitles
contains( DEFINES, DOWNLOAD_SUBS ) {
- INCLUDEPATH += findsubtitles/filedownloader findsubtitles/quazip
- DEPENDPATH += findsubtitles/filedownloader findsubtitles/quazip
+ INCLUDEPATH += findsubtitles/filedownloader
+ DEPENDPATH += findsubtitles/filedownloader
HEADERS += filedownloader.h subchooserdialog.h fixsubs.h
SOURCES += filedownloader.cpp subchooserdialog.cpp fixsubs.cpp
FORMS += subchooserdialog.ui
- HEADERS += crypt.h \
- ioapi.h \
- quazip.h \
- quazipfile.h \
- quazipfileinfo.h \
- quazipnewinfo.h \
- unzip.h \
- zip.h
+ INCLUDEPATH += /usr/include/quazip /usr/include/minizip
- SOURCES += ioapi.c \
- quazip.cpp \
- quazipfile.cpp \
- quazipnewinfo.cpp \
- unzip.c \
- zip.c
-
- LIBS += -lz
+ LIBS += -lz -lquazip
win32 {
INCLUDEPATH += ..\\zlib-1.2.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-15/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 24 Mar 2012 03:21:15 -0000 1.12
+++ .cvsignore 6 May 2012 21:33:43 -0000 1.13
@@ -1 +1,2 @@
-smplayer-0.7.1.tar.bz2
+smplayer-0.8.0.tar.bz2
+smtube-1.1.tar.bz2
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-15/smplayer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smplayer.spec 24 Mar 2012 03:21:15 -0000 1.15
+++ smplayer.spec 6 May 2012 21:33:43 -0000 1.16
@@ -1,35 +1,29 @@
-# define correct path to used binaries
-# works on: fedora >= 7, centos >= 5
-%if 0%{?rhel} > 1
- %define _qt4_qmake %{_libdir}/qt4/bin/qmake
- %define _qt4_lrelease %{_libdir}/qt4/bin/lrelease
-%else
- %define _qt4_lrelease %{_bindir}/lrelease-qt4
-%endif
+%global smtube_ver 1.1
Name: smplayer
-Version: 0.7.1
-Release: 1%{?dist}
+Version: 0.8.0
+Release: 2%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
License: GPLv2+
URL: http://smplayer.sourceforge.net/linux/
-Source0: http://downloads.sourceforge.net/sourceforge/smplayer/smplayer-%{version}...
+Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
# Add a servicemenu to enqeue files in smplayer's playlist.
-# The first one is for KDE4, the second one for KDE3.
# see also:
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
-Source2: smplayer_enqueue_kde3.desktop
+Source3: http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
-Patch0: smplayer-0.6.9-desktop-files.patch
-Patch1: smplayer-0.7.0-system-quazip.patch
+Patch0: smplayer-0.8.0-desktop-files.patch
+Patch1: smplayer-0.8.0-system-quazip.patch
+Patch2: smplayer-0.8.0-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
BuildRequires: quazip-devel
+BuildRequires: qtsingleapplication-devel
# smplayer without mplayer is quite useless
Requires: mplayer
Requires: kde-filesystem
@@ -44,11 +38,15 @@
%prep
%setup -qn %{name}-%{version}
+%setup -a3 -qn %{name}-%{version}
#remove some bundle sources
rm -rf zlib-1.2.6
rm -rf src/findsubtitles/quazip
+rm -rf src/qtsingleapplication/
+
%patch0 -p0 -b .desktop-files
%patch1 -p1 -b .quazip
+%patch2 -p1 -b .qtsingleapplication
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -57,7 +55,7 @@
mv Changelog.utf8 Changelog
# use lrelease from qt4-devel
-sed -i 's|LRELEASE=lrelease|LRELEASE=%{_qt4_lrelease}|' Makefile
+sed -i 's|LRELEASE=lrelease|LRELEASE=%{_bindir}/lrelease-qt4|' Makefile
# fix path of docs
sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile
@@ -71,9 +69,21 @@
%build
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
+pushd smtube-%{smtube_ver}
+sed -i 's|lrelease|%{_bindir}/lrelease-qt4|' Makefile
+sed -i 's|qmake|%{_qt4_qmake}|' Makefile
+sed -i 's|/usr/local|%{_prefix}|' Makefile
+sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
+sed -i 's|smtube/translations|smplayer/translations|' Makefile
+make PREFIX=%{_prefix}
+popd
+
+
%install
-rm -rf %{buildroot}
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install
+pushd smtube-%{smtube_ver}
+make install DESTDIR=%{buildroot}
+popd
desktop-file-install --delete-original \
--vendor "rpmfusion" \
@@ -86,17 +96,11 @@
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/%{name}_enqueue.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/smtube.desktop
+
# Add servicemenus dependend on the version of KDE:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&group_i...
-%if 0%{?fedora} >= 9
- install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-%else
- install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
-%endif
-
-
-%clean
-rm -rf %{buildroot}
+install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%post
touch --no-create %{_datadir}/icons/hicolor
@@ -113,24 +117,29 @@
update-desktop-database &> /dev/null || :
%files
-%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/
%{_bindir}/smplayer
+%{_bindir}/smtube
%{_datadir}/applications/rpmfusion-smplayer*.desktop
+%{_datadir}/applications/smtube.desktop
%{_datadir}/icons/hicolor/*/apps/smplayer.png
+%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
%{_mandir}/man1/smplayer.1.gz
-
-%if 0%{?fedora} >= 9
- %dir %{_datadir}/kde4/services/ServiceMenus/
- %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-%else
- %dir %{_datadir}/apps/konqueror/
- %dir %{_datadir}/apps/konqueror/servicemenus/
- %{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
-%endif
+%dir %{_datadir}/kde4/services/ServiceMenus/
+%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%changelog
+* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-2
+- fix smtube translations.
+- drop support for Fedora < 9 and EPEL 5, since we need kde4.
+
+* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
+- New release
+- add smtube support
+- use system qtsingleapplication
+- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386
+
* Sat Mar 24 2012 Sérgio Basto <sergio(a)serjux.com> - 0.7.1-1
- New upstream version: 0.7.1, changelog says "This version includes some bug fixes,
some of them important. It's highly recommended to update."
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-15/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 24 Mar 2012 03:21:15 -0000 1.12
+++ sources 6 May 2012 21:33:43 -0000 1.13
@@ -1 +1,2 @@
-e50046399ee918bb7b57e98971425c95 smplayer-0.7.1.tar.bz2
+8f7d3a9c116e956c68976d0e5dbb83dd smplayer-0.8.0.tar.bz2
+e5018fcd9ebdc08658136476ba4843d2 smtube-1.1.tar.bz2
--- smplayer-0.6.9-desktop-files.patch DELETED ---
--- smplayer-0.7.0-system-quazip.patch DELETED ---
--- smplayer_enqueue_kde3.desktop DELETED ---
12 years, 2 months
rpms/smplayer/F-16 smplayer-0.8.0-desktop-files.patch, NONE, 1.1 smplayer-0.8.0-system-qtsingleapplication.patch, NONE, 1.1 smplayer-0.8.0-system-quazip.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 smplayer.spec, 1.15, 1.16 sources, 1.12, 1.13 smplayer-0.6.9-desktop-files.patch, 1.3, NONE smplayer-0.7.0-system-quazip.patch, 1.1, NONE smplayer_enqueue_kde3.desktop, 1.1, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23467
Modified Files:
.cvsignore smplayer.spec sources
Added Files:
smplayer-0.8.0-desktop-files.patch
smplayer-0.8.0-system-qtsingleapplication.patch
smplayer-0.8.0-system-quazip.patch
Removed Files:
smplayer-0.6.9-desktop-files.patch
smplayer-0.7.0-system-quazip.patch
smplayer_enqueue_kde3.desktop
Log Message:
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-2
- fix smtube translations.
- drop support for Fedora < 9 and EPEL 5, since we need kde4.
* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
- New release
- add smtube support
- use system qtsingleapplication
- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386
smplayer-0.8.0-desktop-files.patch:
smplayer.desktop | 2 +-
smplayer_enqueue.desktop | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE smplayer-0.8.0-desktop-files.patch ---
--- smplayer.desktop 2012-03-23 09:57:49.000000000 +0200
+++ smplayer.desktop 2012-04-06 04:39:05.971492030 +0300
@@ -13,7 +13,7 @@
Comment[uk]=Потужний інтерфейс до MPlayer
Comment[eu]=MPlayerrentzako interfaze grafiko handi bat
Comment[zh_CN]=一个优秀的 MPlayer 前端
-Exec=smplayer %U
+Exec=smplayer %f
GenericName=Media Player
GenericName[cs]=Přehrávač multimédií
GenericName[es]=Reproductor multimedia
--- smplayer_enqueue.desktop 2012-03-23 09:57:49.000000000 +0200
+++ smplayer_enqueue.desktop 2012-04-06 04:39:16.295388149 +0300
@@ -1,6 +1,6 @@
[Desktop Entry]
Categories=Qt;KDE;AudioVideo;Player;Video;
-Exec=smplayer -add-to-playlist %U
+Exec=smplayer -add-to-playlist %F
Icon=smplayer
MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;
Name=Enqueue in SMPlayer
smplayer-0.8.0-system-qtsingleapplication.patch:
smtube-1.1/src/smtube.pro | 9 +++------
src/smplayer.pro | 10 +---------
2 files changed, 4 insertions(+), 15 deletions(-)
--- NEW FILE smplayer-0.8.0-system-qtsingleapplication.patch ---
--- smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-03-27 00:46:29.000000000 +0300
+++ smplayer-0.8.0/smtube-1.1/src/smtube.pro 2012-04-06 04:46:13.911416527 +0300
@@ -5,10 +5,11 @@
TEMPLATE = app
QT += network xml
TARGET =
-DEPENDPATH += . qtsingleapplication
-INCLUDEPATH += . qtsingleapplication
+DEPENDPATH += .
+INCLUDEPATH += .
CONFIG += qt warn_on release
+CONFIG += qtsingleapplication
RESOURCES = icons.qrc
@@ -61,10 +62,6 @@
translations/smtube_eu.ts \
translations/smtube_pt.ts
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
-HEADERS += qtsingleapplication.h qtlocalpeer.h
-
unix {
UI_DIR = .ui
MOC_DIR = .moc
--- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300
+++ smplayer-0.8.0/src/smplayer.pro 2012-04-06 04:44:47.313246489 +0300
@@ -3,6 +3,7 @@
CONFIG += qt warn_on
CONFIG += release
+CONFIG += qtsingleapplication
#CONFIG += debug
QT += network xml
@@ -235,15 +236,6 @@
about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \
toolbareditor.ui
-# qtsingleapplication
-contains( DEFINES, SINGLE_INSTANCE ) {
- INCLUDEPATH += qtsingleapplication
- DEPENDPATH += qtsingleapplication
-
- SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
- HEADERS += qtsingleapplication.h qtlocalpeer.h
-}
-
# Find subtitles dialog
contains( DEFINES, FIND_SUBTITLES ) {
DEFINES += DOWNLOAD_SUBS
smplayer-0.8.0-system-quazip.patch:
findsubtitles/findsubtitles.pro | 20 ++------------------
smplayer.pro | 22 ++++------------------
2 files changed, 6 insertions(+), 36 deletions(-)
--- NEW FILE smplayer-0.8.0-system-quazip.patch ---
--- smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-03-31 15:46:16.000000000 +0300
+++ smplayer-0.8.0/src/findsubtitles/findsubtitles.pro 2012-04-27 21:58:55.535383047 +0300
@@ -34,30 +34,14 @@
DEFINES += NO_SMPLAYER_SUPPORT DOWNLOAD_SUBS
contains( DEFINES, DOWNLOAD_SUBS ) {
- INCLUDEPATH += filedownloader quazip
- DEPENDPATH += filedownloader quazip
+ INCLUDEPATH += filedownloader
+ DEPENDPATH += filedownloader
HEADERS += filedownloader.h subchooserdialog.h
SOURCES += filedownloader.cpp subchooserdialog.cpp
FORMS += subchooserdialog.ui
- HEADERS += crypt.h \
- ioapi.h \
- quazip.h \
- quazipfile.h \
- quazipfileinfo.h \
- quazipnewinfo.h \
- unzip.h \
- zip.h
-
- SOURCES += ioapi.c \
- quazip.cpp \
- quazipfile.cpp \
- quazipnewinfo.cpp \
- unzip.c \
- zip.c
-
LIBS += -lz
win32 {
--- smplayer-0.8.0/src/smplayer.pro 2012-04-02 12:09:38.000000000 +0300
+++ smplayer-0.8.0/src/smplayer.pro 2012-04-27 22:03:15.636757443 +0300
@@ -258,31 +258,17 @@
# Download subtitles
contains( DEFINES, DOWNLOAD_SUBS ) {
- INCLUDEPATH += findsubtitles/filedownloader findsubtitles/quazip
- DEPENDPATH += findsubtitles/filedownloader findsubtitles/quazip
+ INCLUDEPATH += findsubtitles/filedownloader
+ DEPENDPATH += findsubtitles/filedownloader
HEADERS += filedownloader.h subchooserdialog.h fixsubs.h
SOURCES += filedownloader.cpp subchooserdialog.cpp fixsubs.cpp
FORMS += subchooserdialog.ui
- HEADERS += crypt.h \
- ioapi.h \
- quazip.h \
- quazipfile.h \
- quazipfileinfo.h \
- quazipnewinfo.h \
- unzip.h \
- zip.h
+ INCLUDEPATH += /usr/include/quazip /usr/include/minizip
- SOURCES += ioapi.c \
- quazip.cpp \
- quazipfile.cpp \
- quazipnewinfo.cpp \
- unzip.c \
- zip.c
-
- LIBS += -lz
+ LIBS += -lz -lquazip
win32 {
INCLUDEPATH += ..\\zlib-1.2.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-16/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore 24 Mar 2012 03:12:14 -0000 1.12
+++ .cvsignore 6 May 2012 21:16:59 -0000 1.13
@@ -1 +1,2 @@
-smplayer-0.7.1.tar.bz2
+smplayer-0.8.0.tar.bz2
+smtube-1.1.tar.bz2
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-16/smplayer.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- smplayer.spec 24 Mar 2012 03:12:14 -0000 1.15
+++ smplayer.spec 6 May 2012 21:16:59 -0000 1.16
@@ -1,35 +1,29 @@
-# define correct path to used binaries
-# works on: fedora >= 7, centos >= 5
-%if 0%{?rhel} > 1
- %define _qt4_qmake %{_libdir}/qt4/bin/qmake
- %define _qt4_lrelease %{_libdir}/qt4/bin/lrelease
-%else
- %define _qt4_lrelease %{_bindir}/lrelease-qt4
-%endif
+%global smtube_ver 1.1
Name: smplayer
-Version: 0.7.1
-Release: 1%{?dist}
+Version: 0.8.0
+Release: 2%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
License: GPLv2+
URL: http://smplayer.sourceforge.net/linux/
-Source0: http://downloads.sourceforge.net/sourceforge/smplayer/smplayer-%{version}...
+Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2
# Add a servicemenu to enqeue files in smplayer's playlist.
-# The first one is for KDE4, the second one for KDE3.
# see also:
# https://sourceforge.net/tracker/?func=detail&atid=913576&aid=2052905&grou...
Source1: smplayer_enqueue_kde4.desktop
-Source2: smplayer_enqueue_kde3.desktop
+Source3: http://downloads.sourceforge.net/smplayer/smtube-%{smtube_ver}.tar.bz2
# Fix regression in Thunar (TODO: re-check in upcoming versions!)
# https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217
-Patch0: smplayer-0.6.9-desktop-files.patch
-Patch1: smplayer-0.7.0-system-quazip.patch
+Patch0: smplayer-0.8.0-desktop-files.patch
+Patch1: smplayer-0.8.0-system-quazip.patch
+Patch2: smplayer-0.8.0-system-qtsingleapplication.patch
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel
BuildRequires: quazip-devel
+BuildRequires: qtsingleapplication-devel
# smplayer without mplayer is quite useless
Requires: mplayer
Requires: kde-filesystem
@@ -44,11 +38,15 @@
%prep
%setup -qn %{name}-%{version}
+%setup -a3 -qn %{name}-%{version}
#remove some bundle sources
rm -rf zlib-1.2.6
rm -rf src/findsubtitles/quazip
+rm -rf src/qtsingleapplication/
+
%patch0 -p0 -b .desktop-files
%patch1 -p1 -b .quazip
+%patch2 -p1 -b .qtsingleapplication
# correction for wrong-file-end-of-line-encoding
%{__sed} -i 's/\r//' *.txt
@@ -57,7 +55,7 @@
mv Changelog.utf8 Changelog
# use lrelease from qt4-devel
-sed -i 's|LRELEASE=lrelease|LRELEASE=%{_qt4_lrelease}|' Makefile
+sed -i 's|LRELEASE=lrelease|LRELEASE=%{_bindir}/lrelease-qt4|' Makefile
# fix path of docs
sed -i 's|DOC_PATH=$(PREFIX)/share/doc/packages/smplayer|DOC_PATH=$(PREFIX)/share/doc/smplayer-%{version}|' Makefile
@@ -71,9 +69,21 @@
%build
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix}
+pushd smtube-%{smtube_ver}
+sed -i 's|lrelease|%{_bindir}/lrelease-qt4|' Makefile
+sed -i 's|qmake|%{_qt4_qmake}|' Makefile
+sed -i 's|/usr/local|%{_prefix}|' Makefile
+sed -i 's|doc/smtube|doc/%{name}-%{version}/smtube|' Makefile
+sed -i 's|smtube/translations|smplayer/translations|' Makefile
+make PREFIX=%{_prefix}
+popd
+
+
%install
-rm -rf %{buildroot}
make QMAKE=%{_qt4_qmake} PREFIX=%{_prefix} DESTDIR=%{buildroot}/ install
+pushd smtube-%{smtube_ver}
+make install DESTDIR=%{buildroot}
+popd
desktop-file-install --delete-original \
--vendor "rpmfusion" \
@@ -86,17 +96,11 @@
--dir %{buildroot}%{_datadir}/applications/ \
%{buildroot}%{_datadir}/applications/%{name}_enqueue.desktop
+desktop-file-validate %{buildroot}%{_datadir}/applications/smtube.desktop
+
# Add servicemenus dependend on the version of KDE:
# https://sourceforge.net/tracker/index.php?func=detail&aid=2052905&group_i...
-%if 0%{?fedora} >= 9
- install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-%else
- install -Dpm 0644 %{SOURCE2} %{buildroot}%{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
-%endif
-
-
-%clean
-rm -rf %{buildroot}
+install -Dpm 0644 %{SOURCE1} %{buildroot}%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%post
touch --no-create %{_datadir}/icons/hicolor
@@ -113,24 +117,29 @@
update-desktop-database &> /dev/null || :
%files
-%defattr(-,root,root,-)
%{_docdir}/%{name}-%{version}/
%{_bindir}/smplayer
+%{_bindir}/smtube
%{_datadir}/applications/rpmfusion-smplayer*.desktop
+%{_datadir}/applications/smtube.desktop
%{_datadir}/icons/hicolor/*/apps/smplayer.png
+%{_datadir}/icons/hicolor/*/apps/smtube.png
%{_datadir}/smplayer/
%{_mandir}/man1/smplayer.1.gz
-
-%if 0%{?fedora} >= 9
- %dir %{_datadir}/kde4/services/ServiceMenus/
- %{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
-%else
- %dir %{_datadir}/apps/konqueror/
- %dir %{_datadir}/apps/konqueror/servicemenus/
- %{_datadir}/apps/konqueror/servicemenus/smplayer_enqueue.desktop
-%endif
+%dir %{_datadir}/kde4/services/ServiceMenus/
+%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%changelog
+* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-2
+- fix smtube translations.
+- drop support for Fedora < 9 and EPEL 5, since we need kde4.
+
+* Sat Apr 28 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.0-1
+- New release
+- add smtube support
+- use system qtsingleapplication
+- a little review with: fedora-review -n smplayer --mock-config fedora-16-i386
+
* Sat Mar 24 2012 Sérgio Basto <sergio(a)serjux.com> - 0.7.1-1
- New upstream version: 0.7.1, changelog says "This version includes some bug fixes,
some of them important. It's highly recommended to update."
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-16/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources 24 Mar 2012 03:12:14 -0000 1.12
+++ sources 6 May 2012 21:16:59 -0000 1.13
@@ -1 +1,2 @@
-e50046399ee918bb7b57e98971425c95 smplayer-0.7.1.tar.bz2
+8f7d3a9c116e956c68976d0e5dbb83dd smplayer-0.8.0.tar.bz2
+e5018fcd9ebdc08658136476ba4843d2 smtube-1.1.tar.bz2
--- smplayer-0.6.9-desktop-files.patch DELETED ---
--- smplayer-0.7.0-system-quazip.patch DELETED ---
--- smplayer_enqueue_kde3.desktop DELETED ---
12 years, 2 months
rpms/smplayer/F-17 smplayer.spec,1.18,1.19
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23052
Modified Files:
smplayer.spec
Log Message:
fedora-view says that is better %global than %define
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/F-17/smplayer.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- smplayer.spec 28 Apr 2012 13:57:17 -0000 1.18
+++ smplayer.spec 6 May 2012 21:10:03 -0000 1.19
@@ -1,4 +1,4 @@
-%define smtube_ver 1.1
+%global smtube_ver 1.1
Name: smplayer
Version: 0.8.0
12 years, 2 months
rpms/smplayer/devel smplayer.spec,1.19,1.20
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv22973
Modified Files:
smplayer.spec
Log Message:
fedora-view says that is better %global than %define
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- smplayer.spec 28 Apr 2012 13:34:56 -0000 1.19
+++ smplayer.spec 6 May 2012 21:08:09 -0000 1.20
@@ -1,4 +1,4 @@
-%define smtube_ver 1.1
+%global smtube_ver 1.1
Name: smplayer
Version: 0.8.0
12 years, 2 months
rpms/wl-kmod/F-17 wl-kmod.spec,1.66,1.67
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/wl-kmod/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20232
Modified Files:
wl-kmod.spec
Log Message:
* Sun May 06 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.8
- rebuild for updated kernel
Index: wl-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/wl-kmod/F-17/wl-kmod.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- wl-kmod.spec 5 May 2012 02:12:37 -0000 1.66
+++ wl-kmod.spec 6 May 2012 19:35:52 -0000 1.67
@@ -7,7 +7,7 @@
Name: wl-kmod
Version: 5.100.82.112
-Release: 2%{?dist}.7
+Release: 2%{?dist}.8
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -83,6 +83,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Sun May 06 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.8
+- rebuild for updated kernel
+
* Sat May 05 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 5.100.82.112-2.7
- rebuild for updated kernel
12 years, 2 months