rpms/devede/devel devede-3.23.0-ac3.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 devede.spec, 1.29, 1.30 sources, 1.23, 1.24 devede-3.22.0-ac3.patch, 1.1, NONE
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28976
Modified Files:
.cvsignore devede.spec sources
Added Files:
devede-3.23.0-ac3.patch
Removed Files:
devede-3.22.0-ac3.patch
Log Message:
* Sun Oct 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 3.23.0-1
- Updated to version 3.23.0
devede-3.23.0-ac3.patch:
devede | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE devede-3.23.0-ac3.patch ---
diff -durN devede-3.23.0.orig/devede devede-3.23.0/devede
--- devede-3.23.0.orig/devede 2012-10-20 20:32:18.000000000 +0200
+++ devede-3.23.0/devede 2012-10-28 11:20:06.587976601 +0100
@@ -262,7 +262,7 @@
global_vars["sub_codepage"]="ISO-8859-1"
global_vars["sub_language"]="EN (ENGLISH)"
global_vars["with_menu"]=True
-global_vars["AC3_fix"]=False
+global_vars["AC3_fix"]=True
global_vars["AC3_fix_ffmpeg"]=False
global_vars["AC3_fix_avconv"]=False
(a,b)=get_cores()
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 27 May 2012 10:39:19 -0000 1.23
+++ .cvsignore 28 Oct 2012 13:12:20 -0000 1.24
@@ -1 +1 @@
-devede-3.22.0.tar.bz2
+devede-3.23.0.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/devel/devede.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- devede.spec 27 May 2012 10:39:19 -0000 1.29
+++ devede.spec 28 Oct 2012 13:12:21 -0000 1.30
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.22.0
+Version: 3.23.0
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -8,7 +8,7 @@
URL: http://www.rastersoft.com/programas/devede.html
Source0: http://www.rastersoft.com/descargas/%{name}-%{version}.tar.bz2
# Enable AC3_fix by default
-Patch0: %{name}-3.22.0-ac3.patch
+Patch0: %{name}-3.23.0-ac3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -123,6 +123,9 @@
%changelog
+* Sun Oct 28 2012 Andrea Musuruane <musuruan(a)gmail.com> 3.23.0-1
+- Updated to version 3.23.0
+
* Sun May 27 2012 Andrea Musuruane <musuruan(a)gmail.com> 3.22.0-1
- Updated to version 3.22.0
- Moved icon in %%{_datadir}/icons/hicolor
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 27 May 2012 10:39:19 -0000 1.23
+++ sources 28 Oct 2012 13:12:21 -0000 1.24
@@ -1 +1 @@
-09ffebefe8903f8d9f2a8f142545e775 devede-3.22.0.tar.bz2
+c6c012630bb2492b1c9146c727681963 devede-3.23.0.tar.bz2
--- devede-3.22.0-ac3.patch DELETED ---
12 years
rpms/mame/F-18 mame.spec,1.73,1.74
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26995
Modified Files:
mame.spec
Log Message:
There is no messnew.txt in 0.147
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/mame.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- mame.spec 28 Oct 2012 06:49:55 -0000 1.73
+++ mame.spec 28 Oct 2012 12:37:17 -0000 1.74
@@ -335,7 +335,7 @@
%endif
%files -n mess
-%doc messnew*.txt
+#doc messnew*.txt
%config(noreplace) %{_sysconfdir}/mess/mess.ini
%dir %{_sysconfdir}/mess
%{_sysconfdir}/skel/.mess
12 years
rpms/mame/F-18 .cvsignore, 1.63, 1.64 mame.spec, 1.72, 1.73 sources, 1.63, 1.64
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv11299
Modified Files:
.cvsignore mame.spec sources
Log Message:
- Reverted to missing 0.147, backporting some changes from devel
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- .cvsignore 8 Oct 2012 17:43:56 -0000 1.63
+++ .cvsignore 28 Oct 2012 06:49:55 -0000 1.64
@@ -1,2 +1,2 @@
mame0147s.exe
-0147u1_diff.zip
+whatsnew_0147.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/mame.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- mame.spec 8 Oct 2012 17:43:56 -0000 1.72
+++ mame.spec 28 Oct 2012 06:49:55 -0000 1.73
@@ -5,7 +5,13 @@
%bcond_with debug
%global baseversion 147
-%global sourceupdate 1
+%global sourceupdate 0
+
+# work around low memory on the RPM Fusion builder
+%bcond_without lowmem
+%if %{with lowmem}
+%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+%endif
Name: mame
%if 0%{?sourceupdate}
@@ -20,9 +26,11 @@
License: MAME License
URL: http://mamedev.org/
Source0: http://mamedev.org/downloader.php?file=releases/%{name}0%{baseversion}s.exe
+#Get from http://mamedev.org/releases/whatsnew_0%{baseversion}.txt and compress
+Source100: whatsnew_0%{baseversion}.zip
%if 0%{?sourceupdate}
#Source updates
-Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -39,13 +47,17 @@
BuildRequires: flac-devel
BuildRequires: GConf2-devel
BuildRequires: gtk2-devel
-# BuildRequires: libjpeg-devel
+%if 0%{?fedora} >= 19
+BuildRequires: libjpeg-devel
+%endif
BuildRequires: p7zip
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
Requires: %{name}-data = %{version}-%{release}
+%if 0%{?fedora} < 19
Provides: bundled(libjpeg) = 8c
+%endif
Provides: bundled(lzma-sdk) = 9.22
%description
@@ -85,7 +97,9 @@
Summary: Multi Emulator Super System
Requires: mess-data = %{version}-%{release}
+%if 0%{?fedora} < 19
Provides: bundled(libjpeg) = 8c
+%endif
Provides: bundled(lzma-sdk) = 9.22
%description -n mess
@@ -129,10 +143,10 @@
%prep
%setup -qcT
+install -pm 644 %{SOURCE100} .
for sourcefile in %{sources}; do
7za x $sourcefile
done
-sed -i '2157d' src/mess/mess.mak
find . -type f -not -name *.png -exec sed -i 's/\r//' {} \;
%if 0%{?sourceupdate}
i=1
@@ -175,8 +189,7 @@
EOF
#make a copy for MESS
-cp %{name}.ini mess.ini
-sed -i 's/%{name}/mess/' mess.ini
+sed 's/%{name}/mess/g' %{name}.ini > mess.ini
%build
@@ -185,7 +198,13 @@
#save some space
MAME_FLAGS="NOWERROR=1 SYMBOLS=1 OPTIMIZE=2 BUILD_EXPAT=0 BUILD_ZLIB=0 \
- BUILD_JPEG=1 BUILD_FLAC=0 SUFFIX64="
+ BUILD_FLAC=0 SUFFIX64="
+
+%if 0%{?fedora} >= 19
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=0"
+%else
+MAME_FLAGS="$MAME_FLAGS BUILD_JPEGLIB=1"
+%endif
%if %{with ldplayer}
make %{?_smp_mflags} $MAME_FLAGS TARGET=ldplayer \
@@ -194,13 +213,13 @@
%if %{with debug}
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+rm -rf obj
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TARGET=mess \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%else
make %{?_smp_mflags} $MAME_FLAGS \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
-
+rm -rf obj
make %{?_smp_mflags} $MAME_FLAGS TARGET=mess\
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%endif
@@ -344,11 +363,7 @@
%changelog
-* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
-- Updated to 0.147u1
-- Dropped missing whatsnew.txt workaround
-
-* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
+* Sun Oct 28 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
- Updated to 0.147
- Merged with mess
- Streamlined the directories installation
@@ -356,6 +371,8 @@
- Fixed mame.6 installation location
- Re-enabled ldplayer
- Cleaned-up ancient Obsoletes/Provides
+- Worked around low memory on the RPM Fusion builder
+- Use system libjpeg-turbo on Fedora 19 and above
* Mon Aug 20 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.146u5-1
- Updated to 0.146u5
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-18/sources,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- sources 8 Oct 2012 17:43:56 -0000 1.63
+++ sources 28 Oct 2012 06:49:55 -0000 1.64
@@ -1,2 +1,2 @@
02b38e27f0840bbd0b637385f16f3747 mame0147s.exe
-7f2dbea383138a6ae2bbaac3b32376d6 0147u1_diff.zip
+0b4bec8581c6cfaa3e0ac75d7d575fa9 whatsnew_0147.zip
12 years
rpms/VirtualBox/devel VirtualBox-4.2.0-mesa.patch, 1.2, 1.3 VirtualBox-4.2.0-xorg17.patch, 1.5, 1.6 VirtualBox.spec, 1.29, 1.30
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32514
Modified Files:
VirtualBox-4.2.0-mesa.patch VirtualBox-4.2.0-xorg17.patch
VirtualBox.spec
Log Message:
* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
- New upstream release.
- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system headers, and
"As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build it".
- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't buid it
on F18 and rawhide, new libxslt and new pdflatex problems.
VirtualBox-4.2.0-mesa.patch:
Config.kmk | 10 ---
src/VBox/Additions/common/crOpenGL/Makefile.kmk | 21 +-----
src/VBox/Additions/common/crOpenGL/fakedri_drv.c | 72 +++++++++++++++++------
src/VBox/Additions/common/crOpenGL/fakedri_drv.h | 21 ++++--
src/VBox/Additions/x11/Makefile.kmk | 1
5 files changed, 74 insertions(+), 51 deletions(-)
Index: VirtualBox-4.2.0-mesa.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.2.0-mesa.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VirtualBox-4.2.0-mesa.patch 23 Sep 2012 13:49:23 -0000 1.2
+++ VirtualBox-4.2.0-mesa.patch 27 Oct 2012 22:11:28 -0000 1.3
@@ -1,6 +1,25 @@
fakedri_drv.c,h:
Just compile with X11 system source and we may remove bundle X11 source code.
+--- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
++++ ./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/
--- ./src/VBox/Additions/x11/Makefile.kmk.orig 2012-09-23 01:00:38.301286632 +0100
+++ ./src/VBox/Additions/x11/Makefile.kmk 2012-09-23 01:00:45.135370696 +0100
@@ -24,7 +24,6 @@ if1of ($(KBUILD_TARGET), freebsd linux n
VirtualBox-4.2.0-xorg17.patch:
vboxmouse/Makefile.kmk | 40 +++++++-------
vboxmouse/vboxmouse.c | 10 +--
vboxvideo/Makefile.kmk | 108 +++++++++++++++++++++++++---------------
vboxvideo/testcase/Makefile.kmk | 4 -
4 files changed, 93 insertions(+), 69 deletions(-)
Index: VirtualBox-4.2.0-xorg17.patch
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-4.2.0-xorg17.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- VirtualBox-4.2.0-xorg17.patch 23 Sep 2012 13:49:23 -0000 1.5
+++ VirtualBox-4.2.0-xorg17.patch 27 Oct 2012 22:11:28 -0000 1.6
@@ -2,25 +2,6 @@
Based on scripts by Michael Meskes <meskes(a)debian.org>, Felix Geyer <debfx-pkg(a)fobos.de>
Author: Sérgio Basto <sergio(a)serjux.com>
---- ./Config.kmk 2012-03-13 13:14:01.000000000 +0000
-+++ ./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/
--- ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk.xorg17 2012-08-03 13:28:42.000000000 +0100
+++ ./src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2012-09-07 03:18:17.460463185 +0100
@@ -30,25 +30,12 @@ if1of ($(KBUILD_TARGET), linux)
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- VirtualBox.spec 30 Sep 2012 19:40:30 -0000 1.29
+++ VirtualBox.spec 27 Oct 2012 22:11:29 -0000 1.30
@@ -14,8 +14,8 @@
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox
-Version: 4.2.0
-Release: 4%{?prerel:.%{prerel}}%{?dist}
+Version: 4.2.4
+Release: 1%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -33,7 +33,6 @@
Patch1: VirtualBox-OSE-4.1.4-noupdate.patch
Patch2: VirtualBox-4.1.18-strings.patch
Patch3: VirtualBox-4.2.0-libcxx.patch
-Patch5: VirtualBox-4.2.0-xorg17.patch
%ifarch x86_64
Patch10: VirtualBox-4.2.0-32bit.patch
%endif
@@ -181,7 +180,6 @@
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
-%patch5 -p1 -b .xorg17
%patch15 -p1 -b .makeself
%ifarch x86_64
%patch10 -p1 -b .32bit
@@ -212,9 +210,15 @@
%build
-./configure --disable-kmods
+./configure --disable-kmods \
+%if 0%{?fedora} > 17
+ --disable-docs
+%endif
+%if 0%{?fedora} < 18
+ --enable-webservice
+%endif
+
#--disable-java
-#--enable-webservice
#--disable-xpcom
. ./env.sh
@@ -230,6 +234,7 @@
VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \
VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
+ VBOX_USE_SYSTEM_XORG_HEADERS=1 \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java \
VBOX_BUILD_PUBLISHER=_%{?vendor:%(echo %{vendor} \
| sed -e 's/ //g' | cut -c 1-9)}%{?!vendor:custom}
@@ -269,7 +274,9 @@
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxheadless
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBalloonCtrl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxballoonctrl
-#ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+%if 0%{?fedora} < 18
+ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxwebsrv
+%endif
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe
@@ -290,8 +297,11 @@
obj/bin/VBoxEFI*.fd
# Documentation
+%if 0%{?fedora} < 18
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/UserManual.pdf
+%endif
+
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
@@ -308,10 +318,12 @@
obj/bin/VBoxTestOGL \
obj/bin/VBoxExtPackHelperApp \
obj/bin/VBoxBalloonCtrl \
+%if 0%{?fedora} < 18
+ obj/bin/vboxwebsrv \
+ obj/bin/webtest \
+%endif
obj/bin/VBoxBFE
-# obj/bin/vboxwebsrv \
-# obj/bin/webtest \
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
obj/bin/nls/*
@@ -327,7 +339,6 @@
# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
-#ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
for S in obj/bin/icons/*
do
SIZE=$(basename $S)
@@ -340,14 +351,18 @@
install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
# Guest X.Org drivers
-# With the xorg17 patch, the _17 driver builds against what's
-# actually available for the system, so would probably be a 1.6
-# driver when compiled on Fedora 10, despite its name
-%global x11_api 17
-
-install -m 0755 -D obj/bin/additions/vboxmouse_drv_%{x11_api}.so \
- $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxmouse_drv.so
-install -m 0755 -D obj/bin/additions/vboxvideo_drv_%{x11_api}.so \
+# Michael Thayer from Oracle wrote: I have applied the patch [1] I posted so that you
+# can build with VBOX_USE_SYSTEM_XORG_HEADERS=1 set in future to only
+# build the X.Org drivers against the installed system headers.
+# also wrote:
+# As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not
+# build it in this case.
+# and
+# Build using local X.Org headers. We assume X.Org Server 1.7 or later.
+#
+# [1] https://www.virtualbox.org/changeset/43588/vbox
+
+install -m 0755 -D obj/bin/additions/vboxvideo_drv_system.so \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
# Guest tools
@@ -495,10 +510,14 @@
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
-#{_bindir}/vboxwebsrv
+%if 0%{?fedora} < 18
+%{_bindir}/vboxwebsrv
+%endif
%{_bindir}/VBoxVRDP
+%if 0%{?fedora} < 18
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
+%endif
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
@@ -509,8 +528,10 @@
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
-#{_libdir}/virtualbox/vboxwebsrv
-#{_libdir}/virtualbox/webtest
+%if 0%{?fedora} < 18
+%{_libdir}/virtualbox/vboxwebsrv
+%{_libdir}/virtualbox/webtest
+%endif
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE
@@ -563,6 +584,14 @@
%changelog
+* Sat Oct 27 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.4-1
+- New upstream release.
+- Drop patch VirtualBox-4.2.0-xorg17.patch and add VBOX_USE_SYSTEM_XORG_HEADERS=1. Changeset r43588,
+https://www.virtualbox.org/changeset/43588/vbox , allow compile vboxvideo with system headers, and
+"As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not build it".
+- enable-webservice on F17 and lower (stables) and disable-docs on F18 and rawhide, can't buid it
+ on F18 and rawhide, new libxslt and new pdflatex problems.
+
* Sun Sep 30 2012 Sérgio Basto <sergio(a)serjux.com> - 4.2.0-4
- On F16, need add one xorg header for xorg-x11-server 1.11.x
12 years, 1 month
rpms/mame/devel mame.spec,1.74,1.75
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv23110
Modified Files:
mame.spec
Log Message:
* Sat Oct 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-2
- Work around low memory on the RPM Fusion builder
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- mame.spec 8 Oct 2012 17:43:51 -0000 1.74
+++ mame.spec 27 Oct 2012 19:15:52 -0000 1.75
@@ -7,13 +7,16 @@
%global baseversion 147
%global sourceupdate 1
+#work around low memory on the RPM Fusion builder
+%global optflags %{optflags} -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+
Name: mame
%if 0%{?sourceupdate}
Version: 0.%{baseversion}u%{sourceupdate}
%else
Version: 0.%{baseversion}
%endif
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Multiple Arcade Machine Emulator
#Files in src/lib/util and src/osd (except src/osd/sdl) are BSD
@@ -175,8 +178,7 @@
EOF
#make a copy for MESS
-cp %{name}.ini mess.ini
-sed -i 's/%{name}/mess/' mess.ini
+sed 's/%{name}/mess/g' %{name}.ini > mess.ini
%build
@@ -194,12 +196,14 @@
%if %{with debug}
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
+rm -rf obj
make %{?_smp_mflags} $MAME_FLAGS DEBUG=1 TARGET=mess \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
%else
make %{?_smp_mflags} $MAME_FLAGS \
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/%{name};\"'" all
+rm -rf obj
make %{?_smp_mflags} $MAME_FLAGS TARGET=mess\
OPT_FLAGS="$RPM_OPT_FLAGS -DINI_PATH='\"%{_sysconfdir}/mess;\"'" all
@@ -344,9 +348,14 @@
%changelog
+* Sat Oct 27 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-2
+- Work around low memory on the RPM Fusion builder
+
* Mon Oct 08 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147u1-1
- Updated to 0.147u1
- Dropped missing whatsnew.txt workaround
+- Fixed incorrect paths in mess.ini
+- Remove the object tree between mame and mess builds to prevent mess using /etc/mame
* Fri Sep 21 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.147-1
- Updated to 0.147
12 years, 1 month
rpms/miro/F-18 .cvsignore,1.4,1.5 miro.spec,1.9,1.10 sources,1.4,1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12599/F-18
Modified Files:
.cvsignore miro.spec sources
Log Message:
* Sat Oct 27 2012 Michel Alexandre Salim <michel@sojourner> - 5.0.4-1
- Update to 5.0.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/miro/F-18/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Aug 2012 00:02:05 -0000 1.4
+++ .cvsignore 27 Oct 2012 15:54:55 -0000 1.5
@@ -1 +1 @@
-miro-5.0.2.tar.gz
+miro-5.0.4.tar.gz
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/F-18/miro.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- miro.spec 27 Sep 2012 06:21:31 -0000 1.9
+++ miro.spec 27 Oct 2012 15:54:55 -0000 1.10
@@ -4,8 +4,8 @@
%bcond_with check
Name: miro
-Version: 5.0.2
-Release: 2%{?dist}
+Version: 5.0.4
+Release: 1%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
@@ -160,6 +160,9 @@
%changelog
+* Sat Oct 27 2012 Michel Alexandre Salim <michel@sojourner> - 5.0.4-1
+- Update to 5.0.4
+
* Wed Sep 26 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0.2-2
- Avoid shipping pre-built codegen binary
Index: sources
===================================================================
RCS file: /cvs/free/rpms/miro/F-18/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Aug 2012 00:02:05 -0000 1.4
+++ sources 27 Oct 2012 15:54:55 -0000 1.5
@@ -1 +1 @@
-803905aee0f58f92b142cfd2b59b89c5 miro-5.0.2.tar.gz
+8a3de8356d2ba9d82f0a00f31ceb446e miro-5.0.4.tar.gz
12 years, 1 month
rpms/miro/F-17 .cvsignore,1.4,1.5 miro.spec,1.8,1.9 sources,1.4,1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12599/F-17
Modified Files:
.cvsignore miro.spec sources
Log Message:
* Sat Oct 27 2012 Michel Alexandre Salim <michel@sojourner> - 5.0.4-1
- Update to 5.0.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/miro/F-17/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Aug 2012 00:02:05 -0000 1.4
+++ .cvsignore 27 Oct 2012 15:54:55 -0000 1.5
@@ -1 +1 @@
-miro-5.0.2.tar.gz
+miro-5.0.4.tar.gz
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/F-17/miro.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- miro.spec 27 Sep 2012 06:21:31 -0000 1.8
+++ miro.spec 27 Oct 2012 15:54:55 -0000 1.9
@@ -4,8 +4,8 @@
%bcond_with check
Name: miro
-Version: 5.0.2
-Release: 2%{?dist}
+Version: 5.0.4
+Release: 1%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
@@ -160,6 +160,9 @@
%changelog
+* Sat Oct 27 2012 Michel Alexandre Salim <michel@sojourner> - 5.0.4-1
+- Update to 5.0.4
+
* Wed Sep 26 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0.2-2
- Avoid shipping pre-built codegen binary
Index: sources
===================================================================
RCS file: /cvs/free/rpms/miro/F-17/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Aug 2012 00:02:05 -0000 1.4
+++ sources 27 Oct 2012 15:54:55 -0000 1.5
@@ -1 +1 @@
-803905aee0f58f92b142cfd2b59b89c5 miro-5.0.2.tar.gz
+8a3de8356d2ba9d82f0a00f31ceb446e miro-5.0.4.tar.gz
12 years, 1 month
rpms/miro/F-16 .cvsignore,1.4,1.5 miro.spec,1.8,1.9 sources,1.4,1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12599/F-16
Modified Files:
.cvsignore miro.spec sources
Log Message:
* Sat Oct 27 2012 Michel Alexandre Salim <michel@sojourner> - 5.0.4-1
- Update to 5.0.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/miro/F-16/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Aug 2012 00:02:05 -0000 1.4
+++ .cvsignore 27 Oct 2012 15:54:55 -0000 1.5
@@ -1 +1 @@
-miro-5.0.2.tar.gz
+miro-5.0.4.tar.gz
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/F-16/miro.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- miro.spec 27 Sep 2012 06:21:31 -0000 1.8
+++ miro.spec 27 Oct 2012 15:54:55 -0000 1.9
@@ -4,8 +4,8 @@
%bcond_with check
Name: miro
-Version: 5.0.2
-Release: 2%{?dist}
+Version: 5.0.4
+Release: 1%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
@@ -160,6 +160,9 @@
%changelog
+* Sat Oct 27 2012 Michel Alexandre Salim <michel@sojourner> - 5.0.4-1
+- Update to 5.0.4
+
* Wed Sep 26 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0.2-2
- Avoid shipping pre-built codegen binary
Index: sources
===================================================================
RCS file: /cvs/free/rpms/miro/F-16/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Aug 2012 00:02:05 -0000 1.4
+++ sources 27 Oct 2012 15:54:55 -0000 1.5
@@ -1 +1 @@
-803905aee0f58f92b142cfd2b59b89c5 miro-5.0.2.tar.gz
+8a3de8356d2ba9d82f0a00f31ceb446e miro-5.0.4.tar.gz
12 years, 1 month
rpms/miro/devel .cvsignore, 1.4, 1.5 miro.spec, 1.9, 1.10 sources, 1.4, 1.5
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/miro/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12599/devel
Modified Files:
.cvsignore miro.spec sources
Log Message:
* Sat Oct 27 2012 Michel Alexandre Salim <michel@sojourner> - 5.0.4-1
- Update to 5.0.4
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/miro/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 8 Aug 2012 00:02:05 -0000 1.4
+++ .cvsignore 27 Oct 2012 15:54:55 -0000 1.5
@@ -1 +1 @@
-miro-5.0.2.tar.gz
+miro-5.0.4.tar.gz
Index: miro.spec
===================================================================
RCS file: /cvs/free/rpms/miro/devel/miro.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- miro.spec 27 Sep 2012 06:21:31 -0000 1.9
+++ miro.spec 27 Oct 2012 15:54:55 -0000 1.10
@@ -4,8 +4,8 @@
%bcond_with check
Name: miro
-Version: 5.0.2
-Release: 2%{?dist}
+Version: 5.0.4
+Release: 1%{?dist}
Summary: Internet TV Player
Group: Applications/Multimedia
@@ -160,6 +160,9 @@
%changelog
+* Sat Oct 27 2012 Michel Alexandre Salim <michel@sojourner> - 5.0.4-1
+- Update to 5.0.4
+
* Wed Sep 26 2012 Michel Salim <salimma(a)fedoraproject.org> - 5.0.2-2
- Avoid shipping pre-built codegen binary
Index: sources
===================================================================
RCS file: /cvs/free/rpms/miro/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 8 Aug 2012 00:02:05 -0000 1.4
+++ sources 27 Oct 2012 15:54:55 -0000 1.5
@@ -1 +1 @@
-803905aee0f58f92b142cfd2b59b89c5 miro-5.0.2.tar.gz
+8a3de8356d2ba9d82f0a00f31ceb446e miro-5.0.4.tar.gz
12 years, 1 month
rpms/freecad/F-18 freecad.spec,1.1,1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/nonfree/rpms/freecad/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9955
Modified Files:
freecad.spec
Log Message:
* Sat Oct 20 2012 John Morris <john(a)zultron.com> - 0.12-9
- Use cmake28 package on el6
- Remove COIN3D_DOC_PATH cmake def (one less warning during build)
Index: freecad.spec
===================================================================
RCS file: /cvs/nonfree/rpms/freecad/F-18/freecad.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- freecad.spec 7 Jul 2012 03:15:42 -0000 1.1
+++ freecad.spec 27 Oct 2012 03:31:27 -0000 1.2
@@ -5,9 +5,9 @@
# This revision is 0.12 final.
%global svnrev 5284
-# Use update cmake package on EL builds.
-%if 0%{?el6}
-%global cmake %cmake28
+# Use updated cmake package on EL builds.
+%if 0%{?rhel}
+%global cmake %cmake28 -DBoost_NO_BOOST_CMAKE=ON
%endif
# Some configuration options for other environments
@@ -23,7 +23,7 @@
Name: freecad
Version: 0.12
-Release: 7%{?dist}
+Release: 9%{?dist}
Summary: A general purpose 3D CAD modeler
Group: Applications/Engineering
@@ -60,7 +60,12 @@
# Utilities
-BuildRequires: cmake doxygen swig
+%if (0%{?rhel} == 6)
+BuildRequires: cmake28
+%else
+BuildRequires: cmake
+%endif
+BuildRequires: doxygen graphviz swig
BuildRequires: gcc-gfortran
BuildRequires: gettext
BuildRequires: dos2unix
@@ -100,6 +105,7 @@
# Needed for plugin support and is not a soname dependency.
Requires: python-pivy
+Requires: PyQt4
Requires: hicolor-icon-theme
# plugins and private shared libs in %%{_libdir}/freecad/lib are private;
@@ -170,7 +176,7 @@
-DDOCDIR=%{_docdir}/%{name} \
-DCOIN3D_INCLUDE_DIR=%{_includedir}/Coin2 \
-DCOIN3D_DOC_PATH=%{_datadir}/Coin2/Coin \
- %if %{occ}
+%if %{occ}
-DUSE_OCC=TRUE \
%endif
%if ! %{bundled_smesh}
@@ -282,10 +288,17 @@
%changelog
+* Sat Oct 20 2012 John Morris <john(a)zultron.com> - 0.12-9
+- Use cmake28 package on el6
+- Remove COIN3D_DOC_PATH cmake def (one less warning during build)
+
+* Wed Sep 26 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-8
+- Rebuild for boost 1.50.
+
* Thu Jul 05 2012 Richard Shaw <hobbes1069(a)gmail.com> - 0.12-7
- Remove BuildRequires: tbb-devel and gts-devel
- Add missing license files to %%doc.
-- Add missing build requirement for hicolor-icon-theme.
+- Add missing requirement for hicolor-icon-theme.
- Fix excessive linking issue.
- Other minor spec updates.
12 years, 1 month