rpms/xbmc/devel xbmc.spec,1.50,1.51
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xbmc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15823
Modified Files:
xbmc.spec
Log Message:
Switch to pkgconfig(libudev)
Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xbmc.spec 1 Jul 2012 11:59:24 -0000 1.50
+++ xbmc.spec 11 Jul 2012 18:21:22 -0000 1.51
@@ -5,7 +5,7 @@
Name: xbmc
Version: 11.0
-Release: 7%{?dist}
+Release: 8%{?dist}
URL: http://www.xbmc.org/
Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -137,7 +137,7 @@
BuildRequires: libmicrohttpd-devel
BuildRequires: expat-devel
BuildRequires: zip
-BuildRequires: libudev-devel
+BuildRequires: pkgconfig(libudev)
# for AirPlay support
BuildRequires: libplist-devel
%if 0%{?el6}
@@ -318,6 +318,9 @@
#%%{_includedir}/xbmc/xbmcclient.h
%changelog
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 11.0-8
+- Switch to pkgconfig(libudev)
+
* Sun Jul 01 2012 Ken Dreyer <ktdreyer@ktdreyer..com> - 11.0-7
- Set up with_* conditionals for optional dependencies
- Disable hdhomerun and crystalhd for EPEL (#2339)
11 years, 9 months
rpms/dvdstyler/devel dvdstyler.spec,1.18,1.19
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/dvdstyler/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15448
Modified Files:
dvdstyler.spec
Log Message:
Switch to pkgconfig(libudev)
Index: dvdstyler.spec
===================================================================
RCS file: /cvs/free/rpms/dvdstyler/devel/dvdstyler.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dvdstyler.spec 26 Jun 2012 09:06:40 -0000 1.18
+++ dvdstyler.spec 11 Jul 2012 18:18:41 -0000 1.19
@@ -1,7 +1,7 @@
Name: dvdstyler
Epoch: 1
Version: 2.0
-Release: 0.4.rc1%{?dist}
+Release: 0.5.rc1%{?dist}
Summary: Cross-platform DVD authoring application
Group: Applications/Multimedia
@@ -26,7 +26,7 @@
# mpeg
BuildRequires: dvdauthor
# iso/burn
-BuildRequires: libudev-devel
+BuildRequires: pkgconfig(libudev)
BuildRequires: mkisofs
BuildRequires: dvd+rw-tools
#images
@@ -97,6 +97,9 @@
%{_mandir}/*/*.gz
%changelog
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0-0.5.rc1
+- Switch to pkgconfig(libudev)
+
* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1:2.0-0.4.rc1
- Rebuilt for FFmpeg
11 years, 9 months
rpms/guvcview/devel guvcview.spec,1.12,1.13
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/guvcview/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv14057
Modified Files:
guvcview.spec
Log Message:
Rebuilt for libudev1
Index: guvcview.spec
===================================================================
RCS file: /cvs/free/rpms/guvcview/devel/guvcview.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- guvcview.spec 26 Jun 2012 09:07:20 -0000 1.12
+++ guvcview.spec 11 Jul 2012 18:00:18 -0000 1.13
@@ -1,6 +1,6 @@
Name: guvcview
Version: 1.5.3
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: GTK+ UVC Viewer and Capturer
Group: Amusements/Graphics
# fixme: ask upstream about license, many source files claim to be
@@ -73,6 +73,9 @@
%changelog
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.5.3-3
+- Rebuilt for libudev1
+
* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.5.3-2
- Rebuilt for FFmpeg
11 years, 9 months
rpms/libva-intel-driver/devel libva-intel-driver.spec,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libva-intel-driver/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13788
Modified Files:
libva-intel-driver.spec
Log Message:
Rebuilt for systemd-devel
Index: libva-intel-driver.spec
===================================================================
RCS file: /cvs/free/rpms/libva-intel-driver/devel/libva-intel-driver.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libva-intel-driver.spec 4 Jun 2012 19:28:32 -0000 1.2
+++ libva-intel-driver.spec 11 Jul 2012 17:58:16 -0000 1.3
@@ -2,7 +2,7 @@
Name: libva-intel-driver
Version: 1.0.18
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: HW video decode support for Intel integrated graphics
Group: System Environment/Libraries
License: MIT and EPL
@@ -15,7 +15,11 @@
BuildRequires: libtool
%{?_with_gen4asm:BuildRequires: intel-gen4asm >= 1.2}
-BuildRequires: libudev-devel
+%if 0%{?fedora} > 17 || 0%{?rhel} > 6
+BuildRequires: systemd-devel
+%else
+BuildRequires: libudev-devel
+%endif
BuildRequires: libXext-devel
BuildRequires: libXfixes-devel
BuildRequires: libdrm-devel >= 2.4.23
@@ -73,6 +77,9 @@
%changelog
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-2
+- Switch to systemd-devel
+
* Mon Jun 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.18-1
- Update to 1.0.18
11 years, 9 months
rpms/vlc/EL-6 vlc-2.0.2-xcb_discard.patch, NONE, 1.1 vlc.spec, 1.156, 1.157
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/EL-6
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1202/EL-6
Modified Files:
vlc.spec
Added Files:
vlc-2.0.2-xcb_discard.patch
Log Message:
Fix build with xcb
vlc-2.0.2-xcb_discard.patch:
xcb.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE vlc-2.0.2-xcb_discard.patch ---
diff -up vlc-2.0.2/modules/access/screen/xcb.c.discard vlc-2.0.2/modules/access/screen/xcb.c
--- vlc-2.0.2/modules/access/screen/xcb.c.discard 2011-12-08 19:00:26.000000000 +0100
+++ vlc-2.0.2/modules/access/screen/xcb.c 2012-07-11 15:07:43.092366202 +0200
@@ -319,7 +319,11 @@ static void Demux (void *data)
msg_Err (demux, "bad X11 drawable 0x%08"PRIx32, sys->window);
discard:
if (sys->follow_mouse)
+#if 0
xcb_discard_reply (conn, gc.sequence);
+#else
+ msg_Warn (demux, "xcb_discard_reply not available in libxcb < 1.6") ;
+#endif
return;
}
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/EL-6/vlc.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- vlc.spec 4 Jul 2012 16:44:29 -0000 1.156
+++ vlc.spec 11 Jul 2012 14:44:28 -0000 1.157
@@ -15,6 +15,7 @@
%global _with_xvidcore --with-xvidcore
%global _with_live555 --with-live555
%global _with_vaapi --with-vaapi
+%global _with_xcb 1
%endif
%if 0%{?fedora}
%global _with_fluidsyth 1
@@ -28,11 +29,12 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 2.0.2
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
+Patch0: vlc-2.0.2-xcb_discard.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -140,7 +142,10 @@
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libXpm-devel
+%{?_with_xcb:
+BuildRequires: libxcb-devel
BuildRequires: xcb-util-devel
+}
BuildRequires: xorg-x11-proto-devel
@@ -210,6 +215,14 @@
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
+%if 0%{?rhel}
+%patch0 -p1 -b .xcb_discard
+%{?_with_xcb:
+sed -i -e "s|xcb >= 1.6|xcb >= 1.5|" configure configure.ac
+touch -r config.h.in configure configure.ac
+}
+%endif
+
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
@@ -495,6 +508,9 @@
%changelog
+* Wed Jul 11 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-3
+- Fix build of xcb
+
* Wed Jul 04 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.2-2
- Rework BR and RPM conditionals
- Drop support for anything below EL-6 and current Fedora.
11 years, 9 months
rpms/libspotify/devel .cvsignore, 1.3, 1.4 libspotify.spec, 1.2, 1.3 sources, 1.3, 1.4
by Jonathan Dieter
Author: jdieter
Update of /cvs/nonfree/rpms/libspotify/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28603/devel
Modified Files:
.cvsignore libspotify.spec sources
Log Message:
Add support for armv5tel, armv6l and armv7l
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/libspotify/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 28 Jun 2012 18:47:23 -0000 1.3
+++ .cvsignore 11 Jul 2012 13:33:46 -0000 1.4
@@ -1,2 +1,5 @@
libspotify-12.1.51-Linux-i686-release.tar.gz
libspotify-12.1.51-Linux-x86_64-release.tar.gz
+libspotify-12.1.51-Linux-armv5-release.tar.gz
+libspotify-12.1.51-Linux-armv6-release.tar.gz
+libspotify-12.1.51-Linux-armv7-release.tar.gz
Index: libspotify.spec
===================================================================
RCS file: /cvs/nonfree/rpms/libspotify/devel/libspotify.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libspotify.spec 28 Jun 2012 18:47:23 -0000 1.2
+++ libspotify.spec 11 Jul 2012 13:33:46 -0000 1.3
@@ -1,13 +1,17 @@
Name: libspotify
Version: 12.1.51
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Official Spotify API
Group: Development/Libraries
License: Redistributable, no modification permitted
URL: http://developer.spotify.com/en/libspotify/overview/
Source0: http://developer.spotify.com/download/libspotify/libspotify-%{version}-Li...
Source1: http://developer.spotify.com/download/libspotify/libspotify-%{version}-Li...
+Source2: http://developer.spotify.com/download/libspotify/libspotify-%{version}-Li...
+Source3: http://developer.spotify.com/download/libspotify/libspotify-%{version}-Li...
+Source4: http://developer.spotify.com/download/libspotify/libspotify-%{version}-Li...
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+ExclusiveArch: i686 x86_64 armv5tel armv6l armv7l
%description
libspotify is the official Spotify API. Applications can use this API to play
@@ -22,16 +26,26 @@
This contains the files needed to develop using libspotify
%prep
-%ifarch %{ix86}
+%ifarch i686
%setup -q -b 0 -n %{name}-%{version}-Linux-i686-release
%endif
%ifarch x86_64
%setup -q -b 1 -n %{name}-%{version}-Linux-x86_64-release
+# There must be a prettier way of doing this
sed -i s/"\/lib\/"/"\/lib64\/"/g Makefile
sed -i s/"\/lib$"/"\/lib64"/g Makefile
sed -i s/"\/lib "/"\/lib64 "/g Makefile
%endif
-%ifnarch %{ix86} x86_64
+%ifarch armv5tel
+%setup -q -b 2 -n %{name}-%{version}-Linux-armv5-release
+%endif
+%ifarch armv6l
+%setup -q -b 3 -n %{name}-%{version}-Linux-armv6-release
+%endif
+%ifarch armv7l
+%setup -q -b 4 -n %{name}-%{version}-Linux-armv7-release
+%endif
+%ifnarch i686 x86_64 armv5tel armv6l armv7l
echo "This cpu architecture is not supported"
exit 1
%endif
@@ -41,7 +55,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-%ifnarch %{ix86} x86_64
+%ifnarch i686 x86_64 armv5tel armv6l armv7l
echo "This cpu architecture is not supported"
exit 1
%endif
@@ -81,6 +95,9 @@
%changelog
+* Wed Jul 11 2012 Jonathan Dieter <jdieter(a)gmail.com> - 12.1.51-2
+- Add in armv5, armv6 and armv7
+
* Thu Jun 28 2012 Jonathan Dieter <jdieter(a)gmail.com> - 12.1.51-1
- Update to 12.1.51
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/libspotify/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 28 Jun 2012 18:47:23 -0000 1.3
+++ sources 11 Jul 2012 13:33:46 -0000 1.4
@@ -1,2 +1,5 @@
04735b890da0b1fc7f1f14e68a5293de libspotify-12.1.51-Linux-i686-release.tar.gz
83efddcc195d6ff12b24c97c767a5e45 libspotify-12.1.51-Linux-x86_64-release.tar.gz
+a7fbd6e248dc4d350f044f0729f1dc40 libspotify-12.1.51-Linux-armv5-release.tar.gz
+11c92c757ff316a46e64d518d6d45b05 libspotify-12.1.51-Linux-armv6-release.tar.gz
+eb7e98849b3bb6d364fa74034602afbf libspotify-12.1.51-Linux-armv7-release.tar.gz
11 years, 9 months
rpms/alsa-plugins-freeworld/devel alsa-plugins-1.0.25-ffmpeg54.patch, NONE, 1.1 alsa-plugins-freeworld.spec, 1.10, 1.11
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/alsa-plugins-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv10315/devel
Modified Files:
alsa-plugins-freeworld.spec
Added Files:
alsa-plugins-1.0.25-ffmpeg54.patch
Log Message:
Fix build with ffmpeg54
alsa-plugins-1.0.25-ffmpeg54.patch:
pcm_a52.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
--- NEW FILE alsa-plugins-1.0.25-ffmpeg54.patch ---
diff -up alsa-plugins-1.0.25/a52/pcm_a52.c.ffmpeg54 alsa-plugins-1.0.25/a52/pcm_a52.c
--- alsa-plugins-1.0.25/a52/pcm_a52.c.ffmpeg54 2012-01-25 08:57:07.000000000 +0100
+++ alsa-plugins-1.0.25/a52/pcm_a52.c 2012-07-11 00:03:05.155570317 +0200
@@ -444,13 +444,25 @@ static int a52_prepare(snd_pcm_ioplug_t
#if LIBAVCODEC_VERSION_MAJOR > 52 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 3)
switch (io->channels) {
case 2:
+#if LIBAVCODEC_VERSION_MAJOR < 53
rec->avctx->channel_layout = CH_LAYOUT_STEREO;
+#else
+ rec->avctx->channel_layout = AV_CH_LAYOUT_STEREO;
+#endif
break;
case 4:
+#if LIBAVCODEC_VERSION_MAJOR < 53
rec->avctx->channel_layout = CH_LAYOUT_QUAD;
+#else
+ rec->avctx->channel_layout = AV_CH_LAYOUT_QUAD;
+#endif
break;
case 6:
+#if LIBAVCODEC_VERSION_MAJOR < 53
rec->avctx->channel_layout = CH_LAYOUT_5POINT1;
+#else
+ rec->avctx->channel_layout = AV_CH_LAYOUT_5POINT1;
+#endif
break;
default:
break;
Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/alsa-plugins-freeworld.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- alsa-plugins-freeworld.spec 10 Jul 2012 21:43:38 -0000 1.10
+++ alsa-plugins-freeworld.spec 10 Jul 2012 22:09:11 -0000 1.11
@@ -10,6 +10,7 @@
Source1: a52.conf
Source2: lavcrate.conf
Patch0: alsa-plugins-1.0.25-gcc47.patch
+Patch1: alsa-plugins-1.0.25-ffmpeg54.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= 1.0.24
@@ -48,6 +49,7 @@
%prep
%setup -q -n alsa-plugins-%{version}%{?prever}
%patch0 -p1 -b .gcc47
+%patch1 -p1 -b .ffmpeg54
%build
export CPPFLAGS="$(pkg-config --cflags libavcodec)"
11 years, 9 months
rpms/alsa-plugins-freeworld/devel alsa-plugins-1.0.25-gcc47.patch, NONE, 1.1 alsa-plugins-freeworld.spec, 1.9, 1.10 alsa-plugins-1.0.24-backport.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/alsa-plugins-freeworld/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7948/devel
Modified Files:
alsa-plugins-freeworld.spec
Added Files:
alsa-plugins-1.0.25-gcc47.patch
Removed Files:
alsa-plugins-1.0.24-backport.patch
Log Message:
Fix build with recent gcc47
alsa-plugins-1.0.25-gcc47.patch:
pcm_usb_stream.c | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE alsa-plugins-1.0.25-gcc47.patch ---
diff -up alsa-plugins-1.0.25/usb_stream/pcm_usb_stream.c.gcc47 alsa-plugins-1.0.25/usb_stream/pcm_usb_stream.c
--- alsa-plugins-1.0.25/usb_stream/pcm_usb_stream.c.gcc47 2012-01-25 08:57:07.000000000 +0100
+++ alsa-plugins-1.0.25/usb_stream/pcm_usb_stream.c 2012-07-10 23:36:46.803877412 +0200
@@ -20,6 +20,8 @@
#include <byteswap.h>
#define _GNU_SOURCE
+#define __USE_GNU
+#include <unistd.h>
#include <sys/mman.h>
#include <sys/shm.h>
#include <sys/ioctl.h>
Index: alsa-plugins-freeworld.spec
===================================================================
RCS file: /cvs/free/rpms/alsa-plugins-freeworld/devel/alsa-plugins-freeworld.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- alsa-plugins-freeworld.spec 26 Jun 2012 07:45:17 -0000 1.9
+++ alsa-plugins-freeworld.spec 10 Jul 2012 21:43:38 -0000 1.10
@@ -1,6 +1,6 @@
Name: alsa-plugins-freeworld
Version: 1.0.25
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: The ALSA Plugins - freeworld version
# All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
License: LGPLv2+
@@ -9,6 +9,7 @@
Source0: ftp://ftp.alsa-project.org/pub/plugins/alsa-plugins-%{version}.tar.bz2
Source1: a52.conf
Source2: lavcrate.conf
+Patch0: alsa-plugins-1.0.25-gcc47.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel >= 1.0.24
@@ -46,6 +47,7 @@
%prep
%setup -q -n alsa-plugins-%{version}%{?prever}
+%patch0 -p1 -b .gcc47
%build
export CPPFLAGS="$(pkg-config --cflags libavcodec)"
@@ -105,6 +107,9 @@
%changelog
+* Tue Jul 10 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.25-3
+- Fix build with gcc47
+
* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.25-2
- Rebuilt for FFmpeg
--- alsa-plugins-1.0.24-backport.patch DELETED ---
11 years, 10 months
rpms/bombono-dvd/devel bombono-dvd.spec,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/bombono-dvd/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30065
Modified Files:
bombono-dvd.spec
Log Message:
Add ExclusiveArch
Index: bombono-dvd.spec
===================================================================
RCS file: /cvs/free/rpms/bombono-dvd/devel/bombono-dvd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bombono-dvd.spec 26 Jun 2012 09:05:57 -0000 1.4
+++ bombono-dvd.spec 9 Jul 2012 13:18:35 -0000 1.5
@@ -3,7 +3,7 @@
Name: bombono-dvd
Version: 1.2.0
-Release: %{rel_nr}%{rel_tag}%{?dist}.1
+Release: %{rel_nr}%{rel_tag}%{?dist}.2
Summary: DVD authoring program with nice and clean GUI
# License breakdown in README.
License: GPLv2 and GPLv2+ and Boost and Python and LGPLv2+
@@ -15,6 +15,9 @@
# tar czf bombono-dvd-1.2.0.20120616gitcdab110.tar.gz --exclude .git bombono-dvd
Source: bombono-dvd-%{version}-%{rel_nr}%{rel_tag}.tar.gz
+# needs to match TBB - from adobe-source-libraries
+ExclusiveArch: i686 x86_64 ia64
+
BuildRequires: adobe-source-libraries-devel
BuildRequires: boost-devel
BuildRequires: desktop-file-utils
@@ -104,6 +107,9 @@
%{_mandir}/man1/*
%changelog
+* Mon Jul 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.0-4.20120616gitcdab110.2
+- Add ExclusiveArch - inherited from TBB
+
* Tue Jun 26 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.0-4.20120616gitcdab110.1
- Rebuilt for FFmpeg
11 years, 10 months
rpms/VirtualBox/devel VirtualBox-OSE-4.1.6-strings.patch, 1.3, 1.4 VirtualBox.spec, 1.13, 1.14
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32364
Modified Files:
VirtualBox-OSE-4.1.6-strings.patch VirtualBox.spec
Log Message:
Improve some strings suggest on rfbz #1826
VirtualBox-OSE-4.1.6-strings.patch:
Frontends/VirtualBox/src/main.cpp | 22 +++++++++++-----------
Installer/linux/VBox.sh | 13 ++++++++-----
VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 23 insertions(+), 20 deletions(-)
Index: VirtualBox-OSE-4.1.6-strings.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE-4.1.6-strings.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VirtualBox-OSE-4.1.6-strings.patch 16 Jun 2012 14:32:47 -0000 1.3
+++ VirtualBox-OSE-4.1.6-strings.patch 9 Jul 2012 04:27:12 -0000 1.4
@@ -1,8 +1,11 @@
-From: Sérgio Basto
-Subject: Rebased for 4.1.16
-Date: Sat Jun 16 2012
+* 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 3a6d9a3d4f8d9084759fe871033b6b4a990aa761 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak(a)v3.sk>
Date: Mon, 10 May 2010 12:08:47 -0400
Subject: [PATCH] Replace some strings
@@ -14,9 +17,10 @@
src/VBox/VMM/VMMR3/VM.cpp | 8 ++++----
3 files changed, 20 insertions(+), 19 deletions(-)
-diff -urp VirtualBox-4.1.16.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.16/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.16.orig/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-05-22 14:11:30.000000000 +0100
-+++ VirtualBox-4.1.16/src/VBox/Frontends/VirtualBox/src/main.cpp 2012-06-16 10:13:57.881394005 +0100
+
+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
);
@@ -43,7 +47,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>'/etc/sysconfig/modules/VirtualBox.modules'</font><br/><br/>"
++ " <font color=blue>'/etc/sysconfig/modules/VirtualBox.modules'</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."
@@ -61,15 +65,15 @@
);
#if defined(DEBUG) && defined(Q_WS_X11) && defined(RT_OS_LINUX)
-diff -urp VirtualBox-4.1.16.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.16/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.16.orig/src/VBox/Installer/linux/VBox.sh 2012-05-22 14:11:56.000000000 +0100
-+++ VirtualBox-4.1.16/src/VBox/Installer/linux/VBox.sh 2012-06-16 10:23:36.793849025 +0100
+diff -Nurp VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh
+--- VirtualBox-4.1.18/src/VBox/Installer/linux/VBox.sh 2012-06-20 14:17:29.000000000 +0100
++++ VirtualBox-4.1.18.new2/src/VBox/Installer/linux/VBox.sh 2012-07-09 05:02:47.158108166 +0100
@@ -32,19 +32,22 @@ elif ! lsmod|grep -q vboxdrv; then
cat << EOF
WARNING: The vboxdrv kernel module is not loaded. Either there is no module
available for the current kernel (`uname -r`) or it failed to
- load. Please recompile the kernel module and install it by
-+ load. Reboot the computer, or insert the kernel module by executing
++ load. Reboot the computer or load the kernel module by executing
- sudo /etc/init.d/vboxdrv setup
+ '/etc/sysconfig/modules/VirtualBox.modules' (as root)
@@ -79,7 +83,7 @@
elif [ ! -c /dev/vboxdrv ]; then
cat << EOF
-WARNING: The character device /dev/vboxdrv does not exist. Try
-+WARNING: The character device /dev/vboxdrv does not exist. Try running
++WARNING: The character device /dev/vboxdrv does not exist. Try executing
- sudo /etc/init.d/vboxdrv restart
+ '/sbin/udevadm control --reload-rules' (as root)
@@ -92,16 +96,16 @@
You will not be able to start VMs until this problem is fixed.
EOF
-diff -urp VirtualBox-4.1.16.orig/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-4.1.16/src/VBox/VMM/VMMR3/VM.cpp
---- VirtualBox-4.1.16.orig/src/VBox/VMM/VMMR3/VM.cpp 2012-05-22 14:13:00.000000000 +0100
-+++ VirtualBox-4.1.16/src/VBox/VMM/VMMR3/VM.cpp 2012-06-16 10:10:39.047479661 +0100
+diff -Nurp VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp
+--- VirtualBox-4.1.18/src/VBox/VMM/VMMR3/VM.cpp 2012-06-20 14:18:34.000000000 +0100
++++ VirtualBox-4.1.18.new2/src/VBox/VMM/VMMR3/VM.cpp 2012-07-09 05:01:48.544521745 +0100
@@ -375,8 +375,8 @@ VMMR3DECL(int) VMR3Create(uint32_t cCp
#ifdef RT_OS_LINUX
pszError = N_("VirtualBox kernel driver not loaded. The vboxdrv kernel module "
"was either not loaded or /dev/vboxdrv is not set up properly. "
- "Re-setup the kernel module by executing "
- "'/etc/init.d/vboxdrv setup' as root");
-+ "Reboot the computer, or insert the kernel module by executing "
++ "Reboot the computer or load the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not loaded");
@@ -112,9 +116,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. Insert the kernel module by executing "
++ "reason. Load the kernel module by executing "
+ "'/etc/sysconfig/modules/VirtualBox.modules' as root");
#else
pszError = N_("VirtualBox kernel driver not installed");
#endif
-Only in VirtualBox-4.1.16/src/VBox/VMM/VMMR3: VM.cpp.orig
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- VirtualBox.spec 21 Jun 2012 03:00:25 -0000 1.13
+++ VirtualBox.spec 9 Jul 2012 04:27:12 -0000 1.14
@@ -15,7 +15,7 @@
Name: VirtualBox
Version: 4.1.18
-Release: 1%{?prerel:.%{prerel}}%{?dist}
+Release: 2%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
11 years, 10 months