rpms/VirtualBox/devel VirtualBox.spec,1.1,1.2
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26298
Modified Files:
VirtualBox.spec
Log Message:
* Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-5
- Bump a release, to build a new tag.
Index: VirtualBox.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- VirtualBox.spec 16 May 2012 02:28:05 -0000 1.1
+++ VirtualBox.spec 16 May 2012 02:40:12 -0000 1.2
@@ -17,7 +17,7 @@
Name: VirtualBox
Version: 4.1.14
-Release: 4%{?prerel:.%{prerel}}%{?dist}
+Release: 5%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
@@ -544,6 +544,9 @@
%changelog
+* Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-5
+- Bump a release, to build a new tag.
+
* Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-4
- Rename to VirtualBox, rfbz #1826
12 years, 4 months
rpms/VirtualBox/devel Makefile,1.1,1.2
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25881
Modified Files:
Makefile
Log Message:
fix Makefile
Index: Makefile
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 21 Apr 2009 04:53:10 -0000 1.1
+++ Makefile 16 May 2012 02:30:38 -0000 1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: VirtualBox-OSE
+# Makefile for source rpm: VirtualBox
# $Id$
-NAME := VirtualBox-OSE
+NAME := VirtualBox
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
12 years, 4 months
rpms/VirtualBox/devel VirtualBox.spec, NONE, 1.1 VirtualBox-OSE.spec, 1.96, NONE
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25754
Added Files:
VirtualBox.spec
Removed Files:
VirtualBox-OSE.spec
Log Message:
move VirtualBox-OSE.spec to VirtualBox.spec
--- NEW FILE VirtualBox.spec ---
%{!?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 takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
# -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
# In prerelease builds (such as betas), this package has the same
# major version number, while the kernel module abi is not guarranteed
# to be stable. This is so that we force the module update in sync with
# userspace.
#global prerel beta3
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
Name: VirtualBox
Version: 4.1.14
Release: 4%{?prerel:.%{prerel}}%{?dist}
Summary: A general-purpose full virtualizer for PC hardware
Group: Development/Tools
License: GPLv2 or (GPLv2 and CDDL)
URL: http://www.virtualbox.org/wiki/VirtualBox
Source0: http://dlc.sun.com.edgesuite.net/virtualbox/%{version}%{?prereltag}/Virtu...
Source3: VirtualBox-OSE-90-vboxdrv.rules
Source5: VirtualBox-OSE-60-vboxguest.rules
Source6: VirtualBox-OSE.modules
Source7: VirtualBox-OSE-guest.modules
Source8: VirtualBox-OSE-vboxresize.desktop
Source9: VirtualBox-OSE-00-vboxvideo.conf
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
Patch5: VirtualBox-OSE-4.1.4-xorg17.patch
Patch9: VirtualBox-OSE-3.2.4-optflags.patch
Patch10: VirtualBox-OSE-4.0.0-32bit.patch
Patch11: VirtualBox-OSE-3.2.0-visibility.patch
Patch12: VirtualBox-OSE-3.2.10-noansi.patch
Patch15: VirtualBox-OSE-4.0.0-makeself.patch
Patch16: VirtualBox-OSE-4.1.2-usblib.patch
Patch17: VirtualBox-OSE-4.0.0-beramono.patch
Patch18: VirtualBox-OSE-4.0.2-aiobug.patch
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
BuildRequires: SDL-devel xalan-c-devel
BuildRequires: openssl-devel
BuildRequires: libcurl-devel
BuildRequires: dev86 iasl libxslt-devel xerces-c-devel libIDL-devel
BuildRequires: yasm
BuildRequires: pulseaudio-libs-devel
BuildRequires: python-devel
BuildRequires: desktop-file-utils
BuildRequires: libcap-devel
BuildRequires: qt4-devel
BuildRequires: gsoap-devel
BuildRequires: xz
BuildRequires: pam-devel
BuildRequires: mkisofs
BuildRequires: java-devel >= 1.6
BuildRequires: /usr/bin/pdflatex
BuildRequires: libpng-devel
# For the X11 module
BuildRequires: libdrm-devel
BuildRequires: libpciaccess-devel
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libOSMesa-devel
BuildRequires: pixman-devel
BuildRequires: xorg-x11-proto-devel
BuildRequires: xorg-x11-server-source
BuildRequires: xorg-x11-server-devel
BuildRequires: libXcursor-devel
BuildRequires: libXcomposite-devel
BuildRequires: libXmu-devel
# Plague-specific weirdness
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
ExclusiveArch: i686 x86_64
%else %if 0%{?fedora} > 10
ExclusiveArch: i586 x86_64
%else
ExclusiveArch: i386 x86_64
%endif
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Provides: %{name}-OSE = %{version}-%{release}
Obsoletes: %{name}-OSE < %{version}-%{release}
Requires: %{name}-kmod = %{version}%{?prereltag}
Provides: %{name}-kmod-common = %{version}%{?prereltag}
Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag}
Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag}
Conflicts: %{name}-guest <= %{version}-%{release}
%description
A general-purpose full virtualizer and emulator for 32-bit and
64-bit x86 based PC-compatible machines.
%package devel
Summary: %{name} SDK
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: python-%{name} = %{version}-%{release}
Provides: %{name}-OSE-devel = %{version}-%{release}
Obsoletes: %{name}-OSE-devel < %{version}-%{release}
%description devel
%{name} Software Development Kit.
%package -n python-%{name}
Summary: Python bindings for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Provides: python-%{name}-OSE = %{version}-%{release}
Obsoletes: python-%{name}-OSE < %{version}-%{release}
%description -n python-%{name}
Python XPCOM bindings to %{name}.
%package guest
Summary: %{name} Guest Additions
Group: System Environment/Base
Provides: %{name}-OSE-guest = %{version}-%{release}
Obsoletes: %{name}-OSE-guest < %{version}-%{release}
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}
Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag}
Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag}
Requires: xorg-x11-server-Xorg
Requires: xorg-x11-xinit
Provides: xorg-x11-drv-VirtualBox = %{version}-%{release}
Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release}
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
%if "%(xserver-sdk-abi-requires 2>/dev/null)"
Requires: %(xserver-sdk-abi-requires ansic)
Requires: %(xserver-sdk-abi-requires videodrv)
Requires: %(xserver-sdk-abi-requires xinput)
%endif
Conflicts: %{name} <= %{version}-%{release}
%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.
%package kmodsrc
Summary: %{name} kernel module source code
Group: System Environment/Kernel
%description kmodsrc
Source tree used for building kernel module packages (%{name}-kmod)
which is generated during the build of main package.
%prep
%setup -q
find -name '*.py[co]' -delete
%patch1 -p1 -b .noupdates
%patch2 -p1 -b .strings
%patch3 -p1 -b .libcxx
%patch5 -p1 -b .xorg17
%patch9 -p1 -b .optflags
%patch10 -p1 -b .32bit
%patch11 -p1 -b .visibility
%patch12 -p1 -b .noansi
%patch15 -p1 -b .makeself
%patch16 -p1 -b .usblib
%patch17 -p1 -b .beramono
%patch18 -p1 -b .aiobug
%patch20 -p1 -b .testmangle
%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
rm -rf kBuild
%endif
rm -rf tools
# CRLF->LF
sed -i 's/\r//' COPYING
%build
./configure --disable-kmods --enable-webservice
. ./env.sh
# VirtualBox build system installs and builds in the same step,
# not allways looking for the installed files to places they have
# really been installed to. Therefore we do not override any of
# the installation paths, but install the tree with the default
# layout under 'obj' and shuffle files around in %%install.
kmk %{_smp_mflags} \
KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm PATH_OUT="$PWD/obj" \
VBOX_PATH_APP_PRIVATE=%{_libdir}/virtualbox \
VBOX_WITH_REGISTRATION_REQUEST= VBOX_WITH_UPDATE_REQUEST= \
VBOX_GCC_OPT="%{optflags}" VBOX_GCC_GC_OPT="%{optflags}" \
VBOX_GCC_R0_OPT="%{optflags}" VBOX_GCC_WERR="" \
VBOX_XCURSOR_LIBS="Xcursor Xext X11 GL" \
VBOX_JAVA_HOME=%{_prefix}/lib/jvm/java
%install
# The directory layout created below attempts to mimic the one of
# the commercially supported version to minimize confusion
# Directory structure
install -d $RPM_BUILD_ROOT/%{_lib}/security
install -d $RPM_BUILD_ROOT%{_bindir}
install -d $RPM_BUILD_ROOT%{_libdir}
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/components
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/ExtensionPacks
install -d $RPM_BUILD_ROOT%{_libdir}/dri
install -d $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
install -d $RPM_BUILD_ROOT%{_datadir}/icons
install -d $RPM_BUILD_ROOT%{_prefix}/src/%{name}-kmod-%{version}
install -d $RPM_BUILD_ROOT%{python_sitelib}/virtualbox
# Binaries and Wrapper with Launchers
install -p -m 0755 obj/bin/VBox.sh $RPM_BUILD_ROOT%{_bindir}/VBox
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VirtualBox
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/virtualbox
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxManage
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxmanage
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxSDL
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxsdl
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxVRDP
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxHeadless
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
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/VBoxBFE
ln -s VBox $RPM_BUILD_ROOT%{_bindir}/vboxbfe
install -p -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/VBoxTunctl \
# Components
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/components \
obj/bin/components/*
# Lib
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/*.so
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/V*.gc \
obj/bin/V*.r0 \
obj/bin/VBoxEFI*.fd
# Documentation
install -p -m 0644 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/UserManual.pdf
# Executables
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox \
obj/bin/VBoxHeadless \
obj/bin/VBoxSDL \
obj/bin/VBoxNetDHCP \
obj/bin/VBoxNetAdpCtl \
obj/bin/VirtualBox \
obj/bin/VBoxManage \
obj/bin/VBoxSVC \
obj/bin/VBoxXPCOMIPCD \
obj/bin/VBoxSysInfo.sh \
obj/bin/vboxshell.py \
obj/bin/VBoxTestOGL \
obj/bin/VBoxExtPackHelperApp \
obj/bin/vboxwebsrv \
obj/bin/VBoxBalloonCtrl \
obj/bin/webtest \
obj/bin/VBoxBFE
# Language files
install -p -m 0755 -t $RPM_BUILD_ROOT%{_libdir}/virtualbox/nls \
obj/bin/nls/*
# SDK
pushd obj/bin/sdk/installer
VBOX_INSTALL_PATH=%{_libdir}/virtualbox \
python vboxapisetup.py install --prefix %{_prefix} --root $RPM_BUILD_ROOT
popd
cp -rp obj/bin/sdk/. $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk
rm -rf $RPM_BUILD_ROOT%{_libdir}/virtualbox/sdk/installer
# Icons
install -p -m 0644 -t $RPM_BUILD_ROOT%{_datadir}/pixmaps \
obj/bin/VBox.png
#ln -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/{VBox,virtualbox}.png
for S in obj/bin/icons/*
do
SIZE=$(basename $S)
install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/{mimetypes,apps}
install -p -m 0644 $S/* $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes
[ -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png ] && mv \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/mimetypes/virtualbox.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$SIZE/apps/virtualbox.png
done
install -p -m 0644 obj/bin/virtualbox.xml $RPM_BUILD_ROOT%{_datadir}/mime/packages
# Guest X.Org drivers
# With the xorg17 patch, the _17 driver builds against what's
# 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 \
$RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/vboxvideo_drv.so
# Guest tools
install -m 0755 -t $RPM_BUILD_ROOT%{_bindir} \
obj/bin/additions/mount.vboxsf \
obj/bin/additions/VBoxService \
obj/bin/additions/VBoxClient \
obj/bin/additions/VBoxControl
# Ideally, Xorg should autodetect this, but for some reason it no longer does
install -m 0644 -D %{SOURCE9} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
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 0644 -D src/VBox/Additions/x11/Installer/vboxclient.desktop \
$RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/vboxclient.desktop
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
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/gdm/autostart/LoginWindow/vbox-autoresize.desktop
# Guest libraries
install -m 0755 -t $RPM_BUILD_ROOT%{_libdir} \
obj/bin/additions/VBoxOGL*.so
ln -sf ../VBoxOGL.so $RPM_BUILD_ROOT%{_libdir}/dri/vboxvideo_dri.so
install -m 0755 -t $RPM_BUILD_ROOT/%{_lib}/security \
obj/bin/additions/pam_vbox.so
# Installation root configuration
install -d $RPM_BUILD_ROOT/%{_sysconfdir}/vbox
echo 'INSTALL_DIR=%{_libdir}/virtualbox' > $RPM_BUILD_ROOT/%{_sysconfdir}/vbox/vbox.cfg
# Install udev rules
install -p -m 0644 -D %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
install -p -m 0644 -D %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-vboxguest.rules
# Install modules load script
install -p -m 0755 -D %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}.modules
install -p -m 0755 -D %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
# Module Source Code
mkdir -p %{name}-kmod-%{version}
cp -al obj/bin/src/vbox* obj/bin/additions/src/vbox* %{name}-kmod-%{version}
install -d $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}
tar --use-compress-program xz -cf $RPM_BUILD_ROOT%{_datadir}/%{name}-kmod-%{version}/%{name}-kmod-%{version}.tar.xz \
%{name}-kmod-%{version}
# Menu entry
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
--remove-key=DocPath --remove-category=X-MandrivaLinux-System \
--vendor='' obj/bin/virtualbox.desktop
%post
# Group for USB devices
getent group vboxusers >/dev/null || groupadd -r vboxusers
# Desktop databases
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
/usr/bin/update-desktop-database &>/dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &>/dev/null || :
# Web service
# 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
then
# /sbin/udevadm trigger --subsystem-match=usb >/dev/null 2>&1 || :
# /sbin/udevadm settle >/dev/null 2>&1 || :
systemctl restart udev-trigger.service
systemctl restart udev-settle.service
fi
%preun
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
/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
%{_bindir}/VBox
%{_bindir}/vboxballoonctrl
%{_bindir}/VBoxBalloonCtrl
%{_bindir}/vboxbfe
%{_bindir}/VBoxBFE
%{_bindir}/vboxheadless
%{_bindir}/VBoxHeadless
%{_bindir}/vboxmanage
%{_bindir}/VBoxManage
%{_bindir}/vboxsdl
%{_bindir}/VBoxSDL
%{_bindir}/VBoxTunctl
%{_bindir}/virtualbox
%{_bindir}/VirtualBox
%{_bindir}/vboxwebsrv
%{_bindir}/VBoxVRDP
%dir %{_libdir}/virtualbox
%doc %{_libdir}/virtualbox/*.pdf
%{_libdir}/virtualbox/*.[^p]*
%{_libdir}/virtualbox/*.py*
%{_libdir}/virtualbox/components
%{_libdir}/virtualbox/nls
%{_libdir}/virtualbox/VBoxExtPackHelperApp
%{_libdir}/virtualbox/VBoxManage
%{_libdir}/virtualbox/VBoxSVC
%{_libdir}/virtualbox/VBoxTestOGL
%{_libdir}/virtualbox/VBoxXPCOMIPCD
%{_libdir}/virtualbox/VBoxBalloonCtrl
%{_libdir}/virtualbox/vboxwebsrv
%{_libdir}/virtualbox/webtest
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxHeadless
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxSDL
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxBFE
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetDHCP
%attr(4755,root,root) %{_libdir}/virtualbox/VBoxNetAdpCtl
%attr(4755,root,root) %{_libdir}/virtualbox/VirtualBox
%{_datadir}/pixmaps/*
%{_datadir}/icons/*
%{_datadir}/mime/*
%{_datadir}/applications/*.desktop
%dir %{_sysconfdir}/vbox
%config %{_sysconfdir}/vbox/vbox.cfg
%config %{_sysconfdir}/udev/rules.d/90-vboxdrv.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}.modules
%doc COPYING
%{systemd_dir}/vboxweb.service
%files devel
%{_libdir}/virtualbox/sdk
%files -n python-%{name}
%{python_sitelib}/virtualbox
%{python_sitelib}/vboxapi*
%files guest
/%{_lib}/security/pam_vbox.so
%{_bindir}/mount.vboxsf
%{_bindir}/VBoxClient
%{_bindir}/VBoxControl
%{_bindir}/VBoxService
%{_libdir}/xorg/modules/drivers/*
%{_libdir}/dri/*
%{_libdir}/VBoxOGL*.so
%{_sysconfdir}/X11/xorg.conf.d/00-vboxvideo.conf
%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh
%{_sysconfdir}/xdg/autostart/vboxclient.desktop
%exclude %{_datadir}/gdm
%config %{_sysconfdir}/udev/rules.d/60-vboxguest.rules
%config %{_sysconfdir}/sysconfig/modules/%{name}-guest.modules
%doc COPYING
%{systemd_dir}/vboxservice.service
%files kmodsrc
%{_datadir}/%{name}-kmod-%{version}
%changelog
* Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-4
- Rename to VirtualBox, rfbz #1826
* 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,
https://bugs.freedesktop.org/show_bug.cgi?id=47971 .
* Tue Apr 3 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.12-1
- New release.
- drop buildroot
- drop the backported patch.
* Fri Mar 23 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.10-1
- New release.
- Upsteam says that java stuff is fiexd , https://www.virtualbox.org/ticket/9848#comment:5
- Upsteam says that have compile fixes for kernel 3.3-rc1 (in changelog).
- backport fix for web-service with newer versions of GSOAP, Changeset 40476 and 40477 in vbox, kindly
fixed from Frank Mehnert "The real fix can be found in r40476 and r40477. You should be able to
apply these fixes to VBox 4.1.10 as well." and add -lssl and -lcrypto by my self.
- drop Patch to allow to build with GCC 4.7
* Tue Jan 15 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-4
- Patch to allow to build with GCC 4.7
- Try fix usb/udev problem on updates without reboot computer.
- Improves on xorg17 patch, which is the xorg on guest part, we try build with our sources!.
Currently broken on rawhide with xorg-x11-server-1.11.99.901-2.20120103.fc17. As mentioned on
https://bugs.freedesktop.org/show_bug.cgi?id=43235, it fix on git, so I hope that will be fix on
next build of xorg-x11-server.
* Sun Jan 01 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 4.1.8-3
- Fix vboxweb-service installation
* Sat Dec 24 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-2
- merge spec 4.0.4 from Lubomir Rintel <lkundrak(a)v3.sk>, which re-add BuildRequires: hal-devel on
F-15
* Fri Dec 23 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.8-1
- New release.
- remove backported patch, compile_fixes, for reference https://www.virtualbox.org/ticket/9743.
* Mon Dec 12 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-7
- complete list of commands of VBox command line based on
src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec, revert some cleanups.
- add source vboxweb-service to package.
* Sun Dec 11 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-6
- added compile fixes for kernel 3.2, although guest client still not start with X, now I got a
segfault, but will help who want try guest client with rawhide.
* Mon Dec 5 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-5
- Now rawhide needs explicit BuildRequires libpng-devel
* Mon Dec 5 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-4
- revert change for "bug #1468, conflict symbols have been fixed upstream".
* Sat Dec 3 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-3
- increase one release number to override my external link.
* Sat Dec 3 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-2
- bug #1468, conflict symbols have been fixed upstream.
- bug #2052, drop requirement of HAL in Fedora >= 16.
- bug #2040, is also fixed (update to 4.1.6).
* Fri Dec 2 2011 Sérgio Basto <sergio(a)serjux.com> - 4.1.6-1
- New release
- drop up streamed patch VirtualBox-OSE-4.1.2-vboxpci.patch
- fix strings patch
- add VirtualBox-OSE-add-VBoxExtPackHelperApp.patch bz #1656
- redo xorg17 patch (still need some improvements, I will wait for a new change that break the patch)
- redo noupdate patch.
- disable java binding seems non maintained.
- some cleanups.
* Wed Sep 21 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.1.2-1
- New release
- Assign USB devices to vboxusers
- Add a web service
- Install MIME types for disk images
* Sun Apr 03 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.4-1
- New release
- Add requires for particular server ABIs
* Tue Feb 08 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.2-2
- Fix build with GCC 4.6
* Fri Feb 04 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.2-1
- New release
* Thu Feb 03 2011 Lubomir Rintel <lkundrak(a)v3.sk> - 4.0.0-1
- New release
* Fri Nov 12 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.10-1
- New release
* Sun Aug 8 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.8-1
- New release
* Tue Jul 13 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.6-2
- Ship with Xorg configuration
* Mon Jul 12 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.6-1
- New release, fix build
- Fix compile with GCC 4.5
- Fix acpi compilation with newer iasl
* Thu Jun 17 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.4-1
- New release
- Do not use /usr/bin/xargs in module script (Piergiorgio Sartor, #1256)
- No longer blacklist KVM (Nicolas Chauvet, #1280)
- Hypervisor conflicts with guest (Henrique Martins, #1239)
* Wed May 19 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-1
- Release
* Fri May 14 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.2.beta3
- Beta 3
- Add a release status tag into kernel abi dependency
* Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.2.beta2
- 3.2.0 beta2
- Move pdf documentation to libdir, so that UI can find it
* Wed Apr 28 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.2.0-0.1.beta1
- 3.2.0 beta
- Build i686 on el6
* Fri Mar 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.6-1
- New upstream release
- Workaround trouble linking with new linker
- modprobe configuration files into right directory (LI Rui Bin)
- Own /etc/vbox (LI Rui Bin)
- Use parallel build
- Attempt to address #1083 by insmodding instead of modprobe
* Tue Feb 16 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.4-1
- New upstream, new release :)
* Tue Jan 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.2-1
- New upstream release
* Mon Nov 30 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-1
- Upstream release (they do that quite often, huh?)
* Sat Nov 21 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-0.1.beta2
- Another upstream beta
* Thu Nov 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.0-0.1.beta1
- Upstream beta release
* Sun Nov 01 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.10-1
- Update to newer upstream release
- Fix mixed up source files (Tony Nelson, #881)
* Wed Oct 07 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.8-1
- Update to newer upstream
- Fixes SunSolve #268188 security issue
* Thu Sep 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.6-1
- Bring hardening back, stupid Lubomir
- Update to recent upstream release
- Drop upstreamed patches for Fedora 12 Alpha support
* Sat Aug 22 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-7
- Correct the path in udev rule and adjust for non-hardening
- Fix build with recent x86_64 glibc
* Thu Aug 20 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-6
- No exceptions in R0 code, should fix unresolved symbol problem
* Sun Aug 16 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-5
- Enable debuginfo package
- Correctly use compiler flags
- Make it possible to blacklist our modules
- Blacklist KVM
* Sat Aug 15 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-4
- Exchange hardening for filesystem capabilities
- Enable web services
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-3
- Include VBoxRandR
- Add dri module to guest
- Resize attempts in GDM make SELinux unhappy
- Fix HAL policy file location
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-2
- Don't quote INSTALL_DIR in vbox.cfg so that we don't confuse vboxgtk
- Add python- subpackage
- Correct permissions on SDK directories (#754)
* Sun Aug 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.4-1
- Update to later upstream release
- Re-enable DRI again, fix drm_release crash
* Tue Aug 04 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-4
- Build for i686
- Fix build with newer PulseAudio
- Don't bundle static libc++, fix build with newer one
- Build Xorg 1.7 drivers, and only them
- Adjust Mouse driver for XInput 2
- Temporarily disable DRI
* Tue Aug 04 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-3
- Add netadp bmodule (Vlastimil Holer, #744)
* Mon Jul 20 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-2
- Properly replace the xorg driver package
* Sun Jul 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.2-1
- New upstream release
- Dropping the upstreamed netfreeze patch
* Fri Jul 10 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-3
- Fix freeze of guests on network load (upstream ticket/4343)
* Wed Jul 08 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 3.0.0-2
- Tidy up the filelist check
- Libs need to be executable for the dep generator (#698)
* Fri Jul 03 2009 Jonathan Dieter <jdieter(a)gmail.com> - 3.0.0-1
- New upstream release
* Thu Jul 02 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-3
- Enable resize for the login window
- Add the guest udev rules
- Actually install documentation
* Mon Jun 29 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-2
- They left for beer too early, dicks, so we fix up wbox now
- Make guest additions just work
- Merge xorg stuff with rest of guest additions
* Sun May 31 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.4-1
- New upstream release
* Sun May 03 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.2-1
- Damnit, another new upstream release! :)
- Improved packaging checks
- Upstream fixed libcap detection, drop patch
- Drop gcc44 patch, upstream supports it now
* Sat Apr 25 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.2.0-1
- New upstream release
- Allow for disabling of hardening to allow group-based vboxdrv control
- Disable automatic updates
* Fri Apr 24 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.4-4
- Adjust architecture list for plague
* Sun Apr 12 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.4-3
- Fix SDK permissions
- Fix SDK requires
* Mon Mar 30 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.4-2
- Fix the swab fix so that we don't break pre-2.6.29 build
* Sat Mar 14 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.4-1
- Update to 2.1.4
- Pack and compress the module source code
- Drop vendor from desktop entry
* Sat Mar 14 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.2-3
- Fix build with GCC 4.4
* Thu Feb 05 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.2-2
- Fix Fedora build, don't attempt to use compat gcc
* Sat Jan 24 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.2-1
- New upstream release
* Sun Jan 11 2009 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.0-2
- Fix EL-5 panic
- Build on x86_64 (w/o 32bit toolchain)
* Mon Dec 29 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 2.1.0-1
- New upstream release
- Add guest additions subpackage
- Build QT4 frontend in Fedora
* Mon Sep 29 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 2.0.2-2
- Fix locales path
* Sat Sep 20 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 2.0.2-1
- Update to 2.0.2
- Fix vditool library path
* Thu Sep 04 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 1.6.4-3
- Do the previous change correctly
- Replace occurencies of 'vboxdrv setup'
* Wed Sep 03 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 1.6.4-2
- Move the VboxDD* libs to a less wrong place
* Tue Sep 02 2008 Lubomir Rintel <lkundrak(a)v3.sk> - 1.6.4-1
- Remove selinux subpackage
- Pack the generated source tree for kernel module
- Split off SDK
- Install to more-or-less FHS compliant tree
* Sat Mar 08 2008 Till Maas <opensource till name> - 1.5.6-5
- update group management to match the current guidelines
* Sat Mar 08 2008 Till Maas <opensource till name> - 1.5.6-4
- remove bogus %%post script for kernel module removing and loading.
It worked with dkms, but maybe it was bad anyway.
* Sat Mar 08 2008 Till Maas <opensource till name> - 1.5.6-3
- add requires/provides to be used with kmod package
* Sun Feb 24 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 1.5.6-2
- SDL-static not needed, as well as the SDL patch
- do not patch configure for kernel sources, use command line switch
* Sun Feb 24 2008 Till Maas <opensource till name> - 1.5.6-1
- update to new version
- add BR: pulseaudio-libs-devel
- remove uneeded recompiler patch
- remove dkms subpackage (it is now a standalone package)
* Sat Feb 16 2008 Lubomir Kundrak <lkundrak(a)redhat.com> - 1.5.2-3
- Hacks to build with gcc43, on F8
* Tue Oct 30 2007 Till Maas <opensource till name> - 1.5.2-2
- add support for x86_64
* Tue Oct 30 2007 Till Maas <opensource till name> - 1.5.2-1
- Update to new version
* Wed Oct 03 2007 Till Maas <opensource till name>
- 1.5.2-0.2.20071003svn5134
- update to devel Version
* Wed Sep 19 2007 Till Maas <opensource till name>
- 1.5.2-0.1.20070919svn4897
- Update to devel Version that may support Fedora as Guest again
- Make /dev/vboxdrv owned by root instead of vboxusers, because only
the group is needed
* Mon Sep 03 2007 Till Maas <opensource till name> - 1.5.0-1
- update to new version
- update License Tag
* Wed Jun 27 2007 Till Maas <opensource till name> - 1.4.0-1
- Update to new version
- Adapt to new kBuild version, which seems to be needed
* Wed Apr 21 2007 Till Maas <opensource till name> - 1.3.8-2
- minor bugfixes in the wrapper script
- rename to VirtualBox-OSE
* Wed Apr 11 2007 Till Maas <opensource till name> - 1.3.8-1
- version bump
- add mkdir $RPM_BUILD_ROOT to %%install to prevent racing condition
- start VBoxSVC with --daemonize
- change source directory in %%prep
- add vditool to wrapper script
- fix path: s/sysconf/sysconfig/ for .modules file
- send rmmod output to /dev/null
- add selinux support
- do not unload the kernel module in preun
* Sun Mar 11 2007 Till Maas <opensource till name> - 1.3.6-3
- new wrapper script, include VBoxSDL
- Use vbox.cfg
- load module in dkms package automatically with sysconfig/modules/virtualbox.modules
- move udev rule to -dkms package
- remove vboxdrv module when deinstalling -dkms package
- add LocalConfig.kmk to make it honour at least some rpm optflags
* Sat Mar 10 2007 Till Maas <opensource till name> - 1.3.6-2
- add COPYING.LIB
- CRLF to LF in COPYING
- add xorg-x11-drv-virtualbox package
* Fri Mar 09 2007 Till Maas <opensource till name> - 1.3.6-1
- Initial release for Fedora, inspired by OpenSuSE spec
--- VirtualBox-OSE.spec DELETED ---
12 years, 4 months
rpms/VirtualBox/devel VirtualBox-OSE.spec,1.95,1.96
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/VirtualBox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25610
Modified Files:
VirtualBox-OSE.spec
Log Message:
* Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-4
- Rename to VirtualBox, rfbz #1826
Index: VirtualBox-OSE.spec
===================================================================
RCS file: /cvs/free/rpms/VirtualBox/devel/VirtualBox-OSE.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- VirtualBox-OSE.spec 1 May 2012 06:09:44 -0000 1.95
+++ VirtualBox-OSE.spec 16 May 2012 02:25:44 -0000 1.96
@@ -3,7 +3,7 @@
%global systemd_dir /lib/systemd/system
# Standard compiler flags, without:
-# -Wall -- VirtualBox-OSE takes care of reasonable warnings very well
+# -Wall -- VirtualBox takes care of reasonable warnings very well
# -m32, -m64 -- 32bit code is built besides 64bit on x86_64
# -fexceptions -- R0 code doesn't link against C++ library, no __gxx_personality_v0
%global optflags %(rpm --eval %%optflags |sed 's/-Wall//;s/-m[0-9][0-9]//;s/-fexceptions//')
@@ -15,9 +15,9 @@
#global prerel beta3
%global prereltag %{?prerel:_%(awk 'BEGIN {print toupper("%{prerel}")}')}
-Name: VirtualBox-OSE
+Name: VirtualBox
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
@@ -95,8 +95,12 @@
Requires(preun): systemd-units
Requires(postun): systemd-units
+Provides: %{name}-OSE = %{version}-%{release}
+Obsoletes: %{name}-OSE < %{version}-%{release}
Requires: %{name}-kmod = %{version}%{?prereltag}
Provides: %{name}-kmod-common = %{version}%{?prereltag}
+Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag}
+Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag}
Conflicts: %{name}-guest <= %{version}-%{release}
%description
@@ -107,8 +111,10 @@
%package devel
Summary: %{name} SDK
Group: Development/Libraries
-Requires: VirtualBox-OSE = %{version}-%{release}
-Requires: python-VirtualBox-OSE = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Requires: python-%{name} = %{version}-%{release}
+Provides: %{name}-OSE-devel = %{version}-%{release}
+Obsoletes: %{name}-OSE-devel < %{version}-%{release}
%description devel
%{name} Software Development Kit.
@@ -117,7 +123,9 @@
%package -n python-%{name}
Summary: Python bindings for %{name}
Group: Development/Libraries
-Requires: VirtualBox-OSE = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
+Provides: python-%{name}-OSE = %{version}-%{release}
+Obsoletes: python-%{name}-OSE < %{version}-%{release}
%description -n python-%{name}
Python XPCOM bindings to %{name}.
@@ -126,18 +134,24 @@
%package guest
Summary: %{name} Guest Additions
Group: System Environment/Base
+Provides: %{name}-OSE-guest = %{version}-%{release}
+Obsoletes: %{name}-OSE-guest < %{version}-%{release}
Requires: %{name}-kmod = %{version}
Provides: %{name}-kmod-common = %{version}
+Provides: %{name}-OSE-kmod-common = %{version}%{?prereltag}
+Obsoletes: %{name}-OSE-kmod-common < %{version}%{?prereltag}
Requires: xorg-x11-server-Xorg
Requires: xorg-x11-xinit
+Provides: xorg-x11-drv-VirtualBox = %{version}-%{release}
+Obsoletes: xorg-x11-drv-VirtualBox < %{version}-%{release}
Provides: xorg-x11-drv-VirtualBox-OSE = %{version}-%{release}
Obsoletes: xorg-x11-drv-VirtualBox-OSE < %{version}-%{release}
-Conflicts: %{name} <= %{version}-%{release}
%if "%(xserver-sdk-abi-requires 2>/dev/null)"
Requires: %(xserver-sdk-abi-requires ansic)
Requires: %(xserver-sdk-abi-requires videodrv)
Requires: %(xserver-sdk-abi-requires xinput)
%endif
+Conflicts: %{name} <= %{version}-%{release}
%description guest
@@ -157,7 +171,7 @@
%prep
-%setup -q -n VirtualBox-%{version}
+%setup -q
find -name '*.py[co]' -delete
%patch1 -p1 -b .noupdates
@@ -530,6 +544,9 @@
%changelog
+* Wed May 16 2012 Sérgio Basto <sergio(a)serjux.com> - 4.1.14-4
+- Rename to VirtualBox, rfbz #1826
+
* 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, 4 months
rpms/kdenlive/F-17 .cvsignore, 1.10, 1.11 kdenlive.spec, 1.14, 1.15 sources, 1.10, 1.11 kdenlive-0.8-fix-glu.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/kdenlive/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6034
Modified Files:
.cvsignore kdenlive.spec sources
Removed Files:
kdenlive-0.8-fix-glu.patch
Log Message:
sync w/devel branch for 0.9
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-17/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 10 Dec 2011 22:20:20 -0000 1.10
+++ .cvsignore 16 May 2012 00:26:10 -0000 1.11
@@ -1 +1 @@
-kdenlive-0.8.2.1.tar.gz
+kdenlive-0.9.tar.gz
Index: kdenlive.spec
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-17/kdenlive.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kdenlive.spec 2 Mar 2012 14:47:59 -0000 1.14
+++ kdenlive.spec 16 May 2012 00:26:10 -0000 1.15
@@ -1,22 +1,20 @@
Name: kdenlive
-Version: 0.8.2.1
-Release: 3%{?dist}
+Version: 0.9
+Release: 1%{?dist}
Summary: Non-linear video editor
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.kdenlive.org
-Source: http://downloads.sourceforge.net/kdenlive/%{name}-%{version}.tar.gz
+Source0: http://download.kde.org/stable/kdenlive/%{version}/src/kdenlive-%{version...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch101: kdenlive-0.8-fix-glu.patch
-
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: kdelibs4-devel
-BuildRequires: mlt-devel >= 0.7.6
-%global mlt_version %(pkg-config --modversion mlt++ 2>/dev/null || echo 0.7.6)
-BuildRequires: qjson-devel
+BuildRequires: pkgconfig(mlt++) >= 0.7.8
+%global mlt_version %(pkg-config --modversion mlt++ 2>/dev/null || echo 0.7.8)
+BuildRequires: pkgconfig(QJson)
Requires: dvdauthor
Requires: dvgrab
@@ -35,8 +33,6 @@
%prep
%setup -q
-%patch101 -p1
-
# MLT's binary melt renamed at Fedora, so we must rename it in Kdenlive, too
sed -i 's|/bin/melt|/bin/mlt-melt|' src/mainwindow.cpp
sed -i 's|findExe("melt")|findExe("mlt-melt")|' src/mainwindow.cpp
@@ -107,6 +103,10 @@
%changelog
+* Tue May 15 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.9-1
+- 0.9
+- pkgconfig-style deps
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.8.2.1-3
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kdenlive/F-17/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 10 Dec 2011 22:20:21 -0000 1.10
+++ sources 16 May 2012 00:26:10 -0000 1.11
@@ -1 +1 @@
-96b39531eba98c77546e7eba45a744ce kdenlive-0.8.2.1.tar.gz
+8ceb59444df9aa950fd6bc7300c4a90d kdenlive-0.9.tar.gz
--- kdenlive-0.8-fix-glu.patch DELETED ---
12 years, 4 months
rpms/mlt/F-17 .cvsignore, 1.10, 1.11 mlt.spec, 1.21, 1.22 sources, 1.11, 1.12 mlt-gcc47_1.patch, 1.1, NONE
by Rex Dieter
Author: rdieter
Update of /cvs/free/rpms/mlt/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4247
Modified Files:
.cvsignore mlt.spec sources
Removed Files:
mlt-gcc47_1.patch
Log Message:
sync w/devel branch for 0.7.8 goodness
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mlt/F-17/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 11 Nov 2011 18:53:33 -0000 1.10
+++ .cvsignore 15 May 2012 23:33:25 -0000 1.11
@@ -1 +1 @@
-mlt-0.7.6.tar.gz
+mlt-0.7.8.tar.gz
Index: mlt.spec
===================================================================
RCS file: /cvs/free/rpms/mlt/F-17/mlt.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- mlt.spec 2 Mar 2012 14:56:50 -0000 1.21
+++ mlt.spec 15 May 2012 23:33:25 -0000 1.22
@@ -8,14 +8,13 @@
Summary: Toolkit for broadcasters, video editors, media players, transcoders
Name: mlt
-Version: 0.7.6
-Release: 7%{?dist}
+Version: 0.7.8
+Release: 1%{?dist}
License: GPLv2+ and LGPLv2+
URL: http://www.mltframework.org/twiki/bin/view/MLT/
Group: System Environment/Libraries
Source: http://downloads.sourceforge.net/mlt/%{name}-%{version}.tar.gz
-Patch0: mlt-gcc47_1.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: frei0r-devel
@@ -86,7 +85,6 @@
%prep
%setup -q
-%patch0 -p1
find ./ -name configure -exec chmod 755 {} \;
chmod 755 src/modules/lumas/create_lumas
chmod 644 src/modules/qimage/kdenlivetitle_wrapper.cpp
@@ -185,6 +183,12 @@
%changelog
+* Tue May 08 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.8-1
+- 0.7.8
+
+* Tue May 08 2012 Rex Dieter <rdieter(a)fedoraproject.org> 0.7.6-8
+- rebuild (sox)
+
* Fri Mar 02 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.6-7
- Rebuilt for c++ ABI breakage
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mlt/F-17/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 11 Nov 2011 18:53:33 -0000 1.11
+++ sources 15 May 2012 23:33:25 -0000 1.12
@@ -1 +1 @@
-105969a63339da2f8ce4ddce1652c9e7 mlt-0.7.6.tar.gz
+4bdce45d832e065ac4c8c8ca56765e1d mlt-0.7.8.tar.gz
--- mlt-gcc47_1.patch DELETED ---
12 years, 4 months
rpms/ufoai/F-17 ufoai-2.3.1-gcc47.patch, NONE, 1.1 ufoai-2.3.1-glib.patch, NONE, 1.1 ufoai-2.3.1-zpng.patch, NONE, 1.1 ufoai.spec, 1.10, 1.11 ufoai-ded.desktop, 1.1, NONE ufoai.desktop, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/ufoai/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2527/F-17
Modified Files:
ufoai.spec
Added Files:
ufoai-2.3.1-gcc47.patch ufoai-2.3.1-glib.patch
ufoai-2.3.1-zpng.patch
Removed Files:
ufoai-ded.desktop ufoai.desktop
Log Message:
Fix FTBFS
ufoai-2.3.1-gcc47.patch:
Vector3.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE ufoai-2.3.1-gcc47.patch ---
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h.gcc47 ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h.gcc47 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h 2012-05-16 00:06:02.329926206 +0200
@@ -14,6 +14,7 @@
* execute an inner product of two vectors.
*/
+#include "FloatTools.h"
#include "lrint.h"
#include <sstream>
#include <string>
ufoai-2.3.1-glib.patch:
libs/convert.h | 3 +--
libs/entity/miscparticle.cpp | 2 +-
libs/gtkutil/IConv.h | 5 +----
libs/gtkutil/cursor.h | 2 +-
libs/gtkutil/idledraw.h | 2 +-
libs/os/dir.h | 2 +-
libs/shaders/shaders.cpp | 2 +-
radiant/vfs.cpp | 4 +---
8 files changed, 8 insertions(+), 14 deletions(-)
--- NEW FILE ufoai-2.3.1-glib.patch ---
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/convert.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/convert.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/convert.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/convert.h 2012-05-16 00:26:47.676522158 +0200
@@ -27,8 +27,7 @@
#include "debugging/debugging.h"
#include <algorithm>
-#include <glib/gunicode.h>
-#include <glib/gconvert.h>
+#include <glib.h>
#include "character.h"
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp.glib ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp
--- ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp 2012-05-16 00:31:37.607581992 +0200
@@ -39,7 +39,7 @@
#include "math/line.h"
#include "ifilesystem.h"
-#include <glib/gslist.h>
+#include <glib.h>
#include "targetable.h"
#include "origin.h"
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h 2012-05-16 00:26:47.677522162 +0200
@@ -22,7 +22,7 @@
#if !defined(INCLUDED_GTKUTIL_CURSOR_H)
#define INCLUDED_GTKUTIL_CURSOR_H
-#include <glib/gmain.h>
+#include <glib.h>
#include <gdk/gdkevents.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkwindow.h>
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h 2012-05-16 00:26:47.677522162 +0200
@@ -1,10 +1,7 @@
#ifndef _GTKUTIL_ICONV_H
#define _GTKUTIL_ICONV_H
-#include <glib/gconvert.h>
-#include <glib/gmessages.h>
-#include <glib/gunicode.h>
-#include <glib/gmem.h>
+#include <glib.h>
#include <string>
#include <cassert>
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h 2012-05-16 00:26:47.678522166 +0200
@@ -22,7 +22,7 @@
#if !defined(INCLUDED_GTKUTIL_IDLEDRAW_H)
#define INCLUDED_GTKUTIL_IDLEDRAW_H
-#include <glib/gmain.h>
+#include <glib.h>
#include "generic/callback.h"
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h 2012-05-16 00:26:47.678522166 +0200
@@ -27,7 +27,7 @@
#if !defined(INCLUDED_OS_DIR_H)
#define INCLUDED_OS_DIR_H
-#include <glib/gdir.h>
+#include <glib.h>
typedef GDir Directory;
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp.glib ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp
--- ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp 2012-05-16 00:31:11.319485974 +0200
@@ -51,7 +51,7 @@
#include "iradiant.h"
#include "irender.h"
-#include <glib/gslist.h>
+#include <glib.h>
#include "AutoPtr.h"
#include "debugging/debugging.h"
diff -up ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp.glib ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp
--- ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp 2012-05-16 00:26:47.679522170 +0200
@@ -45,9 +45,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <glib/gslist.h>
-#include <glib/gdir.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include "AutoPtr.h"
#include "iradiant.h"
ufoai-2.3.1-zpng.patch:
images.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE ufoai-2.3.1-zpng.patch ---
diff -up ufoai-2.3.1-source/src/shared/images.c.zpng ufoai-2.3.1-source/src/shared/images.c
--- ufoai-2.3.1-source/src/shared/images.c.zpng 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/shared/images.c 2012-05-15 23:57:55.255123139 +0200
@@ -33,6 +33,10 @@
#include <jpeglib.h>
#include <png.h>
+//#ifdef HAVE_ZLIB_H
+#include <zlib.h>
+//#endif
+
/** image formats, tried in this order */
static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL };
Index: ufoai.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/F-17/ufoai.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ufoai.spec 7 Mar 2012 23:14:08 -0000 1.10
+++ ufoai.spec 15 May 2012 22:35:52 -0000 1.11
@@ -1,6 +1,6 @@
Name: ufoai
Version: 2.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: UFO: Alien Invasion
Group: Amusements/Games
@@ -13,6 +13,9 @@
Patch1: ufoai-2.3-radiant-ldl.patch
Patch2: ufoai-2.3-desktop-files.patch
Patch3: ufoai-2.3.1-radiant-apppath.patch
+Patch4: ufoai-2.3.1-zpng.patch
+Patch5: ufoai-2.3.1-gcc47.patch
+Patch6: ufoai-2.3.1-glib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -129,6 +132,9 @@
## we do not like "arch-dependent-file" in /usr/share
# change the target for the library
sed -i -e "s/base/./" build/game.mk
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1 -b .glib
%build
@@ -304,6 +310,9 @@
%changelog
+* Tue May 15 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-5
+- Fix FTBFS
+
* Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-4
- Rebuilt for c++ ABI breakage
--- ufoai-ded.desktop DELETED ---
--- ufoai.desktop DELETED ---
12 years, 4 months
rpms/ufoai/devel ufoai-2.3.1-gcc47.patch, NONE, 1.1 ufoai-2.3.1-glib.patch, NONE, 1.1 ufoai-2.3.1-zpng.patch, NONE, 1.1 ufoai.spec, 1.10, 1.11 ufoai-ded.desktop, 1.1, NONE ufoai.desktop, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/ufoai/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv2265/devel
Modified Files:
ufoai.spec
Added Files:
ufoai-2.3.1-gcc47.patch ufoai-2.3.1-glib.patch
ufoai-2.3.1-zpng.patch
Removed Files:
ufoai-ded.desktop ufoai.desktop
Log Message:
Fix FTBFS
ufoai-2.3.1-gcc47.patch:
Vector3.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE ufoai-2.3.1-gcc47.patch ---
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h.gcc47 ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h.gcc47 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/math/Vector3.h 2012-05-16 00:06:02.329926206 +0200
@@ -14,6 +14,7 @@
* execute an inner product of two vectors.
*/
+#include "FloatTools.h"
#include "lrint.h"
#include <sstream>
#include <string>
ufoai-2.3.1-glib.patch:
libs/convert.h | 3 +--
libs/entity/miscparticle.cpp | 2 +-
libs/gtkutil/IConv.h | 5 +----
libs/gtkutil/cursor.h | 2 +-
libs/gtkutil/idledraw.h | 2 +-
libs/os/dir.h | 2 +-
libs/shaders/shaders.cpp | 2 +-
radiant/vfs.cpp | 4 +---
8 files changed, 8 insertions(+), 14 deletions(-)
--- NEW FILE ufoai-2.3.1-glib.patch ---
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/convert.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/convert.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/convert.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/convert.h 2012-05-16 00:26:47.676522158 +0200
@@ -27,8 +27,7 @@
#include "debugging/debugging.h"
#include <algorithm>
-#include <glib/gunicode.h>
-#include <glib/gconvert.h>
+#include <glib.h>
#include "character.h"
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp.glib ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp
--- ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/entity/miscparticle.cpp 2012-05-16 00:31:37.607581992 +0200
@@ -39,7 +39,7 @@
#include "math/line.h"
#include "ifilesystem.h"
-#include <glib/gslist.h>
+#include <glib.h>
#include "targetable.h"
#include "origin.h"
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/cursor.h 2012-05-16 00:26:47.677522162 +0200
@@ -22,7 +22,7 @@
#if !defined(INCLUDED_GTKUTIL_CURSOR_H)
#define INCLUDED_GTKUTIL_CURSOR_H
-#include <glib/gmain.h>
+#include <glib.h>
#include <gdk/gdkevents.h>
#include <gtk/gtkwidget.h>
#include <gtk/gtkwindow.h>
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/IConv.h 2012-05-16 00:26:47.677522162 +0200
@@ -1,10 +1,7 @@
#ifndef _GTKUTIL_ICONV_H
#define _GTKUTIL_ICONV_H
-#include <glib/gconvert.h>
-#include <glib/gmessages.h>
-#include <glib/gunicode.h>
-#include <glib/gmem.h>
+#include <glib.h>
#include <string>
#include <cassert>
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/gtkutil/idledraw.h 2012-05-16 00:26:47.678522166 +0200
@@ -22,7 +22,7 @@
#if !defined(INCLUDED_GTKUTIL_IDLEDRAW_H)
#define INCLUDED_GTKUTIL_IDLEDRAW_H
-#include <glib/gmain.h>
+#include <glib.h>
#include "generic/callback.h"
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h.glib ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h
--- ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/os/dir.h 2012-05-16 00:26:47.678522166 +0200
@@ -27,7 +27,7 @@
#if !defined(INCLUDED_OS_DIR_H)
#define INCLUDED_OS_DIR_H
-#include <glib/gdir.h>
+#include <glib.h>
typedef GDir Directory;
diff -up ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp.glib ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp
--- ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/libs/shaders/shaders.cpp 2012-05-16 00:31:11.319485974 +0200
@@ -51,7 +51,7 @@
#include "iradiant.h"
#include "irender.h"
-#include <glib/gslist.h>
+#include <glib.h>
#include "AutoPtr.h"
#include "debugging/debugging.h"
diff -up ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp.glib ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp
--- ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp.glib 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/tools/radiant/radiant/vfs.cpp 2012-05-16 00:26:47.679522170 +0200
@@ -45,9 +45,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <glib/gslist.h>
-#include <glib/gdir.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
#include "AutoPtr.h"
#include "iradiant.h"
ufoai-2.3.1-zpng.patch:
images.c | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE ufoai-2.3.1-zpng.patch ---
diff -up ufoai-2.3.1-source/src/shared/images.c.zpng ufoai-2.3.1-source/src/shared/images.c
--- ufoai-2.3.1-source/src/shared/images.c.zpng 2010-11-29 17:46:35.000000000 +0100
+++ ufoai-2.3.1-source/src/shared/images.c 2012-05-15 23:57:55.255123139 +0200
@@ -33,6 +33,10 @@
#include <jpeglib.h>
#include <png.h>
+//#ifdef HAVE_ZLIB_H
+#include <zlib.h>
+//#endif
+
/** image formats, tried in this order */
static char *IMAGE_TYPES[] = { "tga", "png", "jpg", NULL };
Index: ufoai.spec
===================================================================
RCS file: /cvs/nonfree/rpms/ufoai/devel/ufoai.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ufoai.spec 7 Mar 2012 23:16:37 -0000 1.10
+++ ufoai.spec 15 May 2012 22:35:24 -0000 1.11
@@ -1,6 +1,6 @@
Name: ufoai
Version: 2.3.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: UFO: Alien Invasion
Group: Amusements/Games
@@ -13,6 +13,9 @@
Patch1: ufoai-2.3-radiant-ldl.patch
Patch2: ufoai-2.3-desktop-files.patch
Patch3: ufoai-2.3.1-radiant-apppath.patch
+Patch4: ufoai-2.3.1-zpng.patch
+Patch5: ufoai-2.3.1-gcc47.patch
+Patch6: ufoai-2.3.1-glib.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -129,6 +132,9 @@
## we do not like "arch-dependent-file" in /usr/share
# change the target for the library
sed -i -e "s/base/./" build/game.mk
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1 -b .glib
%build
@@ -304,6 +310,9 @@
%changelog
+* Tue May 15 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-5
+- Fix FTBFS
+
* Thu Mar 08 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.3.1-4
- Rebuilt for c++ ABI breakage
--- ufoai-ded.desktop DELETED ---
--- ufoai.desktop DELETED ---
12 years, 4 months
rpms/subtitleripper/F-17 dead.package, NONE, 1.1 sources, 1.2, NONE .cvsignore, 1.2, NONE subtitleripper-0.3-4-nopng.patch, 1.1, NONE subtitleripper.spec, 1.7, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/subtitleripper/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv549
Added Files:
dead.package
Removed Files:
sources .cvsignore subtitleripper-0.3-4-nopng.patch
subtitleripper.spec
Log Message:
Orphan
--- NEW FILE dead.package ---
FTBFS and not installable - the code hasn't been touched for a decade
--- sources DELETED ---
--- .cvsignore DELETED ---
--- subtitleripper-0.3-4-nopng.patch DELETED ---
--- subtitleripper.spec DELETED ---
12 years, 4 months
rpms/subtitleripper/devel dead.package, NONE, 1.1 sources, 1.2, NONE .cvsignore, 1.2, NONE subtitleripper-0.3-4-nopng.patch, 1.1, NONE subtitleripper.spec, 1.7, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/subtitleripper/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv451
Added Files:
dead.package
Removed Files:
sources .cvsignore subtitleripper-0.3-4-nopng.patch
subtitleripper.spec
Log Message:
Oprhan
--- NEW FILE dead.package ---
FTBFS and not installable - the code hasn't been touched for a decade
--- sources DELETED ---
--- .cvsignore DELETED ---
--- subtitleripper-0.3-4-nopng.patch DELETED ---
--- subtitleripper.spec DELETED ---
12 years, 4 months